修复不同主单下相同分单号的回执错乱的bug；

修改sli和fhl报文的代理人字段；

 package com.agent.controller.agent;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+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.apache.commons.lang.StringUtils;
+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.entity.Constant;
-import com.agent.entity.agent.*;
+import com.agent.entity.agent.BasicAgentEntity;
+import com.agent.entity.agent.DeliveryInfoEntity;
+import com.agent.entity.agent.ManifestEntity;
+import com.agent.entity.agent.PackageSizeEntity;
+import com.agent.entity.agent.PackageTypeEntity;
+import com.agent.entity.agent.PubDgEntity;
+import com.agent.entity.agent.SupervisionEntity;
 import com.agent.entity.system.UserEntity;
-import com.agent.imf.agent.redis.RedisSaveMessage;
-import com.agent.service.agent.*;
+import com.agent.service.agent.BasicAgentService;
+import com.agent.service.agent.DeliveryDicService;
+import com.agent.service.agent.DeliveryInfoService;
+import com.agent.service.agent.ManifestService;
+import com.agent.service.agent.PackageSizeService;
+import com.agent.service.agent.PackageTypeService;
+import com.agent.service.agent.PubDgService;
+import com.agent.service.agent.SupervisionService;
 import com.agent.util.HttpJsonMsg;
 import com.agent.vo.ResponseModel;
 import com.agent.vo.agent.DeliveryVo;
+import com.agent.xml.XmlBuildTask;
 import com.agent.xml.common.XmlUtil;
 import com.agent.xml.deliveryInfo.ApplicableFreightRateServiceChargeXml;
 import com.agent.xml.deliveryInfo.ArrivalEventXml;
@@ -47,33 +81,13 @@ import com.framework.core.Servlets;
 import com.framework.shiro.SessionUtil;
 import com.plugin.easyui.DataGrid;
 import com.plugin.easyui.EasyPage;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-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.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * Created by cohesion on 2017/3/29.
  */
 @Controller
 @RequestMapping(value = "/delivery")
-public class DeliveryInfoController extends BasicController{
+public class DeliveryInfoController extends BasicController {
 
 	private static final Logger logger = LoggerFactory.getLogger(DeliveryInfoController.class);
 
@@ -104,36 +118,38 @@ public class DeliveryInfoController extends BasicController{
 	@Resource
 	private ManifestService manifestService;
 
-    
 	@Resource
 	private DeliveryDicService deliverydicservice;
 
 	/**
 	 * 交运信息页面
+	 * 
 	 * @return
 	 */
 	@RequestMapping(value = "/list")
-    public String getList(){
+	public String getList() {
 		return "delivery/list";
 	}
 
 	/**
 	 * 交运信息分页数据
+	 * 
 	 * @return
 	 */
-    @RequestMapping(value="/grid.json")
+	@RequestMapping(value = "/grid.json")
 	@ResponseBody
-    public DataGrid<DeliveryVo> grid(HttpServletRequest request,EasyPage<DeliveryInfoEntity> pageForm) throws ParseException {
+	public DataGrid<DeliveryVo> grid(HttpServletRequest request, EasyPage<DeliveryInfoEntity> pageForm)
+			throws ParseException {
 		Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
 		searchParams.put("EQ_isdelete", 0);
-        String deliveryDate =searchParams.get("GTE_deliveryDate").toString();
+		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));
+		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));
+		String deliveryDate1 = searchParams.get("LTE_deliveryDate").toString();
+		if (StringUtils.isNotEmpty(deliveryDate1)) {
+			searchParams.put("LTE_deliveryDate", dateFormat.parse(deliveryDate1));
 		}
 		pageForm.setSearchParams(searchParams);
 		pageForm.parseData(deliveryInfoService.getPage(pageForm));
@@ -142,39 +158,40 @@ public class DeliveryInfoController extends BasicController{
 
 	/**
 	 * 编辑
+	 * 
 	 * @param id
 	 * @param model
 	 * @return
 	 */
-    @RequestMapping(value = "/edit" , method = {RequestMethod.GET })
+	@RequestMapping(value = "/edit", method = { RequestMethod.GET })
 	public String edit(Long id, Model model) {
 		DeliveryInfoEntity deliveryInfo = null;
-        if(id!=null){
+		if (id != null) {
 			deliveryInfo = deliveryInfoService.findOne(id);
 		}
 
 		model.addAttribute("delivery", deliveryInfo);
 		UserEntity user = SessionUtil.getUser();
-        if(user!=null && user.getAgent()!=null){
+		if (user != null && user.getAgent() != null) {
 			BasicAgentEntity agent = agentService.findOne(user.getAgent());
-            model.addAttribute("userAgent",agent);
+			model.addAttribute("userAgent", agent);
 		}
 
-        //品名代码
-//        List<DeliveryDicEntity> good =  deliverydicservice.findGood();
-//        model.addAttribute("good",good);
+		// 品名代码
+		// List<DeliveryDicEntity> good = deliverydicservice.findGood();
+		// model.addAttribute("good",good);
 
-        //监管代码
+		// 监管代码
 		List<SupervisionEntity> supervisionList = supervisionService.findAll();
-        model.addAttribute("supervisionList",supervisionList);
+		model.addAttribute("supervisionList", supervisionList);
 
-        //危险品代码
+		// 危险品代码
 		List<PubDgEntity> dgList = dgService.findAll();
-        model.addAttribute("dgList",dgList);
+		model.addAttribute("dgList", dgList);
 
-        //包装种类
+		// 包装种类
 		List<PackageTypeEntity> typeList = packageTypeService.findAll();
-        model.addAttribute("typeList",typeList);
+		model.addAttribute("typeList", typeList);
 		return "delivery/edit";
 	}
 
@@ -184,26 +201,26 @@ public class DeliveryInfoController extends BasicController{
 	 * @param hostId
 	 * @return
 	 */
-    @RequestMapping(value = "/size/get" , method = {RequestMethod.POST })
+	@RequestMapping(value = "/size/get", method = { RequestMethod.POST })
 	@ResponseBody
 	public String getSize(Long hostId) {
-       return JSON.toJSONString(sizeService.getList(Constant.packageSizeDelivery, hostId),filter);
+		return JSON.toJSONString(sizeService.getList(Constant.packageSizeDelivery, hostId), filter);
 	}
 
-
 	/**
 	 * 保存
+	 * 
 	 * @param deliveryJson
 	 * @return
 	 */
-    @RequestMapping(value = "/save" , method = {RequestMethod.POST })
+	@RequestMapping(value = "/save", method = { RequestMethod.POST })
 	@ResponseBody
-    public ResponseModel save(String deliveryJson,String sizeJson) {
+	public ResponseModel save(String deliveryJson, String sizeJson) {
 		ResponseModel model = new ResponseModel();
 		try {
-            DeliveryInfoEntity delivery = JSONObject.parseObject(deliveryJson,DeliveryInfoEntity.class);
-            List<PackageSizeEntity> sizeList = JSONArray.parseArray(sizeJson,PackageSizeEntity.class);
-            DeliveryInfoEntity deliveryInfo = deliveryInfoService.save(delivery,sizeList);
+			DeliveryInfoEntity delivery = JSONObject.parseObject(deliveryJson, DeliveryInfoEntity.class);
+			List<PackageSizeEntity> sizeList = JSONArray.parseArray(sizeJson, PackageSizeEntity.class);
+			DeliveryInfoEntity deliveryInfo = deliveryInfoService.save(delivery, sizeList);
 			model.setData(deliveryInfo.getId());
 			model.setStatus(200);
 		} catch (Exception e) {
@@ -215,26 +232,29 @@ public class DeliveryInfoController extends BasicController{
 
 	/**
 	 * 保存并且发送
+	 * 
 	 * @param deliveryJson
 	 * @return
 	 */
-    @RequestMapping(value = "/sendXml" , method = {RequestMethod.POST })
+	@RequestMapping(value = "/sendXml", method = { RequestMethod.POST })
 	@ResponseBody
-    public ResponseModel sendXml(String deliveryJson,String sizeJson,HttpServletRequest request) {
+	public ResponseModel sendXml(String deliveryJson, String sizeJson, HttpServletRequest request) {
 		ResponseModel model = new ResponseModel();
 		try {
-            DeliveryInfoEntity delivery = JSONObject.parseObject(deliveryJson,DeliveryInfoEntity.class);
+			DeliveryInfoEntity delivery = JSONObject.parseObject(deliveryJson, DeliveryInfoEntity.class);
 			delivery.setIsdelete(1);
-            List<PackageSizeEntity> sizeList = JSONArray.parseArray(sizeJson,PackageSizeEntity.class);
-            DeliveryInfoEntity deliveryInfo = deliveryInfoService.save(delivery,sizeList);
+			List<PackageSizeEntity> sizeList = JSONArray.parseArray(sizeJson, PackageSizeEntity.class);
+			DeliveryInfoEntity deliveryInfo = deliveryInfoService.save(delivery, sizeList);
 
-          //生成报文并且发送
+			// 生成报文并且发送
 			String rootPath = request.getSession().getServletContext().getRealPath("/");
-            String path = rootPath+"/excel/manifest"+new Date().getTime()+".xml";
-            String xml = XmlUtil.convertToXml2(deliveryInfoService.deliveryXml(delivery), path);
-            //发送redis储存数据
-            System.out.println(xml);
-            new RedisSaveMessage().saveMessage(xml);
+			String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";
+			new XmlBuildTask(deliveryInfoService.deliveryXml(delivery), path).perform();
+
+			// String xml = XmlUtil.convertToXml2(deliveryInfoService.deliveryXml(delivery),
+			// path);
+			// new XmlSendTask().saveMessage(xml);
+
 			model.setData(deliveryInfo.getId());
 			model.setStatus(200);
 		} catch (Exception e) {
@@ -244,33 +264,31 @@ public class DeliveryInfoController extends BasicController{
 		return model;
 	}
 
-
 	/**
 	 * 查询主单号是否存在
 	 *
 	 * @param mawbNo
 	 * @return
 	 */
-    @RequestMapping(value = "/queryMawbNo",method = {RequestMethod.POST})
+	@RequestMapping(value = "/queryMawbNo", method = { RequestMethod.POST })
 	@ResponseBody
-    public ResponseModel queryMawbId(Long id,String mawbNo){
+	public ResponseModel queryMawbId(Long id, String mawbNo) {
 		ResponseModel model = new ResponseModel();
 		List<DeliveryInfoEntity> list = null;
-        if(StringUtils.isNotEmpty(mawbNo)){
+		if (StringUtils.isNotEmpty(mawbNo)) {
 			list = deliveryInfoService.findByMawbNo(mawbNo);
 		}
 		boolean exist = false;
-        if(CollectionUtils.isNotEmpty(list)){
-            if(list.size()>1){
+		if (CollectionUtils.isNotEmpty(list)) {
+			if (list.size() > 1) {
 				exist = true;
-            }else if(!list.get(0).getId().equals(id)) {
+			} else if (!list.get(0).getId().equals(id)) {
 				exist = true;
 			}
 		}
-        if(exist){
+		if (exist) {
 			model.setStatus(500);
-        }
-        else {
+		} else {
 			model.setStatus(200);
 		}
 		return model;
@@ -278,10 +296,11 @@ public class DeliveryInfoController extends BasicController{
 
 	/**
 	 * 删除
+	 * 
 	 * @param ids
 	 * @return
 	 */
-    @RequestMapping(value = "/delete" , method = {RequestMethod.POST })
+	@RequestMapping(value = "/delete", method = { RequestMethod.POST })
 	@ResponseBody
 	public ResponseModel delete(String ids) {
 		ResponseModel model = new ResponseModel();
@@ -297,11 +316,11 @@ public class DeliveryInfoController extends BasicController{
 		return model;
 	}
 
-    private DataGrid<DeliveryVo> transferData(EasyPage<DeliveryInfoEntity> pageForm){
+	private DataGrid<DeliveryVo> transferData(EasyPage<DeliveryInfoEntity> pageForm) {
 		DataGrid<DeliveryInfoEntity> list = pageForm.getData();
 		List<DeliveryVo> rows = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(list.getRows())){
-            for(DeliveryInfoEntity entity:list.getRows()){
+		if (CollectionUtils.isNotEmpty(list.getRows())) {
+			for (DeliveryInfoEntity entity : list.getRows()) {
 				DeliveryVo vo = new DeliveryVo();
 				vo.setId(entity.getId());
 				vo.setSupplier(entity.getSupplier());
@@ -311,13 +330,13 @@ public class DeliveryInfoController extends BasicController{
 				vo.setCbm(entity.getCbm());
 				vo.setWeight(entity.getWeight());
 				vo.setScheduledFlight(entity.getScheduledFlight());
-                if(entity.getAgent()!=null){
+				if (entity.getAgent() != null) {
 					BasicAgentEntity agent = agentService.findOne(entity.getAgent());
-                    if(agent!=null){
+					if (agent != null) {
 						vo.setAgent(agent.getNameCn());
 					}
 				}
-                if(entity.getSendDate()!=null){
+				if (entity.getSendDate() != null) {
 					vo.setSendDate(Constant.dateFormat.format(entity.getSendDate()));
 				}
 				rows.add(vo);
@@ -329,25 +348,25 @@ public class DeliveryInfoController extends BasicController{
 		return vos;
 	}
 
-    //发送报文
-    @RequestMapping(value = "/xml",method = RequestMethod.POST)
+	// 发送报文
+	@RequestMapping(value = "/xml", method = RequestMethod.POST)
 	@ResponseBody
-    public ResponseModel createXml(Long id,HttpServletRequest request,HttpServletResponse response) throws Exception {
+	public ResponseModel createXml(Long id, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		ResponseModel model = new ResponseModel();
 		String rootPath = request.getSession().getServletContext().getRealPath("/");
-        String path = rootPath+"/excel/delivery"+new Date().getTime()+".xml";
+		String path = rootPath + "/excel/delivery" + new Date().getTime() + ".xml";
 		String xml = "";
-        if(id!=null){
-            xml = beanToXml(path,id);
+		if (id != null) {
+			xml = beanToXml(path, id);
 		}
 		model.setData(xml);
 		return model;
 	}
 
 	private String beanToXml(String path, Long id) {
-		//获取表中信息
+		// 获取表中信息
 		DeliveryInfoEntity deliveryInfo = deliveryInfoService.findOne(id);
-		//创建xml
+		// 创建xml
 		DeliveryInfoMasterConsignmentXml mas = new DeliveryInfoMasterConsignmentXml();
 		mas.setId(deliveryInfo.getMawbNo());
 		mas.setNilcarriagevalueindicator("true");
@@ -363,15 +382,16 @@ public class DeliveryInfoController extends BasicController{
 		mas.setTotaldisbursementprepaidindicator("true");
 		mas.setIncludedtaregrossweightmeasure(deliveryInfo.getWeight());
 		mas.setNetweightmeasure(deliveryInfo.getRecheckWeight());
-		 mas.setGrossvolumemeasure(deliveryInfo.getCbm());;
+		mas.setGrossvolumemeasure(deliveryInfo.getCbm());
+		;
 		mas.setTotalpiecequantity(deliveryInfo.getRecheckPieces());
 
-		 //发货人
+		// 发货人
 		DeliveryInfoConsignorPartyXML deli = new DeliveryInfoConsignorPartyXML();
 		deli.setName(deliveryInfo.getC_name());
 		deli.setLegalid(deliveryInfo.getC_legalid());
 		deli.setAccountid(deliveryInfo.getC_accountid());
-		 //发货人地址
+		// 发货人地址
 		PostalStructuredAddressXml pos = new PostalStructuredAddressXml();
 		pos.setPostcodeCode(deliveryInfo.getC_postcodecode());
 		pos.setStreetName(deliveryInfo.getC_streetname());
@@ -383,7 +403,7 @@ public class DeliveryInfoController extends BasicController{
 		pos.setCityID(deliveryInfo.getC_partycityid());
 		pos.setCountrySubDivisionID(deliveryInfo.getC_countrysubdivisionid());
 		deli.setPostalstructuredaddress(pos);
-		 //发货人电话
+		// 发货人电话
 		DefinedTradeContactXml def = new DefinedTradeContactXml();
 		def.setPersonname(deliveryInfo.getC_personname());
 		def.setDepartmentname(deliveryInfo.getC_departmentname());
@@ -407,12 +427,12 @@ public class DeliveryInfoController extends BasicController{
 		deli.setDefinedtradecontact(def);
 		mas.setConsignorparty(deli);
 
-		 //收货人
+		// 收货人
 		DeliveryInfoConsigneePartyXml del = new DeliveryInfoConsigneePartyXml();
 		del.setName(deliveryInfo.getS_name());
 		del.setLegalid(deliveryInfo.getS_legalid());
 		del.setAccountid(deliveryInfo.getS_accountid());
-		 //地址
+		// 地址
 		PostalStructuredAddressXml poss = new PostalStructuredAddressXml();
 		poss.setPostcodeCode(deliveryInfo.getS_postcodecode());
 		poss.setStreetName(deliveryInfo.getS_streetname());
@@ -425,7 +445,7 @@ public class DeliveryInfoController extends BasicController{
 		poss.setCountrySubDivisionID(deliveryInfo.getS_countrysubdivisionid());
 		del.setPostalstructuredaddress(poss);
 
-		 //电话
+		// 电话
 		DefinedTradeContactXml deff = new DefinedTradeContactXml();
 		deff.setPersonname(deliveryInfo.getS_personname());
 		deff.setDepartmentname(deliveryInfo.getC_departmentname());
@@ -449,12 +469,12 @@ public class DeliveryInfoController extends BasicController{
 		del.setDefinedtradecontact(deff);
 		mas.setConsigneeparty(del);
 
-		//填开代理人
+		// 填开代理人
 		DeliveryInfoFreightForwarderPartyXml defr = new DeliveryInfoFreightForwarderPartyXml();
 		defr.setName(deliveryInfo.getF_name());
 		defr.setLegalid(deliveryInfo.getF_legalid());
 		defr.setAccountid(deliveryInfo.getF_accountid());
-		 //地址
+		// 地址
 		PostalStructuredAddressXml stru = new PostalStructuredAddressXml();
 		stru.setPostcodeCode(deliveryInfo.getF_postcodecode());
 		stru.setStreetName(deliveryInfo.getF_streetname());
@@ -467,7 +487,7 @@ public class DeliveryInfoController extends BasicController{
 		stru.setCountrySubDivisionID(deliveryInfo.getF_countrysubdivisionid());
 		defr.setPostalstructuredaddress(stru);
 
-		 //电话
+		// 电话
 		DefinedTradeContactXml detf = new DefinedTradeContactXml();
 		detf.setPersonname(deliveryInfo.getF_personname());
 		detf.setDepartmentname(deliveryInfo.getF_departmentname());
@@ -491,12 +511,12 @@ public class DeliveryInfoController extends BasicController{
 		defr.setDefinedtradecontact(detf);
 		mas.setFreightforwarderparty(defr);
 
-		 //其他代理人
+		// 其他代理人
 		DeliveryInfoAssociatedPartyXml deliin = new DeliveryInfoAssociatedPartyXml();
 		deliin.setName(deliveryInfo.getA_name());
 		deliin.setLegalid(deliveryInfo.getA_legalid());
 		deliin.setAccountid(deliveryInfo.getA_accountid());
-		 //地址
+		// 地址
 		PostalStructuredAddressXml struip = new PostalStructuredAddressXml();
 		struip.setPostcodeCode(deliveryInfo.getP_postcodecode());
 		struip.setStreetName(deliveryInfo.getP_streetname());
@@ -509,7 +529,7 @@ public class DeliveryInfoController extends BasicController{
 		struip.setCountrySubDivisionID(deliveryInfo.getP_countrysubdivisionid());
 		deliin.setPostalstructuredaddress(stru);
 
-		 //电话
+		// 电话
 		DefinedTradeContactXml detfip = new DefinedTradeContactXml();
 		detfip.setPersonname(deliveryInfo.getP_personname());
 		detfip.setDepartmentname(deliveryInfo.getP_departmentname());
@@ -533,19 +553,19 @@ public class DeliveryInfoController extends BasicController{
 		deliin.setDefinedtradecontact(detfip);
 		mas.setAssociatedparty(deliin);
 
-		 //实发站
+		// 实发站
 		OriginLocationXml ori = new OriginLocationXml();
 		ori.setId(deliveryInfo.getOriginlocationid());
 		ori.setName(deliveryInfo.getOriginlocationname());
 		mas.setOriginlocation(ori);
 
-		 //目的站
+		// 目的站
 		FinalDestinationLocationXml fina = new FinalDestinationLocationXml();
 		fina.setId(deliveryInfo.getFinaldestinationlocationid());
 		fina.setName(deliveryInfo.getFinaldestinationlocationname());
 		mas.setFinaldestinationlocation(fina);
 
-		 //订仓信息
+		// 订仓信息
 		SpecifiedLogisticsTransportMovementXml spec = new SpecifiedLogisticsTransportMovementXml();
 		spec.setStagecode(deliveryInfo.getStagecode());
 		spec.setModecode(deliveryInfo.getModecode());
@@ -556,7 +576,6 @@ public class DeliveryInfoController extends BasicController{
 		used.setName(deliveryInfo.getM_name());
 		spec.setUsedlogisticstransportmeans(used);
 
-		 
 		ArrivalEventXml arrivalevent = new ArrivalEventXml();
 		arrivalevent.setScheduledoccurrencedatetime(deliveryInfo.getSc_datetime().toString());
 
@@ -581,13 +600,13 @@ public class DeliveryInfoController extends BasicController{
 		spec.setSequencenumeric("1");
 		mas.setSpecifiedlogisticstransportmovement(spec);
 
-		 //处理说明
+		// 处理说明
 		HandlingInstructionsXml hand = new HandlingInstructionsXml();
 		hand.setDescription(deliveryInfo.getSeq2_description());
 		hand.setDescriptioncode(deliveryInfo.getSeq2_descriptioncode());
 		mas.setHandlinginstructions(hand);
 
-		 //相关文件
+		// 相关文件
 		AssociatedReferenceDocumentXml ass = new AssociatedReferenceDocumentXml();
 		ass.setId(deliveryInfo.getAss_id());
 		ass.setIssuedatetime(deliveryInfo.getAss_issuedatetime().toString());
@@ -595,7 +614,7 @@ public class DeliveryInfoController extends BasicController{
 		ass.setName(deliveryInfo.getAss_name());
 		mas.setAssociatedreferencedocument(ass);
 
-		 //海关相关代码
+		// 海关相关代码
 		IncludedCustomsNoteXml inc = new IncludedCustomsNoteXml();
 		inc.setContentcode(deliveryInfo.getAss_contentcode());
 		inc.setContent(deliveryInfo.getAss_content());
@@ -603,7 +622,7 @@ public class DeliveryInfoController extends BasicController{
 		inc.setCountryid(deliveryInfo.getAss_countryid());
 		mas.setIncludedcustomsnote(inc);
 
-		 //货物信息
+		// 货物信息
 		IncludedMasterConsignmentItemXml clide = new IncludedMasterConsignmentItemXml();
 		clide.setSequencenumeric(deliveryInfo.getInc_sequencenumeric());
 		clide.setTypecode(deliveryInfo.getAss_typecode());
@@ -631,7 +650,6 @@ public class DeliveryInfoController extends BasicController{
 
 		clide.setTransportlogisticspackage(tr);
 
-		 
 		ApplicableFreightRateServiceChargeXml app = new ApplicableFreightRateServiceChargeXml();
 		app.setAppliedamount(deliveryInfo.getInc_appliedamount());
 		app.setAppliedrate(deliveryInfo.getInc_appliedrate());
@@ -642,7 +660,7 @@ public class DeliveryInfoController extends BasicController{
 
 		mas.setIncludedmasterconsignmentitem(clide);
 
-		 //状态
+		// 状态
 		ReportedStatusXml reop = new ReportedStatusXml();
 		reop.setReasonCode(deliveryInfo.getInc_reasoncode());
 		reop.setOperationCode(deliveryInfo.getInc_operationcode());
@@ -662,9 +680,9 @@ public class DeliveryInfoController extends BasicController{
 
 		String xml = XmlUtil.convertToXml2(mas, path);
 
-//	        System.out.println(xml);
-//	        IMFServletManifst  mis = new IMFServletManifst();
-//	        mis.init(xml.toString());
+		// System.out.println(xml);
+		// IMFServletManifst mis = new IMFServletManifst();
+		// mis.init(xml.toString());
 
 		return xml;
 	}
@@ -676,7 +694,7 @@ public class DeliveryInfoController extends BasicController{
 	 * @return
 	 * @return
 	 */
-	@RequestMapping(value = "/infor" )
+	@RequestMapping(value = "/infor")
 	@ResponseBody
 	public List<ManifestEntity> infor(String way) {
 		List<ManifestEntity> li = manifestService.findByMawbNo(way);

@@ -161,7 +161,7 @@ public class HandleBillController extends BasicController{
 //            System.out.println("-------");
             //发送redis储存数据
 //            System.out.println(xml);
-//            new RedisSaveMessage().saveMessage(xml);
+//            new XmlSendTask().saveMessage(xml);
             model.setStatus(200);
         } catch (Exception e) {
             model.setStatus(500);

@@ -38,7 +38,6 @@ import com.agent.entity.agent.TBasCarrierEntity;
 import com.agent.entity.agent.WaybillReceiptEntity;
 import com.agent.entity.agent.WaybillReceiptType;
 import com.agent.entity.system.UserEntity;
-import com.agent.imf.agent.redis.RedisSaveMessage;
 import com.agent.service.agent.BasicAgentService;
 import com.agent.service.agent.ConsigneeService;
 import com.agent.service.agent.ConsignorService;
@@ -55,6 +54,7 @@ import com.agent.service.system.RoleService;
 import com.agent.util.HttpJsonMsg;
 import com.agent.vo.ResponseModel;
 import com.agent.vo.agent.CommodityVo;
+import com.agent.xml.XmlBuildTask;
 import com.agent.xml.common.XmlHead;
 import com.agent.xml.common.XmlUtil;
 import com.agent.xml.fhlsli.FSXmlKit;
@@ -139,6 +139,44 @@ public class ManifestController extends BasicController {
 	@Resource
 	private WaybillReceiptService receiptService;
 
+	private BasicAgentEntity getAgent() {
+		UserEntity user = Tools.getUserEntity();
+		long agent_id = user.getAgent();
+		System.err.println("agent_id-->"+agent_id);
+		
+		BasicAgentEntity agent = agentService.findOne(agent_id);
+		if (agent == null) {
+			agent = new BasicAgentEntity();
+		}
+		if (StringUtils.isBlank(agent.getThreeCode())) {
+			agent.setThreeCode("");
+		}
+
+		if (StringUtils.isBlank(agent.getNameCn())) {
+			agent.setNameCn("");
+		}
+
+		return agent;
+	}
+	
+	/**
+	 * 测试用，查看当前账号对应的代理人信息
+	 * @param reuqest
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = "/getAgent", method = { RequestMethod.GET })
+	@ResponseBody
+	public ResponseModel getAgentInfo(HttpServletRequest reuqest, HttpServletResponse response) {
+		ResponseModel model = new ResponseModel();
+		response.setHeader("Access-Control-Allow-Origin", "*");
+		
+		BasicAgentEntity agent = getAgent();
+		model.setData(agent);
+		
+		return model;
+	}
+
 	/**
 	 * 列表页面
 	 * 
@@ -273,13 +311,18 @@ public class ManifestController extends BasicController {
 				// 生成报文并且发送
 				String rootPath = request.getSession().getServletContext().getRealPath("/");
 				String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";
-				System.out.println(path); // path
-				String ndlrxml = XmlUtil.convertToXml2(manifestService.sendNDLRXml(manifest), path);
-				String dlcfxml = XmlUtil.convertToXml2(manifestService.sendDLCFXml(manifest), path);
-				System.out.println(ndlrxml);
-				System.err.println(dlcfxml);
-				new RedisSaveMessage().saveMessage(ndlrxml);
-				new RedisSaveMessage().saveMessage(dlcfxml);
+
+				// String ndlrxml = XmlUtil.convertToXml2(manifestService.sendNDLRXml(manifest),
+				// path);
+				// String dlcfxml = XmlUtil.convertToXml2(manifestService.sendDLCFXml(manifest),
+				// path);
+				//
+				// new XmlSendTask(ndlrxml).send();
+				// new XmlSendTask(dlcfxml).send();
+
+				new XmlBuildTask(manifestService.sendNDLRXml(manifest), path).perform();
+				new XmlBuildTask(manifestService.sendDLCFXml(manifest), path).perform();
+
 				model.setStatus(200);
 				model.setMsg(HttpJsonMsg.SUCCESS);
 			}
@@ -407,12 +450,19 @@ public class ManifestController extends BasicController {
 				// 生成报文并且发送
 				String rootPath = request.getSession().getServletContext().getRealPath("/");
 				String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";
-				String ndlrxml = XmlUtil.convertToXml2(manifestService.presenddlcfNdlrXml(Preparesecondary), path);
-				String dlcfxml = XmlUtil.convertToXml2(manifestService.presenddlcfdlcfXml(Preparesecondary), path);
-				// 发送redis储存数据
-				// System.out.println(ndlrxml);
-				new RedisSaveMessage().saveMessage(ndlrxml);
-				new RedisSaveMessage().saveMessage(dlcfxml);
+
+				// String ndlrxml =
+				// XmlUtil.convertToXml2(manifestService.presenddlcfNdlrXml(Preparesecondary),
+				// path);
+				// String dlcfxml =
+				// XmlUtil.convertToXml2(manifestService.presenddlcfNdlrXml(Preparesecondary),
+				// path);
+				// new XmlSendTask(ndlrxml).send();
+				// new XmlSendTask(dlcfxml).send();
+
+				new XmlBuildTask(manifestService.presenddlcfNdlrXml(Preparesecondary), path).perform();
+				new XmlBuildTask(manifestService.presenddlcfNdlrXml(Preparesecondary), path).perform();
+
 				model.setData(Preparesecondary);
 				model.setStatus(200);
 				model.setMsg(HttpJsonMsg.SUCCESS);
@@ -554,7 +604,7 @@ public class ManifestController extends BasicController {
 		// model.addAttribute("customsStatus",flag);
 
 		String waybill_no = manifest != null ? manifest.getWaybillnomaster() : "";
-		WaybillReceiptEntity receipt = receiptService.findByWaybillNo(waybill_no);
+		WaybillReceiptEntity receipt = receiptService.findMain(waybill_no);
 		request.setAttribute("receipt", receipt);
 
 		return "manifest/edit";
@@ -678,7 +728,7 @@ public class ManifestController extends BasicController {
 		if (pre != null && pre.getWaybillnosecondary() != null) {
 			sub_waybill_no = pre.getWaybillnosecondary();
 		}
-		WaybillReceiptEntity receipt = receiptService.findByWaybillNoAndSub(waybill_no, sub_waybill_no);
+		WaybillReceiptEntity receipt = receiptService.findSub(waybill_no, sub_waybill_no);
 		request.setAttribute("receipt", receipt);
 
 		return "manifest/sub_edit";
@@ -820,8 +870,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 {
@@ -870,11 +920,11 @@ public class ManifestController extends BasicController {
 				// System.out.println("===================deletexml===================");
 				// System.out.println(deletexml);
 
-				// new RedisSaveMessage().saveMessage(ndlxml);
+				// new XmlSendTask().saveMessage(ndlxml);
 				// model.setStatus(200);
 
 				WaybillReceiptType type = WaybillReceiptType.DELETE;
-				manifest.setResponse_text("主单——" + type.getName());
+				manifest.setResponse_text(type.getName());
 				manifest.setResponse_code(String.valueOf(type.getValue()));
 				manifestService.save(manifest);
 				receiptService.saveFromManifest(manifest, type);
@@ -922,8 +972,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 {
@@ -944,7 +994,7 @@ public class ManifestController extends BasicController {
 				// 保存
 				manifest.setIsdelete(1);
 				manifest.setResponse_code(String.valueOf(type.getValue()));
-				manifest.setResponse_text("主单——" + type.getName());
+				manifest.setResponse_text(type.getName());
 				manifest.setSave_time(System.currentTimeMillis());
 				manifestService.save(manifest);
 				receiptService.saveFromManifest(manifest, type);
@@ -954,29 +1004,32 @@ public class ManifestController extends BasicController {
 				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(sliPath);
+				new XmlBuildTask(manifestService.sendNDLRXml(manifest), ndlrPath).perform();
+				new XmlBuildTask(manifestService.sendDLCFXml(manifest), dlcPath).perform();
+				new XmlBuildTask(FSXmlKit.sliXml(manifest, getAgent()), sliPath).perform();
 
-				System.err.println("===================ndlrxml===================");
-				System.err.println(ndlrxml);
-				System.err.println();
+				// String ndlrxml = XmlUtil.convertToXml2(manifestService.sendNDLRXml(manifest),
+				// ndlrPath);
+				// String dlcfxml = XmlUtil.convertToXml2(manifestService.sendDLCFXml(manifest),
+				// dlcPath);
+				// String slifxml = XmlUtil.convertToXml2(FSXmlKit.sliXml(manifest, getAgent()),
+				// sliPath);
 
-				System.err.println("===================dlcfxml===================");
-				System.err.println(dlcfxml);
-				System.err.println();
-
-				System.err.println("===================slifxml===================");
-				System.err.println(slifxml);
-				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();
 
-				new RedisSaveMessage().saveMessage(ndlrxml);
-				new RedisSaveMessage().saveMessage(dlcfxml);
-				new RedisSaveMessage().saveMessage(slifxml);
+				// new XmlSendTask(ndlrxml).send();
+				// new XmlSendTask(dlcfxml).send();
+				// new XmlSendTask(slifxml).send();
 
 				model.setData(manifest);
 				model.setStatus(200);
@@ -1015,9 +1068,12 @@ public class ManifestController extends BasicController {
 				// 生成报文并且发送
 				String rootPath = request.getSession().getServletContext().getRealPath("/");
 				String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";
-				String dlcfxml = XmlUtil.convertToXml2(manifestService.sendDeliveryXml(manifest), path);
-				// System.out.println(dlcfxml);
-				new RedisSaveMessage().saveMessage(dlcfxml);
+				new XmlBuildTask(manifestService.sendDeliveryXml(manifest), path).perform();
+
+				// String dlcfxml =
+				// XmlUtil.convertToXml2(manifestService.sendDeliveryXml(manifest), path);
+				// new XmlSendTask(dlcfxml).send();
+
 				model.setStatus(200);
 				model.setMsg(HttpJsonMsg.SUCCESS);
 			}
@@ -1071,8 +1127,10 @@ 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 {
@@ -1118,10 +1176,10 @@ public class ManifestController extends BasicController {
 					// path);
 
 					// System.out.println(ndlrxml);
-					// new RedisSaveMessage().saveMessage(ndlrxml);
+					// new XmlSendTask().saveMessage(ndlrxml);
 
 					WaybillReceiptType type = WaybillReceiptType.DELETE;
-					preparesecondary.setResponse_text("分单——" + type.getName());
+					preparesecondary.setResponse_text(type.getName());
 					preparesecondary.setResponse_code(String.valueOf(type.getValue()));
 					preparesecondaryServer.save(preparesecondary);
 
@@ -1153,8 +1211,10 @@ 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 {
@@ -1174,7 +1234,7 @@ public class ManifestController extends BasicController {
 				preparesecondary.setStowagedate(preparesecondary.getStowagedate(stowagedate));
 				preparesecondary.setIsdelete(1);
 				preparesecondary.setResponse_code(String.valueOf(type.getValue()));
-				preparesecondary.setResponse_text("分单——" + type.getName());
+				preparesecondary.setResponse_text(type.getName());
 				preparesecondaryServer.save(preparesecondary);
 				receiptService.saveFromPreparesecondary(preparesecondary, type);
 
@@ -1183,30 +1243,39 @@ public class ManifestController extends BasicController {
 				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);
+				new XmlBuildTask(manifestService.presenddlcfNdlrXml(preparesecondary), ndlrPath).perform();
+				new XmlBuildTask(manifestService.presenddlcfdlcfXml(preparesecondary), dlcPath).perform();
+				new XmlBuildTask(FSXmlKit.fhlXml(preparesecondary, getAgent()), fhlPath).perform();
+
+				// String ndlrxml =
+				// XmlUtil.convertToXml2(manifestService.presenddlcfNdlrXml(preparesecondary),
+				// ndlrPath);
+				// String dlcfxml =
+				// XmlUtil.convertToXml2(manifestService.presenddlcfdlcfXml(preparesecondary),
+				// dlcPath);
+				// String fhlfxml = XmlUtil.convertToXml2(FSXmlKit.fhlXml(preparesecondary,
+				// getAgent()), fhlPath);
 
 				// RemoteFileKit.putFile(ndlrPath);
 				// RemoteFileKit.putFile(dlcPath);
 				// RemoteFileKit.putFile(fhlPath);
 
 				// 发送redis储存数据
-				new RedisSaveMessage().saveMessage(ndlrxml);
-				new RedisSaveMessage().saveMessage(dlcfxml);
-				new RedisSaveMessage().saveMessage(fhlfxml);
-
-				System.out.println("===================ndlrxml===================");
-				System.out.println(ndlrxml);
-				System.out.println();
-
-				System.out.println("===================dlcfxml===================");
-				System.err.println(dlcfxml);
-				System.out.println();
+				// new XmlSendTask(ndlrxml).send();
+				// new XmlSendTask(dlcfxml).send();
+				// new XmlSendTask(fhlfxml).send();
 
-				System.out.println("===================fhlfxml===================");
-				System.err.println(fhlfxml);
-				System.out.println();
+				// System.out.println("===================ndlrxml===================");
+				// System.out.println(ndlrxml);
+				// System.out.println();
+				//
+				// System.out.println("===================dlcfxml===================");
+				// System.err.println(dlcfxml);
+				// System.out.println();
+				//
+				// System.out.println("===================fhlfxml===================");
+				// System.err.println(fhlfxml);
+				// System.out.println();
 
 				model.setData(preparesecondary);
 				model.setStatus(200);
@@ -1242,10 +1311,12 @@ public class ManifestController extends BasicController {
 				// 生成报文并且发送
 				String rootPath = request.getSession().getServletContext().getRealPath("/");
 				String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";
-				String dlcfxml = XmlUtil.convertToXml2(manifestService.sendPreXml(Preparesecondary), path);
-				// 发送redis储存数据
-				// System.out.println(dlcfxml);
-				new RedisSaveMessage().saveMessage(dlcfxml);
+				// String dlcfxml =
+				// XmlUtil.convertToXml2(manifestService.sendPreXml(Preparesecondary), path);
+				// new XmlSendTask(dlcfxml).send();
+
+				new XmlBuildTask(manifestService.sendPreXml(Preparesecondary), path).perform();
+
 				model.setData(Preparesecondary);
 				model.setStatus(200);
 				model.setMsg(HttpJsonMsg.SUCCESS);

@@ -140,14 +140,14 @@ public class ReceiptController {
 	 * @return
 	 */
 	@RequestMapping(value = "/seeReceipt")
-	public String seeReceipt(HttpServletRequest request, String no, boolean isMain) {
+	public String seeReceipt(HttpServletRequest request, String waybill_no, String sub_waybill_no) {
 		List<WaybillReceiptEntity> dataList = null;
-		if (isMain) {
+		if (StringUtils.isNotBlank(waybill_no) && StringUtils.isBlank(sub_waybill_no)) {
 			// 查询主单回执
-			dataList = receiptService.findMainList(no);
-		} else {
+			dataList = receiptService.findMainList(waybill_no);
+		} else if (StringUtils.isNotBlank(waybill_no) && StringUtils.isNotBlank(sub_waybill_no)) {
 			// 查询分单回执
-			dataList = receiptService.findSubList(no);
+			dataList = receiptService.findSubList(waybill_no, sub_waybill_no);
 		}
 
 		request.setAttribute("dataList", dataList);

@@ -12,6 +12,7 @@ public class Constant {
 
 	// 日期格式化
 	public final static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+	public final static SimpleDateFormat dateFormat_ = new SimpleDateFormat("yyyyMMdd");
 
 	// 日期格式化
 	public final static SimpleDateFormat dateFormatYYYYMM = new SimpleDateFormat("yyyyMM");

@@ -154,4 +154,5 @@ public class BasicAgentEntity extends IdEntity {
 	public void setIdCode(String idCode) {
 		this.idCode = idCode;
 	}
+
 }

@@ -375,7 +375,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 
 	@Column(name = "DE_NUMBER")
 	public String getDe_number() {
-		return de_number;
+		return getTotalpiece();
 	}
 
 	public void setDe_number(String de_number) {
@@ -384,7 +384,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 
 	@Column(name = "DE_WEIGHT")
 	public String getDe_weight() {
-		return de_weight;
+		return getTotalweight();
 	}
 
 	public void setDe_weight(String de_weight) {
@@ -393,7 +393,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 
 	@Column(name = "DE_CHWEIGHT")
 	public String getDe_chweight() {
-		return de_chweight;
+		return getTotalweight();
 	}
 
 	public void setDe_chweight(String de_chweight) {
@@ -537,7 +537,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 
 	@Column(name = "PREPARETOTALPIECE")
 	public String getPreparetotalpiece() {
-		return StringUtils.isBlank(preparetotalpiece)?getTotalpiece():preparetotalpiece;
+		return getTotalpiece();
 	}
 
 	public void setPreparetotalpiece(String preparetotalpiece) {
@@ -546,7 +546,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 
 	@Column(name = "PREPARETOTALWEIGHT")
 	public String getPreparetotalweight() {
-		return StringUtils.isBlank(preparetotalweight)?getTotalweight():preparetotalweight;
+		return getTotalweight();
 	}
 
 	public void setPreparetotalweight(String preparetotalweight) {

@@ -385,7 +385,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 
 	@Column(name = "DE_NUMBER")
 	public String getDe_number() {
-		return de_number;
+		return getTotalpiece();
 	}
 
 	public void setDe_number(String de_number) {
@@ -394,7 +394,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 
 	@Column(name = "DE_WEIGHT")
 	public String getDe_weight() {
-		return de_weight;
+		return getTotalweight();
 	}
 
 	public void setDe_weight(String de_weight) {
@@ -403,7 +403,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 
 	@Column(name = "DE_CHWEIGHT")
 	public String getDe_chweight() {
-		return de_chweight;
+		return getTotalweight();
 	}
 
 	public void setDe_chweight(String de_chweight) {
@@ -538,7 +538,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 
 	@Column(name = "PREPAREPIECE")
 	public String getPreparepiece() {
-		return StringUtils.isBlank(preparepiece)?getTotalpiece():preparepiece;
+		return getTotalpiece();
 	}
 
 	public void setPreparepiece(String preparepiece) {
@@ -547,7 +547,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 
 	@Column(name = "PREPAREWEIGHT")
 	public String getPrepareweight() {
-		return StringUtils.isBlank(prepareweight)?getTotalweight():prepareweight;
+		return getTotalweight();
 	}
 
 	public void setPrepareweight(String prepareweight) {

@@ -148,7 +148,7 @@ public class UserEntity extends BasicEntity {
 
 	@Column(name = "AGENT_ID")
 	public Long getAgent() {
-		return agent;
+		return agent == null ? 0l : agent;
 	}
 
 	public void setAgent(Long agent) {

-package com.agent.imf.agent.redis;
-
-import org.apache.commons.lang3.StringUtils;
-
-import redis.clients.jedis.Jedis;
-
-//缓存数据 
-public class RedisSaveMessage {
-
-	// 创建 缓存服务器的地址ip
-	Jedis jedis = new Jedis("10.50.3.71", 6379);
-
-	// Jedis jedis = new Jedis("192.168.0.253", 6379);
-	public class JEDIS {
-
-	}
-
-	// 存信息
-	public long saveMessage(String str) {
-		if (StringUtils.isEmpty(str)) {
-			return -1;
-		}
-		return jedis.lpush("task-queue", str);
-	}
-
-}
-// 北环
-//
\ No newline at end of file

@@ -19,10 +19,10 @@ public interface ConsigneeRepository
 	@Query(value = "SELECT * FROM PUB_CONSIGNEE WHERE ID = ?1 ORDER BY ID DESC", nativeQuery = true)
 	public List<ConsigneeEntity> findById(String id);
 
-	@Query(value = "SELECT * FROM(SELECT rownum rn,c.* from PUB_CONSIGNEE c where c.creator=?1 and c.name LIKE %?2%) cr where cr.rn between ?3 and ?4", nativeQuery = true)
+	@Query(value = "SELECT * FROM(SELECT rownum rn,c.* from PUB_CONSIGNEE c where c.creator=?1 and c.name LIKE %?2% order by c.id desc) cr where cr.rn between ?3 and ?4", nativeQuery = true)
 	public List<ConsigneeEntity> search(long user_id,String key,int start,int end);
 	
-	@Query(value = "SELECT * FROM(SELECT rownum rn,c.* from PUB_CONSIGNEE c where c.creator=?1) cr where cr.rn between ?2 and ?3", nativeQuery = true)
+	@Query(value = "SELECT * FROM(SELECT rownum rn,c.* from PUB_CONSIGNEE c where c.creator=?1 order by c.id desc) cr where cr.rn between ?2 and ?3", nativeQuery = true)
 	public List<ConsigneeEntity> list(long user_id,int start,int end);
 	
 	@Query(value = "SELECT * FROM PUB_CONSIGNEE WHERE CREATOR = ?1 ORDER BY ID DESC", nativeQuery = true)

@@ -19,10 +19,10 @@ public interface ConsignorRepository
 	@Query(value = "SELECT * FROM CONSIGNOR WHERE ID = ?1 ORDER BY ID DESC", nativeQuery = true)
 	public List<ConsignorEntity> findById(String id);
 
-	@Query(value = "SELECT * FROM(SELECT rownum rn,c.* from CONSIGNOR c where c.creator=?1 and c.co_company LIKE %?2%) cr where cr.rn between ?3 and ?4", nativeQuery = true)
+	@Query(value = "SELECT * FROM(SELECT rownum rn,c.* from CONSIGNOR c where c.creator=?1 and c.co_company LIKE %?2% order by c.id desc) cr where cr.rn between ?3 and ?4", nativeQuery = true)
 	public List<ConsignorEntity> search(long user_id,String key,int start,int end);
 	
-	@Query(value = "SELECT * FROM(SELECT rownum rn,c.* from CONSIGNOR c where c.creator=?1) cr where cr.rn between ?2 and ?3", nativeQuery = true)
+	@Query(value = "SELECT * FROM(SELECT rownum rn,c.* from CONSIGNOR c where c.creator=?1 order by c.id desc) cr where cr.rn between ?2 and ?3", nativeQuery = true)
 	public List<ConsignorEntity> list(long user_id,int start,int end);
 	
 	@Query(value = "SELECT * FROM CONSIGNOR WHERE CREATOR = ?1 ORDER BY ID DESC", nativeQuery = true)

@@ -16,8 +16,8 @@ public interface WaybillReceiptRepository
 	@Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE WAYBILL_NO = ?1 AND SUB_WAYBILL_NO = ?2 ORDER BY ID DESC", nativeQuery = true)
 	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 = ?2 ORDER BY ID DESC", nativeQuery = true)
+	public List<WaybillReceiptEntity> findSubList(String waybill_no,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);

@@ -14,7 +14,6 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.List;
 
-
 @Service
 public class BasicAgentService extends BasicService<BasicAgentEntity> {
 
@@ -24,7 +23,8 @@ public class BasicAgentService extends BasicService<BasicAgentEntity> {
 	/**
 	 * 分页查询
 	 *
-     * @param pageForm 分页对象
+	 * @param pageForm
+	 *            分页对象
 	 * @return 包含分页信息和数据的分页对象
 	 */
 	public Page<BasicAgentEntity> getPage(EasyPage<BasicAgentEntity> pageForm) {
@@ -34,11 +34,11 @@ public class BasicAgentService extends BasicService<BasicAgentEntity> {
 		return page;
 	}
 
-    public List<BasicAgentEntity> findAll(){
+	public List<BasicAgentEntity> findAll() {
 		return agentRepository.findAll();
 	}
 
-    public BasicAgentEntity findOne(Long id){
+	public BasicAgentEntity findOne(Long id) {
 		return agentRepository.findOne(id);
 	}
 
@@ -50,26 +50,25 @@ public class BasicAgentService extends BasicService<BasicAgentEntity> {
 	 */
 	@Transactional
 	public BasicAgentEntity save(BasicAgentEntity agent) {
-    	//System.out.println("contacts:"+agent.getContact()+" NAME_CN:"+agent.getNameCn()+" CODE:"+agent.getCountryCode());
-        return agentRepository.save(agent);//agent.getCityCode(), agent.getContact(), agent.getCountryCode(), agent.getNameCn());
+		return agentRepository.save(agent);
 	}
 
 	@Transactional
-    public int save2(BasicAgentEntity agent){    
-    	//如果已经存在则直接返回
-    	List<BasicAgentEntity> a = agentRepository.findWhere(agent.getContact(), agent.getCountryCode(), agent.getNameCn(), agent.getAddress());
-    	if(a != null && a.size() == 1)
-    	{
+	public int save2(BasicAgentEntity agent) {
+		// 如果已经存在则直接返回
+		List<BasicAgentEntity> a = agentRepository.findWhere(agent.getContact(), agent.getCountryCode(),
+				agent.getNameCn(), agent.getAddress());
+		if (a != null && a.size() == 1) {
 			return a.get(0).getId().intValue();
 		}
 
-    	int is = agentRepository.save2(agent.getCityCode(), agent.getContact(), agent.getCountryCode(), agent.getNameCn(), agent.getAddress());
-    	if(is == 1)
-    	{
-    		//插入成功！
-    		a = agentRepository.findWhere(agent.getContact(), agent.getCountryCode(), agent.getNameCn(), agent.getAddress());
-    		if(a != null && a.size() > 0)
-    		{
+		int is = agentRepository.save2(agent.getCityCode(), agent.getContact(), agent.getCountryCode(),
+				agent.getNameCn(), agent.getAddress());
+		if (is == 1) {
+			// 插入成功！
+			a = agentRepository.findWhere(agent.getContact(), agent.getCountryCode(), agent.getNameCn(),
+					agent.getAddress());
+			if (a != null && a.size() > 0) {
 				return a.get(0).getId().intValue();
 			}
 			System.out.println("null");
@@ -81,7 +80,8 @@ public class BasicAgentService extends BasicService<BasicAgentEntity> {
 	/**
 	 * 批量删除
 	 *
-     * @param ids 1,2,3
+	 * @param ids
+	 *            1,2,3
 	 */
 	@Transactional
 	public void deleteAll(String ids) {

@@ -25,6 +25,7 @@ import com.agent.repository.agent.PreparesecondaryRepository;
 import com.agent.service.BasicService;
 import com.agent.xml.bill.ApplicableLogisticsAllowanceChargeXml;
 import com.agent.xml.bill.ApplicableTradeCurrencyExchangeXml;
+import com.agent.xml.common.ContentXml;
 import com.agent.xml.common.IDXml;
 import com.agent.xml.common.NameXml;
 import com.agent.xml.common.XmlHead;
@@ -133,13 +134,13 @@ public class ManifestService extends BasicService<ManifestEntity> {
 		Specification<ManifestEntity> spec = buildSpecification(pageForm);
 
 		Page<ManifestEntity> page = manifestRepository.findAll(spec, pageRequest);
-		if(page!=null&&page.getContent()!=null) {
+		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():"");
+				WaybillReceiptEntity re = receiptService.findMain(bean.getWaybillnomaster());
+				bean.setResponse_code(re != null ? re.getResponse_code() : "");
+				bean.setResponse_text(re != null ? re.getResponse_text() : "");
 			}
 		}
 		return page;
@@ -877,6 +878,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
 		drp.setName("70678920X");
 		declare.setRepresentativePerson(drp);
 
+		if (WaybillReceiptType.DELETE != type) {
 			// 运输工具离境海关代码
 			IDXml decox = new IDXml();
 			decox.setId("CGO");
@@ -887,12 +889,14 @@ public class ManifestService extends BasicService<ManifestEntity> {
 			IDXml carr = new IDXml();
 			carr.setId(isManifest ? me.getCarrier() : pe.getCarrier());
 			declare.setCarrier(carr);
+		}
 
 		// 航班号-航班日期
 		DeclareBorderTransportMeansXml mt = new DeclareBorderTransportMeansXml();
-		mt.setJourneyID(isManifest ? me.getFlightno()
-				: pe.getFlightno() + "/"
-						+ Constant.dateFormat.format(isManifest ? me.getFlightdate() : pe.getFlightdate()));
+		String carrier = isManifest ? me.getCarrier() : pe.getCarrier();
+		String flightno = isManifest ? me.getFlightno() : pe.getFlightno();
+		String dateStr = Constant.dateFormat_.format(isManifest ? me.getFlightdate() : pe.getFlightdate());
+		mt.setJourneyID(carrier + flightno + "/" + dateStr);
 		// 运输方式代码
 		mt.setTypeCode("4");
 		declare.setBorderTransportMeans(mt);
@@ -902,7 +906,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
 		// 运单号
 		DeclareTransportContractDocumentXml mac = new DeclareTransportContractDocumentXml();
 		mac.setId(isManifest ? me.getWaybillnomaster() : pe.getWaybillnomaster());
-		mac.setChangeReasonCode(changeReasonCode == null ? "9999" : changeReasonCode);
+		mac.setChangeReasonCode(changeReasonCode == null ? "999" : changeReasonCode);
 		mac.setConditionCode("10");// 暂时固定
 		consignment.setTransportContractDocument(mac);
 
@@ -913,6 +917,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
 			consignment.setAssociatedTransportDocument(matx);
 		}
 
+		if (WaybillReceiptType.DELETE != type) {
 			// 装载日期
 			DeclareLoadingLocationXml ml = new DeclareLoadingLocationXml();
 			ml.setId("CGO/4604");
@@ -997,9 +1002,16 @@ public class ManifestService extends BasicService<ManifestEntity> {
 
 			DeclareConsignmentItemXml consignmentitem = new DeclareConsignmentItemXml();
 			consignment.setConsignmentItem(consignmentitem);
+		}
 
 		declare.setConsignment(consignment);
 
+		if (WaybillReceiptType.DELETE == type) {
+			ContentXml additionalInformation = new ContentXml();
+			additionalInformation.setContent("");
+			declare.setAdditionalInformation(additionalInformation);
+		}
+
 		body.setDeclaration(declare);
 		return body;
 	}

@@ -35,7 +35,7 @@ public class PreparesecondaryService extends BasicService<PreparesecondaryEntity
 		if(list!=null) {
 			for (int i = 0; i < list.size(); i++) {
 				PreparesecondaryEntity bean = list.get(i);
-				WaybillReceiptEntity re = receiptService.findByWaybillNoAndSub(bean.getWaybillnomaster(), bean.getWaybillnosecondary());
+				WaybillReceiptEntity re = receiptService.findSub(bean.getWaybillnomaster(), bean.getWaybillnosecondary());
 				bean.setResponse_code(re!=null?re.getResponse_code():"");
 				bean.setResponse_text(re!=null?re.getResponse_text():"");
 			}

@@ -50,7 +50,15 @@ public class WaybillReceiptService extends BasicService<WaybillReceiptEntity> {
 		}
 	}
 
-	public WaybillReceiptEntity findByWaybillNoAndSub(String waybill_no, String sub_waybill_no) {
+	public WaybillReceiptEntity findMain(String waybill_no) {
+		List<WaybillReceiptEntity> consigns = service.findMainList(waybill_no);
+		if (CollectionUtils.isNotEmpty(consigns)) {
+			return consigns.get(0);
+		}
+		return null;
+	}
+
+	public WaybillReceiptEntity findSub(String waybill_no, String sub_waybill_no) {
 		List<WaybillReceiptEntity> consigns = service.findByWaybillNoAndSub(waybill_no, sub_waybill_no);
 		if (CollectionUtils.isNotEmpty(consigns)) {
 			return consigns.get(0);
@@ -63,19 +71,11 @@ public class WaybillReceiptService extends BasicService<WaybillReceiptEntity> {
 		return list;
 	}
 
-	public List<WaybillReceiptEntity> findSubList(String sub_waybill_no) {
-		List<WaybillReceiptEntity> list = service.findSubList(sub_waybill_no);
+	public List<WaybillReceiptEntity> findSubList(String waybill_no, String sub_waybill_no) {
+		List<WaybillReceiptEntity> list = service.findSubList(waybill_no,sub_waybill_no);
 		return list;
 	}
 
-	public WaybillReceiptEntity findByWaybillNo(String waybill_no) {
-		List<WaybillReceiptEntity> consigns = service.findMainList(waybill_no);
-		if (CollectionUtils.isNotEmpty(consigns)) {
-			return consigns.get(0);
-		}
-		return null;
-	}
-
 	public void save(WaybillReceiptEntity c) {
 		if (c != null) {
 			if (c.getCreateDate() == null) {
@@ -115,7 +115,7 @@ public class WaybillReceiptService extends BasicService<WaybillReceiptEntity> {
 			wre.setFlightno(manifest.getFlightno());
 			wre.setMessage_type("MT2201");
 			wre.setResponse_code(String.valueOf(type.getValue()));
-			wre.setResponse_text("主单——" + type.getName());
+			wre.setResponse_text(type.getName());
 			wre.setSendtime(Constant.dateTimeFormatnumber.format(new Date()));
 			wre.setWaybill_no(manifest.getWaybillnomaster());
 			wre.setCreator(Tools.getUserEntity());
@@ -153,7 +153,7 @@ public class WaybillReceiptService extends BasicService<WaybillReceiptEntity> {
 			wre.setFlightno(prepare.getFlightno());
 			wre.setMessage_type("MT2201");
 			wre.setResponse_code(String.valueOf(type.getValue()));
-			wre.setResponse_text("分单——" + type.getName());
+			wre.setResponse_text(type.getName());
 			wre.setSendtime(Constant.dateTimeFormatnumber.format(new Date()));
 			wre.setWaybill_no(prepare.getWaybillnomaster());
 			wre.setSub_waybill_no(prepare.getWaybillnosecondary());

+package com.agent.xml;
+
+import com.agent.xml.common.XmlUtil;
+
+/**
+ * Depiction: 报文缓存并发送任务
+ * <p>
+ * Modify:
+ * <p>
+ * Author: William Lynn
+ * <p>
+ * Create Date：2018年7月16日 下午12:00:13
+ * 
+ */
+public class XmlBuildTask extends Thread {
+	private Object obj;
+	private String path;
+
+	public XmlBuildTask(Object obj, String path) {
+		this.obj = obj;
+		this.path = path;
+	}
+
+	@Override
+	public void run() {
+		String xml = XmlUtil.convertToXml2(obj, path);
+		System.err.println();
+		System.err.println("===================xml===================");
+		System.err.println(xml);
+
+		new XmlSendTask(xml).send();
+	}
+
+	public void perform() {
+		this.start();
+	}
+}

+package com.agent.xml;
+
+import org.apache.commons.lang3.StringUtils;
+
+import redis.clients.jedis.Jedis;
+
+/**
+ * 
+ * Depiction: 发送报文
+ * <p>
+ * Modify:
+ * <p>
+ * Author: William Lynn
+ * <p>
+ * Create Date：2018年7月16日 下午12:13:37
+ *
+ */
+class XmlSendTask extends Thread {
+	// 创建 缓存服务器的地址ip
+	private Jedis jedis = new Jedis("10.50.3.71", 6379);
+
+	private String xml;
+
+	public XmlSendTask(String xml) {
+		this.xml = xml;
+	}
+
+	@Override
+	public void run() {
+		long flag = -1;
+		if (!StringUtils.isEmpty(xml)) {
+			flag = jedis.lpush("task-queue", xml);
+		}
+
+		System.err.println("redis result -->" + flag);
+	}
+
+	public void send() {
+		this.start();
+	}
+
+}

@@ -4,15 +4,12 @@ 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;
@@ -53,8 +50,6 @@ 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>
@@ -67,25 +62,6 @@ import tools.Tools;
  */
 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);
 		return sdf.format(new Date());
@@ -96,7 +72,7 @@ public class FSXmlKit {
 	 * 
 	 * @param me
 	 */
-	public static SliCcs sliXml(ManifestEntity me) {
+	 public static SliCcs sliXml(ManifestEntity me,BasicAgentEntity agent) {
 		SliCcs msg = new SliCcs();
 
 		Meta meta = new Meta();
@@ -153,8 +129,8 @@ public class FSXmlKit {
 		sliMasterConsignment.setConsigneeParty(consigneeParty);
 
 		FreightForwarderParty freightForwarderParty = new FreightForwarderParty();
-//		freightForwarderParty.setPrimaryID(getAgent().getThreeCode());//代理人代码
-//		freightForwarderParty.setName(getAgent().getNameEn());//代理人名称
+		freightForwarderParty.setPrimaryID(agent.getThreeCode());//代理人代码
+		freightForwarderParty.setName(agent.getThreeCode());//代理人名称
 		PostalStructuredAddress agentdAddress = new PostalStructuredAddress();
 		agentdAddress.setCityName("");
 		agentdAddress.setCountryID("");
@@ -163,8 +139,11 @@ public class FSXmlKit {
 
 		AssociatedParty associatedParty = new AssociatedParty();
 		
-		associatedParty.setPrimaryID(getAgent().getThreeCode());//代理人代码
-		associatedParty.setName(getAgent().getNameEn());//代理人名称
+		associatedParty.setPrimaryID(agent.getThreeCode());//代理人代码
+		associatedParty.setName(agent.getThreeCode());//代理人名称
+		associatedParty.setAccountID("INFOSKY:NULL");
+		associatedParty.setRoleCode("AGT");
+		associatedParty.setRole("Agent");
 		associatedParty.setPostalStructuredAddress(agentdAddress);
 		sliMasterConsignment.setAssociatedParty(associatedParty);
 
@@ -277,7 +256,7 @@ public class FSXmlKit {
 	 * 
 	 * @param pe
 	 */
-	public static FhlCcs fhlXml(PreparesecondaryEntity pe) {
+	 public static FhlCcs fhlXml(PreparesecondaryEntity pe,BasicAgentEntity agent) {
 		FhlCcs msg = new FhlCcs();
 
 		Meta meta = new Meta();
@@ -374,8 +353,8 @@ public class FSXmlKit {
 		includedHouseConsignment.setConsigneeParty(consigneeParty);
 
 		FreightForwarderParty freightForwarderParty = new FreightForwarderParty();
-//		freightForwarderParty.setPrimaryID(getAgent().getThreeCode());//代理人代码
-//		freightForwarderParty.setName(getAgent().getNameEn());//代理人名称
+		freightForwarderParty.setPrimaryID(agent.getThreeCode());//代理人代码
+		freightForwarderParty.setName(agent.getThreeCode());//代理人名称
 		
 		PostalStructuredAddress agentdAddress = new PostalStructuredAddress();
 		agentdAddress.setCityName("");
@@ -384,8 +363,11 @@ public class FSXmlKit {
 		includedHouseConsignment.setFreightForwarderParty(freightForwarderParty);
 
 		AssociatedParty associatedParty = new AssociatedParty();
-		associatedParty.setPrimaryID(getAgent().getThreeCode());//代理人代码
-		associatedParty.setName(getAgent().getNameEn());//代理人名称
+		associatedParty.setPrimaryID(agent.getThreeCode());//代理人代码
+		associatedParty.setName(agent.getThreeCode());//代理人名称
+		associatedParty.setAccountID("INFOSKY:NULL");
+		associatedParty.setRoleCode("AGT");
+		associatedParty.setRole("Agent");
 		associatedParty.setPostalStructuredAddress(agentdAddress);
 		includedHouseConsignment.setAssociatedParty(associatedParty);
 

@@ -27,6 +27,8 @@ public class AssociatedParty {
 	@XmlElement(name = "LegalID",required = false)
 	private String LegalID;
 	@XmlElement(name = "RoleCode",required = false)
+	private String AccountID;
+	@XmlElement(name = "AccountID",required = false)
 	private String RoleCode;
 	@XmlElement(name = "Role",required = false)
 	private String Role;
@@ -61,6 +63,15 @@ public class AssociatedParty {
 		return LegalID;
 	}
 	
+
+	public String getAccountID() {
+		return AccountID;
+	}
+
+	public void setAccountID(String accountID) {
+		AccountID = accountID;
+	}
+
 	public void setRoleCode(String RoleCode) {
 		this.RoleCode = RoleCode;
 	}

@@ -3,28 +3,25 @@ package com.framework.util;
 import java.security.MessageDigest;
 
 /**
- * MD5加密工具类 
- * <功能详细描述> 
+ * MD5加密工具类 <功能详细描述>
  * 
  * @author chenlujun
  * @version [版本号, 2014年10月1日]
  * @see [相关类/方法]
  * @since [产品/模块版本]
  */
-public abstract class MD5Tools  
-{  
+public abstract class MD5Tools {
 	public final static String MD5(String pwd) {
-        //用于加密的字符  
-        char md5String[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',  
-                'A', 'B', 'C', 'D', 'E', 'F' };  
+		// 用于加密的字符
+		char md5String[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
 		try {
-            //使用平台的默认字符集将此 String 编码为 byte序列，并将结果存储到一个新的 byte数组中  
+			// 使用平台的默认字符集将此 String 编码为 byte序列，并将结果存储到一个新的 byte数组中
 			byte[] btInput = pwd.getBytes();
 
-            //信息摘要是安全的单向哈希函数，它接收任意大小的数据，并输出固定长度的哈希值。  
+			// 信息摘要是安全的单向哈希函数，它接收任意大小的数据，并输出固定长度的哈希值。
 			MessageDigest mdInst = MessageDigest.getInstance("MD5");
 
-            //MessageDigest对象通过使用 update方法处理数据， 使用指定的byte数组更新摘要  
+			// MessageDigest对象通过使用 update方法处理数据， 使用指定的byte数组更新摘要
 			mdInst.update(btInput);
 
 			// 摘要更新之后，通过调用digest（）执行哈希计算，获得密文
@@ -35,12 +32,12 @@ public abstract class MD5Tools
 			char str[] = new char[j * 2];
 			int k = 0;
 			for (int i = 0; i < j; i++) { // i = 0
-                byte byte0 = md[i];  //95  
+				byte byte0 = md[i]; // 95
 				str[k++] = md5String[byte0 >>> 4 & 0xf]; // 5
 				str[k++] = md5String[byte0 & 0xf]; // F
 			}
 
-            //返回经过加密后的字符串  
+			// 返回经过加密后的字符串
 			return new String(str);
 
 		} catch (Exception e) {
@@ -48,7 +45,6 @@ public abstract class MD5Tools
 		}
 	}
 
-    
 	public static void main(String[] args) {
 		System.out.println(MD5Tools.MD5("admin"));
 	}

@@ -128,4 +128,12 @@ public class InfoData {
 		this.postcode = postcode;
 	}
 
+	@Override
+	public String toString() {
+		return "InfoData [contact=" + contact + ", mobile=" + mobile + ", address=" + address + ", tel=" + tel
+				+ ", company=" + company + ", company_logo=" + company_logo + ", company_info=" + company_info + ", qq="
+				+ qq + ", bank=" + bank + ", bankno=" + bankno + ", rate=" + rate + ", regposition=" + regposition
+				+ ", nature=" + nature + ", postcode=" + postcode + "]";
+	}
+
 }

@@ -19,6 +19,9 @@ public class LoginData {
 		this.info = info;
 	}
 	public InfoData getInfodata() {
+		if(infodata==null) {
+			infodata = new InfoData();
+		}
 		return infodata;
 	}
 	public void setInfodata(InfoData infodata) {

@@ -204,7 +204,7 @@
 		//分单撤销按钮
 		function preoperatorFormat(val, row, index){
 			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>";
+			html+="<a href='javascript:void(0)' onclick='openSubReceipt(\""+row.waybillnomaster+"\",\""+row.waybillnosecondary+"\")' style='text-decoration:none;color:blue;margin-left:20px;'><spring:message code='opt.open.receipt'/></a>";
 			return html;
 		}
 		
@@ -255,26 +255,29 @@
 		}
 		
 		//查看分单回执
-		function openSubReceipt(subno){
+		function openSubReceipt(waybill_no,subno){
+			if(typeof(waybill_no) == "undefined")
+				return;
 			if(typeof(subno) == "undefined")
 				return;
-			console.log("分单号-->"+subno);
-			seeReceipt(subno,false);
+			seeReceipt(waybill_no,subno,false);
 		}
 		
 		//查看主单回执
-		function openReceipt(no){
-			if(typeof(no) == "undefined")
+		function openReceipt(waybill_no){
+			if(typeof(waybill_no) == "undefined")
 				return;
-			console.log("主单号-->"+no);
-			seeReceipt(no,true);
+			seeReceipt(waybill_no,"",true);
 		}
 		
-		function seeReceipt(no,isMain){
+		function seeReceipt(waybill_no,sub_waybill_no,isMain){
 			layui.use('layer', function(){
 				  var layer = layui.layer;
 				  var api="<%=basePath%>receipt/seeReceipt";
-				  var params = "no="+no+"&isMain="+isMain;
+				  var params = "waybill_no="+waybill_no;
+				  if(!isMain){
+					  params+="&sub_waybill_no="+sub_waybill_no;
+				  }
 				  var viewUrl = api+"?"+params;
 				  
 				  parent.layer.open({

@@ -135,5 +135,8 @@
 		<location>/WEB-INF/views/login.jsp</location>
 	</error-page>
 
+	<session-config>
+		<session-timeout>120</session-timeout>
+	</session-config>
 
 </web-app>
\ No newline at end of file