卡口1.0 稳定版

@@ -43,7 +43,7 @@
 		<freemarker.version>2.3.20</freemarker.version>
 		
 		<!-- jdbc driver setting -->
-		<mysql.driver.version>5.1.30</mysql.driver.version>
+		<mysql.driver.version>8.0.13</mysql.driver.version>
 		<oracle.driver.version>10.2.0.4.0</oracle.driver.version>
 		<mssql.driver.version>1.3.1</mssql.driver.version>
 	    
@@ -317,7 +317,6 @@
 			<version>${shiro.version}</version>
 		</dependency>
 		<!-- SECURITY end -->
-		
 		<!-- Activiti -->
 		<dependency>
 			<groupId>org.activiti</groupId>
@@ -453,12 +452,12 @@
 			<version>${jackson.version}</version>
 		</dependency>
 		
-		<!-- fastjson json
+		<!-- fastjson json-->
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
 			<version>${fastjson.version}</version>
-		</dependency> -->
+		</dependency> 
 		
 		<!-- xstream xml -->
 		<dependency>

@@ -5,6 +5,8 @@ package com.thinkgem.jeesite.common.persistence;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 /**
  * DAO支持类实现
  * @author ThinkGem
@@ -34,6 +36,9 @@ public interface CrudDao<T> extends BaseDao {
 	 */
 	public List<T> findList(T entity);
 	
+	
+	public List<T> findList2(T entity,@Param("createBy")String createBy);
+	
 	/**
 	 * 查询所有数据列表
 	 * @param entity

@@ -50,6 +50,8 @@ public class Page<T> {
 	
 	private String message = ""; // 设置提示消息，显示在“共n条”之后
 	
+	private String resultMsg = "";
+
 	public Page() {
 		this.pageSize = -1;
 	}
@@ -275,6 +277,7 @@ public class Page<T> {
 		sb.insert(0,"<ul>\n").append("</ul>\n");
 		
 		sb.append("<div style=\"clear:both;\"></div>");
+		sb.append((resultMsg!=null?resultMsg:""));
 
 //		sb.insert(0,"<div class=\"page\">\n").append("</div>\n");
 		
@@ -539,6 +542,10 @@ public class Page<T> {
 		return getPageSize();
 	}
 
+	public void setResultMsg(String resultMsg) {
+		this.resultMsg = resultMsg;
+	}
+
 //	/**
 //	 * 获取 Spring data JPA 分页对象
 //	 */

@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.common.service;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -52,7 +53,6 @@ public abstract class CrudService<D extends CrudDao<T>, T extends DataEntity<T>>
 	public List<T> findList(T entity) {
 		return dao.findList(entity);
 	}
-	
 	/**
 	 * 查询分页数据
 	 * @param page 分页对象
@@ -64,7 +64,6 @@ public abstract class CrudService<D extends CrudDao<T>, T extends DataEntity<T>>
 		page.setList(dao.findList(entity));
 		return page;
 	}
-
 	/**
 	 * 保存数据（插入或更新）
 	 * @param entity

@@ -3,6 +3,10 @@
  */
 package com.thinkgem.jeesite.modules.land.dao;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList;
@@ -15,4 +19,11 @@ import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList;
 @MyBatisDao
 public interface LandBusinesstypeListDao extends CrudDao<LandBusinesstypeList> {
 	
+	List<LandBusinesstypeList> findByStatus(@Param("trailerFrameNo")String frameNo);
+	
+	List<LandBusinesstypeList> findByBarcode(@Param("barcode")String barcode);
+	
+	int deleteByBarcode(@Param("barcode")String barcode);
+	
+	int updateByBarcode(LandBusinesstypeList landBusinesstypeList);
 }
\ No newline at end of file

@@ -3,6 +3,10 @@
  */
 package com.thinkgem.jeesite.modules.land.dao;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
@@ -15,4 +19,6 @@ import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
 @MyBatisDao
 public interface LandRoadVeRecordDao extends CrudDao<LandRoadVeRecord> {
 	
+	List<LandRoadVeRecord> selectByFrameNo(@Param("domesticLisenceNo") String domesticLisenceNo);
+	
 }
\ No newline at end of file

 /**
- * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ *
  */
 package com.thinkgem.jeesite.modules.land.entity;
 
@@ -12,7 +12,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity;
 /**
  * 货物流转类型Entity
  * @author zhangfan
- * @version 2018-10-08
+ * @version 2019-02-12
  */
 public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
 	
@@ -21,21 +21,23 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
 	private String trailerFrameNo;		// 车牌号
 	private String trailerLicenseNo;		// 车架号
 	private String masterList;		// 主单列表
-	private Date prodectTime;		// prodect_time
-	private String returnmessage;		// 回执内容
+	private Date prodectTime;		// 申请时间
 	private String agentno;		// 货代代码
+	private String isDelete;		// 删除标识0：未删除，1删除
 	private String agentname;		// 货代名称
 	private String cocode;		// 所在企业代码
 	private String drivername;		// 驾驶员姓名
 	private String driverid;		// 驾驶员ID
 	private String startport;		// 起始海关代码
 	private String endport;		// 目的关区代码
-	private String startsatation;		// 场站
+	private String startsatation;		// 起始场站
 	private String endstation;		// 目的场站
-	private String aisle;		// 通道，卡口
-	private String businesstype;		// 业务类型(1.出口送货，2：进口提货，3：分拨分流，4：货运调拨)
+	private String aisle;		// 通道/卡口
+	private String businesstype;		// 业务类型
 	private String turnoverflag;		// 进出场标识
 	private String contrastflag;		// 校验标识
+	private String barcode;		// 二维码
+	private String isvalid;		// 是否失效：0：有效，1：无效
 	
 	public LandBusinesstypeList() {
 		super();
@@ -90,15 +92,6 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
 		this.prodectTime = prodectTime;
 	}
 	
-	@Length(min=0, max=255, message="回执内容长度必须介于 0 和 255 之间")
-	public String getReturnmessage() {
-		return returnmessage;
-	}
-
-	public void setReturnmessage(String returnmessage) {
-		this.returnmessage = returnmessage;
-	}
-	
 	@Length(min=0, max=32, message="货代代码长度必须介于 0 和 32 之间")
 	public String getAgentno() {
 		return agentno;
@@ -108,6 +101,15 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
 		this.agentno = agentno;
 	}
 	
+	@Length(min=0, max=2, message="删除标识0：未删除，1删除长度必须介于 0 和 2 之间")
+	public String getIsDelete() {
+		return isDelete;
+	}
+
+	public void setIsDelete(String isDelete) {
+		this.isDelete = isDelete;
+	}
+	
 	@Length(min=0, max=255, message="货代名称长度必须介于 0 和 255 之间")
 	public String getAgentname() {
 		return agentname;
@@ -162,7 +164,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
 		this.endport = endport;
 	}
 	
-	@Length(min=0, max=64, message="场站长度必须介于 0 和 64 之间")
+	@Length(min=0, max=64, message="起始场站长度必须介于 0 和 64 之间")
 	public String getStartsatation() {
 		return startsatation;
 	}
@@ -180,7 +182,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
 		this.endstation = endstation;
 	}
 	
-	@Length(min=0, max=32, message="通道，卡口长度必须介于 0 和 32 之间")
+	@Length(min=0, max=32, message="通道/卡口长度必须介于 0 和 32 之间")
 	public String getAisle() {
 		return aisle;
 	}
@@ -189,6 +191,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
 		this.aisle = aisle;
 	}
 	
+	@Length(min=0, max=10, message="业务类型长度必须介于 0 和 10 之间")
 	public String getBusinesstype() {
 		return businesstype;
 	}
@@ -215,4 +218,21 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
 		this.contrastflag = contrastflag;
 	}
 	
+	@Length(min=0, max=32, message="二维码长度必须介于 0 和 32 之间")
+	public String getBarcode() {
+		return barcode;
+	}
+
+	public void setBarcode(String barcode) {
+		this.barcode = barcode;
+	}
+	
+	@Length(min=0, max=2, message="是否失效：0：有效，1：无效长度必须介于 0 和 2 之间")
+	public String getIsvalid() {
+		return isvalid;
+	}
+
+	public void setIsvalid(String isvalid) {
+		this.isvalid = isvalid;
+	}
 }
\ No newline at end of file

 /**
- * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
+ *
  */
 package com.thinkgem.jeesite.modules.land.entity;
 
@@ -12,7 +12,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity;
 /**
  * 汽车备案Entity
  * @author zhangfan
- * @version 2018-10-08
+ * @version 2019-02-12
  */
 public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
 	
@@ -24,7 +24,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
 	private String domesticLisenceNo;		// 国内车牌
 	private String domesticLicenseColor;		// 车牌颜色
 	private String foreignLicense;		// 外籍车牌
-	private String veRegPlace;		// ve_reg_place
+	private String veRegPlace;		// 注册地址
 	private String veProperty;		// 使用性质
 	private String veConveyQua;		// 车辆运输资格
 	private String veCardNo;		// 车辆行驶证编号
@@ -34,9 +34,9 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
 	private String ownerInsideTel;		// 车主境内联系电话
 	private String veType;		// 车辆类型(型样)
 	private String brand;		// 厂牌
-	private String model;		// model
+	private String model;		// 车型
 	private String exhaustCapacity;		// 排气量
-	private Date veFactoryDate;		// 车辆出厂日期（yyyyMMdd-0）
+	private Date veFactoryDate;		// 车辆出厂日期
 	private String veMotorNo;		// 发动机号
 	private String veFrameNo;		// 车架号（车辆识别代号）
 	private String veTon;		// 核定载客/核定载质量：客车的核定载客单位仍为：人；货车的核定载客单位改为：千克。
@@ -52,7 +52,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
 	private String oilBoxCapcity;		// 油箱容量（升）
 	private String allowVeIePort;		// 批准车辆进出口岸
 	private String apprNo;		// 批文/许可证编号
-	private Date apprPeriod;		// 批文/许可证有效期（yyyyMMdd-0）
+	private Date apprPeriod;		// 批文/许可证有效期
 	private String currApplyBussiness;		// 最新更新申请业务类型
 	private String front45cPic;		// 车前45度照片
 	private String back45cPic;		// 车后45度照片
@@ -60,8 +60,8 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
 	private String veBottomPic;		// 车底照片
 	private String memo;		// 备注
 	private String proposer;		// 申请人
-	private Date proposeTime;		// 申请时间  yyyyMMddHHmmss
-	private String veClassFlag;		// 车辆分类。1是进出境公路运输工具；2是来往港澳公路运输工具；3是进出境公/私用公路交通工具；4是来往港澳公/私用公路交通工具
+	private Date proposeTime;		// 申请时间
+	private String veClassFlag;		// 车辆分类
 	private String operationType;		// 数据操作类型
 	private String trailerLicenseNo;		// 挂车牌号
 	private String trailerFrameNo;		// 挂车车架号
@@ -71,6 +71,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
 	private String foreignLicensePic;		// 外籍车牌照片
 	private String nationality;		// 国籍
 	private String returnmessage;		// 回执内容
+	private String barcode;		// 二维码
 	
 	public LandRoadVeRecord() {
 		super();
@@ -143,7 +144,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
 		this.foreignLicense = foreignLicense;
 	}
 	
-	@Length(min=0, max=4, message="ve_reg_place长度必须介于 0 和 4 之间")
+	@Length(min=0, max=4, message="注册地址长度必须介于 0 和 4 之间")
 	public String getVeRegPlace() {
 		return veRegPlace;
 	}
@@ -233,7 +234,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
 		this.brand = brand;
 	}
 	
-	@Length(min=0, max=9, message="model长度必须介于 0 和 9 之间")
+	@Length(min=0, max=9, message="车型长度必须介于 0 和 9 之间")
 	public String getModel() {
 		return model;
 	}
@@ -476,7 +477,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
 		this.proposeTime = proposeTime;
 	}
 	
-	@Length(min=0, max=2, message="车辆分类。1是进出境公路运输工具；2是来往港澳公路运输工具；3是进出境公/私用公路交通工具；4是来往港澳公/私用公路交通工具长度必须介于 0 和 2 之间")
+	@Length(min=0, max=64, message="车辆分类长度必须介于 0 和 64 之间")
 	public String getVeClassFlag() {
 		return veClassFlag;
 	}
@@ -566,4 +567,13 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
 		this.returnmessage = returnmessage;
 	}
 	
+	@Length(min=0, max=32, message="二维码长度必须介于 0 和 32 之间")
+	public String getBarcode() {
+		return barcode;
+	}
+
+	public void setBarcode(String barcode) {
+		this.barcode = barcode;
+	}
+	
 }
\ No newline at end of file

@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.land.service;
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.land.dao.LandBusinesstypeListDao;
 @Transactional(readOnly = true)
 public class LandBusinesstypeListService extends CrudService<LandBusinesstypeListDao, LandBusinesstypeList> {
 
+	@Autowired
+	private LandBusinesstypeListDao dao;
+	
 	public LandBusinesstypeList get(String id) {
 		return super.get(id);
 	}
@@ -44,4 +48,23 @@ public class LandBusinesstypeListService extends CrudService<LandBusinesstypeLis
 		super.delete(landBusinesstypeList);
 	}
 	
+	@Transactional(readOnly = false)
+	public List<LandBusinesstypeList> findByStatus(String frameNo) {
+		return dao.findByStatus(frameNo);
+	}
+	
+	@Transactional(readOnly = false)
+	public List<LandBusinesstypeList> findByBarcode(String barcode) {
+		return dao.findByBarcode(barcode);
+	}
+	
+	@Transactional(readOnly = false)
+	public int deleteByBarcode(String barcode) {
+		return dao.deleteByBarcode(barcode);
+	}
+	
+	@Transactional(readOnly = false)
+	public int updateByBarcode(LandBusinesstypeList landBusinesstypeList) {
+		return dao.updateByBarcode(landBusinesstypeList);
+	}
 }
\ No newline at end of file

@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.land.service;
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.land.dao.LandRoadVeRecordDao;
 @Transactional(readOnly = true)
 public class LandRoadVeRecordService extends CrudService<LandRoadVeRecordDao, LandRoadVeRecord> {
 
+	@Autowired
+	LandRoadVeRecordDao dao;
+	
 	public LandRoadVeRecord get(String id) {
 		return super.get(id);
 	}
@@ -44,4 +48,10 @@ public class LandRoadVeRecordService extends CrudService<LandRoadVeRecordDao, La
 		super.delete(landRoadVeRecord);
 	}
 	
+	@Transactional(readOnly = false)
+	public List<LandRoadVeRecord> selectByFrameNo(String domesticLisenceNo) {
+		return dao.selectByFrameNo(domesticLisenceNo);
+	}
+	
+	
 }
\ No newline at end of file

@@ -3,38 +3,39 @@
  */
 package com.thinkgem.jeesite.modules.land.web;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.sound.midi.MidiDevice.Info;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.h2.util.New;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import com.thinkgem.jeesite.common.barCode.buildBarCode;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.common.utils.StringUtils;
-import com.thinkgem.jeesite.modules.bw.entity.dct.DCTXStram2;
-import com.thinkgem.jeesite.modules.bw.entity.dct.DCTXStram3;
-import com.thinkgem.jeesite.modules.bw.entity.dct.DTC_Message;
-import com.thinkgem.jeesite.modules.bw.entity.dct.PortManifestBody;
-import com.thinkgem.jeesite.modules.bw.service.dct.DtcmessageheadService;
-import com.thinkgem.jeesite.modules.bw.service.dct.GatherinfoService;
-import com.thinkgem.jeesite.modules.bw.service.dct.PortManifestBodyService;
-import com.thinkgem.jeesite.modules.bw.service.dct.PortManifestHeadService;
-import com.thinkgem.jeesite.modules.bw.service.dct.PortManifestHeadStatService;
-import com.thinkgem.jeesite.modules.bw.service.dct.VExpressBillnoService;
 import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList;
+import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
+import com.thinkgem.jeesite.modules.land.entity.VehicleMainifist;
 import com.thinkgem.jeesite.modules.land.service.LandBusinesstypeListService;
+import com.thinkgem.jeesite.modules.land.service.LandRoadVeRecordService;
+import com.thinkgem.jeesite.modules.land.service.VehicleMainifistService;
+import com.thinkgem.jeesite.modules.sys.entity.User;
+import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
+import com.thinkgem.jeesite.modules.sys.service.SystemService;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
 import com.thinkgem.jeesite.modules.yard.entity.Yard;
 import com.thinkgem.jeesite.modules.yard.service.BayonetService;
@@ -59,22 +60,18 @@ public class LandBusinesstypeListController extends BaseController {
 	private BayonetService bayService;
 	
 	@Autowired
-	private VExpressBillnoService veService;
+	private VehicleMainifistService veMainService;
 	
 	@Autowired
-	private GatherinfoService InfoServeice;
+	private LandRoadVeRecordService roadVeService;
 	
 	@Autowired
-	private DtcmessageheadService dtcMessageheadService;
+	private SystemService systemService;
 	
-	@Autowired
-	private PortManifestBodyService bodyService;
-	
-	@Autowired
-	private PortManifestHeadService headService;
-	
-	@Autowired
-	private PortManifestHeadStatService statService;
+	private static final String TYPE1 = "进口流转";
+	private static final String TYPE2 = "进口提货";
+	private static final String TYPE3 = "出口送货";
+	private static final String TYPE4 = "出口流转";
 	
 	
 	@ModelAttribute
@@ -92,6 +89,10 @@ public class LandBusinesstypeListController extends BaseController {
 	@RequiresPermissions("land:landBusinesstypeList:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(LandBusinesstypeList landBusinesstypeList, HttpServletRequest request, HttpServletResponse response, Model model) {
+		Principal principal = UserUtils.getPrincipal();
+		String loginName = principal.getLoginName();
+		User user = systemService.getUserByLoginName(loginName);
+		landBusinesstypeList.setCreateBy(user);
 		Page<LandBusinesstypeList> page = landBusinesstypeListService.findPage(new Page<LandBusinesstypeList>(request, response), landBusinesstypeList); 
 		model.addAttribute("page", page);
 		return "modules/land/landBusinesstypeListList";
@@ -99,14 +100,65 @@ public class LandBusinesstypeListController extends BaseController {
 	}
 	
 	@RequiresPermissions("land:landBusinesstypeList:view")
+	@RequestMapping(value = "check")
+	@ResponseBody
+	public Page<LandRoadVeRecord> list(String frameNo) throws Exception {
+		Page<LandRoadVeRecord> page = new Page<LandRoadVeRecord>();
+		//List<LandBusinesstypeList> list = landBusinesstypeListService.findByStatus(frameNo);
+		List<LandRoadVeRecord> list = roadVeService.selectByFrameNo(frameNo);
+//		if(list.size()>0 ) {
+//			for (int i = 0; i < list.size(); i++) {
+//				System.out.println(list.get(i));
+//				boolean flag = (list.get(i).getContrastflag()==null ||list.get(i).getContrastflag()=="" ||list.get(i).getContrastflag().length()<=0);
+//				if("进场站".equals(list.get(i).getTurnoverflag()) && flag) {
+//					page.setResultMsg("此车辆存在进场业务，请勿重新申报");
+//				}else if("已进站".equals(list.get(i).getContrastflag())) {
+//					page.setResultMsg("此车辆有出站业务未完成");
+//				}else if("出场站".equals(list.get(i).getTurnoverflag())&& flag ) {
+//					page.setResultMsg("此车辆存在出场业务，请勿重新申报");
+//				}
+//			}
+//		}else {
+//			page.setResultMsg("此车辆可以正常申报业务");
+//		}
+		page.setList(list);
+		return page;
+		
+	}
+	@RequiresPermissions("land:landBusinesstypeList:view")
+	@RequestMapping(value = "option")
+	@ResponseBody
+	public Page<Bayonet> option(String st_select,Model model) throws Exception {
+		Page<Bayonet>page = new Page<Bayonet>();
+		Yard yard = yardService.findByStaionId(st_select);
+		List<Bayonet> bayonet = bayService.findByYardId(yard.getStationid());
+		page.setList(bayonet);
+		return page;
+	}
+
+	@RequiresPermissions("land:landBusinesstypeList:view")
 	@RequestMapping(value = "form")
 	public String form(LandBusinesstypeList landBusinesstypeList, Model model) {
+		System.out.println(landBusinesstypeList);
 		Yard yard = new Yard();
-		Bayonet bayonet = new Bayonet();
-		List<Bayonet> bayonets = bayService.findList(bayonet);
 	    List<Yard> yardList = yardService.findList(yard);
-	    model.addAttribute("yardList", yardList);
+	    LandRoadVeRecord ve = new LandRoadVeRecord();
+	    Principal principal = UserUtils.getPrincipal();
+		String loginName = principal.getLoginName();
+	    User user = systemService.getUserByLoginName(loginName);
+	    ve.setCreateBy(user);
+
+	    List<LandRoadVeRecord> veList = roadVeService.findList(ve);
+	    if(landBusinesstypeList.getEndstation() !=null) {
+	    	Yard yard1 = yardService.findByStaionId(landBusinesstypeList.getEndstation());
+			List<Bayonet> bayonets = bayService.findByYardId(yard1.getStationid());
 			model.addAttribute("bayonets", bayonets);
+	    }
+//	    Bayonet bayonet = new Bayonet();
+//	    List<Bayonet> bayonets = bayService.findList(bayonet);
+//	    model.addAttribute("bayonets", bayonets);
+	    model.addAttribute("veList",veList);
+	    model.addAttribute("yardList", yardList);
 		model.addAttribute("landBusinesstypeList", landBusinesstypeList);
 		return "modules/land/landBusinesstypeListForm";
 	}
@@ -117,18 +169,245 @@ public class LandBusinesstypeListController extends BaseController {
 		if (!beanValidator(model, landBusinesstypeList)){
 			return form(landBusinesstypeList, model);
 		}
-
-		landBusinesstypeListService.save(landBusinesstypeList);
-		addMessage(redirectAttributes, "保存流转成功");
+	    landBusinesstypeList.setIsDelete("0");
+	    landBusinesstypeList.setIsvalid("0");
+		if(landBusinesstypeList.getId().length()>0) {
+			String masterList = landBusinesstypeList.getMasterList();
+			System.out.println(masterList);
+			insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),masterList);
+			List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode());
+			for (int i = 0; i < list.size(); i++) {
+				if(list.get(i).getMasterList().length()>0) {
+					list.get(i).setMasterList(masterList);
+					landBusinesstypeListService.save(list.get(i));
+				}
+			}
+		}else{
+			if(TYPE1.equals(landBusinesstypeList.getBusinesstype())) {
+				insertType1(landBusinesstypeList);
+			}
+			if(TYPE2.equals(landBusinesstypeList.getBusinesstype())) {
+				insertType2(landBusinesstypeList);
+			}
+			if(TYPE3.equals(landBusinesstypeList.getBusinesstype())) {
+				insertType3(landBusinesstypeList);
+			}
+			if(TYPE4.equals(landBusinesstypeList.getBusinesstype())) {
+				insertType1(landBusinesstypeList);
+			}
+		}
+		addMessage(redirectAttributes, "保存申请单成功");
 		return "redirect:"+Global.getAdminPath()+"/land/landBusinesstypeList/?repage";
 	}
 	
 	@RequiresPermissions("land:landBusinesstypeList:edit")
 	@RequestMapping(value = "delete")
 	public String delete(LandBusinesstypeList landBusinesstypeList, RedirectAttributes redirectAttributes) {
-		landBusinesstypeListService.delete(landBusinesstypeList);
-		addMessage(redirectAttributes, "删除流转成功");
+		boolean flag = false;
+		List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode());
+		for (int i = 0; i < list.size(); i++) {
+			String flag1 = list.get(i).getContrastflag();
+			if(flag1!=null) {
+				flag =true;
+				break;
+			}
+		}
+		if(!flag) {
+			landBusinesstypeListService.deleteByBarcode(landBusinesstypeList.getBarcode());
+			veMainService.deleteById(landBusinesstypeList.getMassageId());
+			buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
+			addMessage(redirectAttributes, "删除申请单成功");
+		}else {
+			addMessage(redirectAttributes, "删除失败,已有业务已进出站");
+		}
+
 		return "redirect:"+Global.getAdminPath()+"/land/landBusinesstypeList/?repage";
 	}
 	
+	public void insertType1(LandBusinesstypeList landBusinesstypeList) {
+		//first entry in
+		String messageId = LandBusinesstypeListController.dateTimeFormat();
+		String mainfistList = landBusinesstypeList.getMasterList();
+		String startport = landBusinesstypeList.getStartport();
+		System.out.println("startport:"+startport);
+		String endport = landBusinesstypeList.getEndport();
+		System.out.println("endport:"+endport);
+		String startStation = landBusinesstypeList.getStartsatation();
+		System.out.println("startStation:"+startStation);
+		String endStation = landBusinesstypeList.getEndstation();
+		System.out.println("endStation:"+endStation);
+		landBusinesstypeList.setMassageId(messageId);
+		String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
+		landBusinesstypeList.setStartport("");
+		landBusinesstypeList.setStartsatation("");
+		landBusinesstypeList.setEndport(startport);
+		landBusinesstypeList.setEndstation(startStation);
+		landBusinesstypeList.setBarcode(barCode);
+		landBusinesstypeList.setMasterList("");
+		landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "1号卡口-进").getChannel());
+		landBusinesstypeListService.save(landBusinesstypeList);
+		insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),mainfistList);
+		
+		//second out
+		LandBusinesstypeList list = new LandBusinesstypeList();
+		list.setAgentname(landBusinesstypeList.getAgentname());
+		list.setAgentno(landBusinesstypeList.getAgentno());
+		list.setBarcode(barCode);
+		list.setIsDelete("0");
+		list.setIsvalid("0");
+		list.setBusinesstype(landBusinesstypeList.getBusinesstype());
+		list.setCocode(landBusinesstypeList.getCocode());
+		list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
+		list.setEndport(startport);
+		list.setEndstation(startStation);
+		list.setProdectTime(new Date());
+		list.setMasterList(mainfistList);
+		list.setDriverid(landBusinesstypeList.getDriverid());
+		list.setDrivername(landBusinesstypeList.getDrivername());
+		list.setAisle(bayService.findByYardAndName(startStation, "1号卡口-出").getChannel());
+		list.setTurnoverflag("E");
+		list.setMassageId(messageId);
+		landBusinesstypeListService.save(list);
+		
+		//third
+		LandBusinesstypeList list1 = new LandBusinesstypeList();
+		list1.setAgentname(landBusinesstypeList.getAgentname());
+		list1.setAgentno(landBusinesstypeList.getAgentno());
+		list1.setIsDelete("0");
+		list1.setIsvalid("0");
+		list1.setBarcode(barCode);
+		list1.setBusinesstype(landBusinesstypeList.getBusinesstype());
+		list1.setCocode(landBusinesstypeList.getCocode());
+		list1.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
+		list1.setStartport(startport);
+		list1.setStartsatation(startStation);
+		list1.setEndport(endport);
+		list1.setEndstation(endStation);
+		list1.setProdectTime(new Date());
+		list1.setMasterList(mainfistList);
+		list1.setDriverid(landBusinesstypeList.getDriverid());
+		list1.setDrivername(landBusinesstypeList.getDrivername());
+		list1.setAisle(bayService.findByYardAndName(endStation, "1号卡口-进").getChannel());
+		list1.setTurnoverflag("I");
+		list1.setMassageId(messageId);
+		landBusinesstypeListService.save(list1);
+
+		//four
+		LandBusinesstypeList list2 = new LandBusinesstypeList();
+		list2.setAgentname(landBusinesstypeList.getAgentname());
+		list2.setAgentno(landBusinesstypeList.getAgentno());
+		list2.setBarcode(barCode);
+		list2.setIsDelete("0");
+		list2.setIsvalid("0");
+		list2.setBusinesstype(landBusinesstypeList.getBusinesstype());
+		list2.setCocode(landBusinesstypeList.getCocode());
+		list2.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
+		list2.setStartport("");
+		list2.setStartsatation("");
+		list1.setStartport(startport);
+		list1.setStartsatation(startStation);
+		list2.setEndport(endport);
+		list2.setEndstation(endStation);
+		list2.setProdectTime(new Date());
+		list2.setMasterList("");
+		list2.setDriverid(landBusinesstypeList.getDriverid());
+		list2.setDrivername(landBusinesstypeList.getDrivername());
+		list2.setAisle(bayService.findByYardAndName(endStation, "1号卡口-出").getChannel());
+		list2.setTurnoverflag("E");
+		list2.setMassageId(messageId);
+		landBusinesstypeListService.save(list2);
+		
+	}
+	
+	public void insertType2(LandBusinesstypeList landBusinesstypeList) {
+		//first entry
+		String messageId = dateTimeFormat();
+		String mainfistList = landBusinesstypeList.getMasterList();
+		System.out.println(mainfistList);
+		landBusinesstypeList.setMassageId(messageId);
+		String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
+		landBusinesstypeList.setBarcode(barCode);
+		landBusinesstypeList.setMasterList("");
+		landBusinesstypeListService.save(landBusinesstypeList);
+		insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),mainfistList);
+		//second
+		LandBusinesstypeList list = new LandBusinesstypeList();
+		list.setAgentname(landBusinesstypeList.getAgentname());
+		list.setAgentno(landBusinesstypeList.getAgentno());
+		list.setIsDelete("0");
+		list.setIsvalid("0");
+		list.setBarcode(barCode);
+		list.setBusinesstype(landBusinesstypeList.getBusinesstype());
+		list.setCocode(landBusinesstypeList.getCocode());
+		list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
+		list.setStartport(landBusinesstypeList.getStartport());
+		list.setStartsatation(landBusinesstypeList.getStartsatation());
+		list.setEndport(landBusinesstypeList.getEndport());
+		list.setEndstation(landBusinesstypeList.getEndstation());
+		list.setProdectTime(new Date());
+		list.setMasterList(mainfistList);
+		list.setDriverid(landBusinesstypeList.getDriverid());
+		list.setDrivername(landBusinesstypeList.getDrivername());
+		list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
+		list.setTurnoverflag("E");
+		list.setMassageId(messageId);
+		landBusinesstypeListService.save(list);
+	}
+	
+	public void insertType3(LandBusinesstypeList landBusinesstypeList) {
+		//first entry
+		
+		String messageId = dateTimeFormat();
+		landBusinesstypeList.setMassageId(messageId); 
+		String mainfistList = landBusinesstypeList.getMasterList();
+		String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
+//		String barCode = messageId;
+		landBusinesstypeList.setBarcode(barCode);
+		landBusinesstypeListService.save(landBusinesstypeList);
+		insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),mainfistList);
+		//second
+		LandBusinesstypeList list = new LandBusinesstypeList();
+		list.setAgentname(landBusinesstypeList.getAgentname());
+		list.setAgentno(landBusinesstypeList.getAgentno());
+		list.setIsDelete("0");
+		list.setIsvalid("0");
+		list.setBarcode(barCode);
+		list.setBusinesstype(landBusinesstypeList.getBusinesstype());
+		list.setCocode(landBusinesstypeList.getCocode());
+		list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
+		list.setStartport(landBusinesstypeList.getStartport());
+		list.setStartsatation(landBusinesstypeList.getStartsatation());
+		list.setEndport(landBusinesstypeList.getEndport());
+		list.setEndstation(landBusinesstypeList.getEndstation());
+		list.setProdectTime(new Date());
+		list.setMasterList("");
+		list.setDriverid(landBusinesstypeList.getDriverid());
+		list.setDrivername(landBusinesstypeList.getDrivername());
+		list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
+		list.setTurnoverflag("E");
+		list.setMassageId(messageId);
+		landBusinesstypeListService.save(list);
+	}
+	
+	public static String dateTimeFormat() {
+		Date dateTime = new Date();
+		SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
+		return format.format(dateTime);
+	}
+	
+	public void insertVm(String id ,String frameNo,String mainfistList) {
+		veMainService.deleteById(id);
+		if(mainfistList.length()>0) {
+			String[] list = mainfistList.split(",");
+			for (int i = 0; i < list.length; i++) {
+				VehicleMainifist vehicleMainifist = new VehicleMainifist();
+				vehicleMainifist.setBusinessId(id);
+				vehicleMainifist.setBusinessNum(frameNo);
+				vehicleMainifist.setMainifist(list[i]);
+				veMainService.save(vehicleMainifist);
+			}
+		}
+	}
+	
+
 }
\ No newline at end of file

@@ -21,6 +21,10 @@ import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.modules.land.entity.LandCorporationInfo;
 import com.thinkgem.jeesite.modules.land.service.LandCorporationInfoService;
+import com.thinkgem.jeesite.modules.sys.entity.User;
+import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
+import com.thinkgem.jeesite.modules.sys.service.SystemService;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 
 /**
  * 企业备案Controller
@@ -34,6 +38,9 @@ public class LandCorporationInfoController extends BaseController {
 	@Autowired
 	private LandCorporationInfoService landCorporationInfoService;
 	
+	@Autowired
+	private SystemService systemService;
+	
 	@ModelAttribute
 	public LandCorporationInfo get(@RequestParam(required=false) String id) {
 		LandCorporationInfo entity = null;
@@ -49,7 +56,12 @@ public class LandCorporationInfoController extends BaseController {
 	@RequiresPermissions("land:landCorporationInfo:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(LandCorporationInfo landCorporationInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<LandCorporationInfo> page = landCorporationInfoService.findPage(new Page<LandCorporationInfo>(request, response), landCorporationInfo); 
+		Principal principal = UserUtils.getPrincipal();
+		String loginName = principal.getLoginName();
+		User user = systemService.getUserByLoginName(loginName);
+		landCorporationInfo.setCreateBy(user);
+		Page<LandCorporationInfo> page = 
+				landCorporationInfoService.findPage(new Page<LandCorporationInfo>(request, response), landCorporationInfo); 
 		model.addAttribute("page", page);
 		return "modules/land/landCorporationInfoList";
 	}

@@ -3,6 +3,9 @@
  */
 package com.thinkgem.jeesite.modules.land.web;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -19,8 +22,13 @@ import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList;
 import com.thinkgem.jeesite.modules.land.entity.LandRoadDrRecord;
 import com.thinkgem.jeesite.modules.land.service.LandRoadDrRecordService;
+import com.thinkgem.jeesite.modules.sys.entity.User;
+import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
+import com.thinkgem.jeesite.modules.sys.service.SystemService;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 
 /**
  * 驾驶员备案Controller
@@ -34,6 +42,9 @@ public class LandRoadDrRecordController extends BaseController {
 	@Autowired
 	private LandRoadDrRecordService landRoadDrRecordService;
 	
+	@Autowired
+	private SystemService systemService;
+	
 	@ModelAttribute
 	public LandRoadDrRecord get(@RequestParam(required=false) String id) {
 		LandRoadDrRecord entity = null;
@@ -49,7 +60,12 @@ public class LandRoadDrRecordController extends BaseController {
 	@RequiresPermissions("land:landRoadDrRecord:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(LandRoadDrRecord landRoadDrRecord, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<LandRoadDrRecord> page = landRoadDrRecordService.findPage(new Page<LandRoadDrRecord>(request, response), landRoadDrRecord); 
+		Principal principal = UserUtils.getPrincipal();
+		String loginName = principal.getLoginName();
+		User user = systemService.getUserByLoginName(loginName);
+		landRoadDrRecord.setCreateBy(user);
+		Page<LandRoadDrRecord> page = 
+				landRoadDrRecordService.findPage(new Page<LandRoadDrRecord>(request, response), landRoadDrRecord); 
 		model.addAttribute("page", page);
 		return "modules/land/landRoadDrRecordList";
 	}

@@ -21,6 +21,10 @@ import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.modules.land.entity.LandRoadTrailerRecord;
 import com.thinkgem.jeesite.modules.land.service.LandRoadTrailerRecordService;
+import com.thinkgem.jeesite.modules.sys.entity.User;
+import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
+import com.thinkgem.jeesite.modules.sys.service.SystemService;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 
 /**
  * 挂车备案Controller
@@ -34,6 +38,9 @@ public class LandRoadTrailerRecordController extends BaseController {
 	@Autowired
 	private LandRoadTrailerRecordService landRoadTrailerRecordService;
 	
+	@Autowired
+	private SystemService systemService;
+	
 	@ModelAttribute
 	public LandRoadTrailerRecord get(@RequestParam(required=false) String id) {
 		LandRoadTrailerRecord entity = null;
@@ -49,7 +56,12 @@ public class LandRoadTrailerRecordController extends BaseController {
 	@RequiresPermissions("land:landRoadTrailerRecord:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(LandRoadTrailerRecord landRoadTrailerRecord, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<LandRoadTrailerRecord> page = landRoadTrailerRecordService.findPage(new Page<LandRoadTrailerRecord>(request, response), landRoadTrailerRecord); 
+		Principal principal = UserUtils.getPrincipal();
+		String loginName = principal.getLoginName();
+		User user = systemService.getUserByLoginName(loginName);
+		landRoadTrailerRecord.setCreateBy(user);
+		Page<LandRoadTrailerRecord> page = 
+				landRoadTrailerRecordService.findPage(new Page<LandRoadTrailerRecord>(request, response), landRoadTrailerRecord); 
 		model.addAttribute("page", page);
 		return "modules/land/landRoadTrailerRecordList";
 	}

@@ -15,12 +15,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import com.thinkgem.jeesite.common.barCode.buildBarCode;
 import com.thinkgem.jeesite.common.config.Global;
 import com.thinkgem.jeesite.common.persistence.Page;
 import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.common.utils.StringUtils;
 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
 import com.thinkgem.jeesite.modules.land.service.LandRoadVeRecordService;
+import com.thinkgem.jeesite.modules.sys.entity.User;
+import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
+import com.thinkgem.jeesite.modules.sys.service.SystemService;
+import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 
 /**
  * 汽车备案Controller
@@ -34,6 +39,9 @@ public class LandRoadVeRecordController extends BaseController {
 	@Autowired
 	private LandRoadVeRecordService landRoadVeRecordService;
 	
+	@Autowired
+	private SystemService systemService;
+	
 	@ModelAttribute
 	public LandRoadVeRecord get(@RequestParam(required=false) String id) {
 		LandRoadVeRecord entity = null;
@@ -49,7 +57,12 @@ public class LandRoadVeRecordController extends BaseController {
 	@RequiresPermissions("land:landRoadVeRecord:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(LandRoadVeRecord landRoadVeRecord, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<LandRoadVeRecord> page = landRoadVeRecordService.findPage(new Page<LandRoadVeRecord>(request, response), landRoadVeRecord); 
+		Principal principal = UserUtils.getPrincipal();
+		String loginName = principal.getLoginName();
+		User user = systemService.getUserByLoginName(loginName);
+		landRoadVeRecord.setCreateBy(user);
+		Page<LandRoadVeRecord> page = 
+				landRoadVeRecordService.findPage(new Page<LandRoadVeRecord>(request, response), landRoadVeRecord); 
 		model.addAttribute("page", page);
 		return "modules/land/landRoadVeRecordList";
 	}
@@ -67,6 +80,16 @@ public class LandRoadVeRecordController extends BaseController {
 		if (!beanValidator(model, landRoadVeRecord)){
 			return form(landRoadVeRecord, model);
 		}
+		String barcode = landRoadVeRecord.getBarcode();
+		if(barcode ==null) {
+			String barCode = buildBarCode.crateCar(landRoadVeRecord);
+			if("0".equals(barCode)) {
+				landRoadVeRecord.setReturnmessage("备案成功");
+			}else {
+				landRoadVeRecord.setReturnmessage("备案失败");
+			}
+			landRoadVeRecord.setBarcode(barCode);
+		}
 		landRoadVeRecordService.save(landRoadVeRecord);
 		addMessage(redirectAttributes, "保存备案成功");
 		return "redirect:"+Global.getAdminPath()+"/land/landRoadVeRecord/?repage";
@@ -76,6 +99,7 @@ public class LandRoadVeRecordController extends BaseController {
 	@RequestMapping(value = "delete")
 	public String delete(LandRoadVeRecord landRoadVeRecord, RedirectAttributes redirectAttributes) {
 		landRoadVeRecordService.delete(landRoadVeRecord);
+		buildBarCode.cancleCar(landRoadVeRecord);
 		addMessage(redirectAttributes, "删除备案成功");
 		return "redirect:"+Global.getAdminPath()+"/land/landRoadVeRecord/?repage";
 	}

@@ -402,7 +402,7 @@ public class SystemService extends BaseService implements InitializingBean {
 	public static boolean printKeyLoadMessage(){
 		StringBuilder sb = new StringBuilder();
 		sb.append("\r\n======================================================================\r\n");
-		sb.append("\r\n    欢迎使用 "+Global.getConfig("productName")+"  - Powered By ShangYou");
+		sb.append("\r\n    欢迎使用 "+Global.getConfig("productName")+"  - Powered By");
 		sb.append("\r\n======================================================================\r\n");
 		System.out.println(sb.toString());
 		return true;

@@ -50,10 +50,10 @@ public class LoginController extends BaseController{
 		Principal principal = UserUtils.getPrincipal();
 
 //		// 默认页签模式
-//		String tabmode = CookieUtils.getCookie(request, "tabmode");
-//		if (tabmode == null){
-//			CookieUtils.setCookie(response, "tabmode", "1");
-//		}
+/*		String tabmode = CookieUtils.getCookie(request, "tabmode");
+		if (tabmode == null){
+			CookieUtils.setCookie(response, "tabmode", "1");
+		}*/
 		
 		if (logger.isDebugEnabled()){
 			logger.debug("login, active session size: {}", sessionDAO.getActiveSessions(false).size());

@@ -3,6 +3,10 @@
  */
 package com.thinkgem.jeesite.modules.yard.dao;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
@@ -14,5 +18,6 @@ import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
  */
 @MyBatisDao
 public interface BayonetDao extends CrudDao<Bayonet> {
-	
+	List<Bayonet> findByYardId(@Param("yardId")String yardId);
+	Bayonet findByYardAndName(@Param("yardId")String yardId,@Param("name")String Name);
 }
\ No newline at end of file

@@ -14,5 +14,5 @@ import com.thinkgem.jeesite.modules.yard.entity.Yard;
  */
 @MyBatisDao
 public interface YardDao extends CrudDao<Yard> {
-	
+	Yard findByStaionId(String stationid);
 }
\ No newline at end of file

@@ -3,32 +3,23 @@
  */
 package com.thinkgem.jeesite.modules.yard.entity;
 
-import java.util.List;
-
-import javax.validation.constraints.NotNull;
-
 import org.hibernate.validator.constraints.Length;
 
-import com.google.common.collect.Lists;
 import com.thinkgem.jeesite.common.persistence.DataEntity;
 
 /**
  * 场站管理Entity
  * @author promise
- * @version 2018-09-29
+ * @version 2019-01-11
  */
 public class Yard extends DataEntity<Yard> {
 	
 	private static final long serialVersionUID = 1L;
 	private String name;		// 场站名称
+	private String areaCode;		// 区域代码
+	private String stationid;		// 场站ID
 	private String customsCode;		// 关区代码
 	
-	private List<Bayonet> bayonetList = Lists.newArrayList();	// 卡口
-	
-	private List<Wharf> WarfList = Lists.newArrayList();	// 码头
-	
-	private List<Warehouse> warehouseList = Lists.newArrayList();	// 仓库
-	
 	public Yard() {
 		super();
 	}
@@ -36,7 +27,7 @@ public class Yard extends DataEntity<Yard> {
 	public Yard(String id){
 		super(id);
 	}
-	@NotNull(message="场站名称不能为空")
+
 	@Length(min=0, max=100, message="场站名称长度必须介于 0 和 100 之间")
 	public String getName() {
 		return name;
@@ -46,38 +37,31 @@ public class Yard extends DataEntity<Yard> {
 		this.name = name;
 	}
 	
-	@NotNull(message="关区代码不能为空")
-	@Length(min=0, max=10, message="关区代码长度必须介于 0 和 10 之间")
-	public String getCustomsCode() {
-		return customsCode;
-	}
-
-	public void setCustomsCode(String customsCode) {
-		this.customsCode = customsCode;
-	}
-
-	public List<Bayonet> getBayonetList() {
-		return bayonetList;
+	@Length(min=0, max=5, message="区域代码长度必须介于 0 和 5 之间")
+	public String getAreaCode() {
+		return areaCode;
 	}
 
-	public void setBayonetList(List<Bayonet> bayonetList) {
-		this.bayonetList = bayonetList;
+	public void setAreaCode(String areaCode) {
+		this.areaCode = areaCode;
 	}
 	
-	public List<Warehouse> getWarehouseList() {
-		return warehouseList;
+	@Length(min=0, max=10, message="场站ID长度必须介于 0 和 10 之间")
+	public String getStationid() {
+		return stationid;
 	}
 
-	public void setWarehouseList(List<Warehouse> warehouseList) {
-		this.warehouseList = warehouseList;
+	public void setStationid(String stationid) {
+		this.stationid = stationid;
 	}
 	
-	public List<Wharf> getWarfList() {
-		return WarfList;
+	@Length(min=0, max=10, message="关区代码长度必须介于 0 和 10 之间")
+	public String getCustomsCode() {
+		return customsCode;
 	}
 
-	public void setWarfList(List<Wharf> warfList) {
-		WarfList = warfList;
+	public void setCustomsCode(String customsCode) {
+		this.customsCode = customsCode;
 	}
 	
 }
\ No newline at end of file

@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.yard.service;
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.yard.dao.BayonetDao;
 @Transactional(readOnly = true)
 public class BayonetService extends CrudService<BayonetDao, Bayonet> {
 
+	@Autowired
+	private BayonetDao dao;
+	
 	public Bayonet get(String id) {
 		return super.get(id);
 	}
@@ -46,4 +50,14 @@ public class BayonetService extends CrudService<BayonetDao, Bayonet> {
 		super.delete(bayonet);
 	}
 	
+	@Transactional(readOnly = false)
+	public List<Bayonet> findByYardId(String yardId) {
+		return dao.findByYardId(yardId);
+	}
+	
+	@Transactional(readOnly = false)
+	public Bayonet findByYardAndName(String yardId,String yardName) {
+		return dao.findByYardAndName(yardId,yardName);
+	}
+	
 }
\ No newline at end of file

@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.yard.service;
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.yard.dao.YardDao;
 @Transactional(readOnly = true)
 public class YardService extends CrudService<YardDao, Yard> {
 
+	@Autowired
+	private YardDao dao;
+	
 	public Yard get(String id) {
 		return super.get(id);
 	}
@@ -44,4 +48,8 @@ public class YardService extends CrudService<YardDao, Yard> {
 		super.delete(yard);
 	}
 	
+	@Transactional(readOnly = false)
+	public Yard findByStaionId(String stationid) {
+		return dao.findByStaionId(stationid);
+	}
 }
\ No newline at end of file

@@ -66,6 +66,7 @@ public class BayonetController extends BaseController {
 	public String form(Bayonet bayonet, Model model) {
 		Yard yard = new Yard();
 	    List<Yard> yardList = yardService.findList(yard);
+	    System.out.println(yardList);
 	    model.addAttribute("yardList", yardList);
 		model.addAttribute("bayonet", bayonet);
 		return "modules/yard/bayonetForm";

@@ -11,10 +11,16 @@
 
 #mysql database setting
 jdbc.type=mysql
-jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/station?useUnicode=true&characterEncoding=utf-8
-jdbc.username=root
-jdbc.password=123456
+jdbc.driver=com.mysql.cj.jdbc.Driver
+jdbc.url=jdbc:mysql://10.50.7.70:3306/station?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true
+jdbc.username=station
+jdbc.password=station@10.50.7.70
+
+#jdbc.type=mysql
+#jdbc.driver=com.mysql.cj.jdbc.Driver
+#jdbc.url=jdbc:mysql://localhost:3306/station?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true
+#jdbc.username=root
+#jdbc.password=root
 
 #mssql database settings
 #jdbc.type=mssql
@@ -41,7 +47,7 @@ redis.port=6379
 #============================#
 
 #\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
-productName=\u573A\u7AD9\u7BA1\u7406\u7CFB\u7EDF
+productName=\u6D77\u5173\u8F85\u52A9\u7BA1\u7406\u7CFB\u7EDF
 copyrightYear=2018
 #version=V1.2.7
 

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.thinkgem.jeesite.modules.land.dao.LandBusinesstypeListDao">
-    
     <sql id="landBusinesstypeListColumns">
 		a.massage_id AS "massageId",
 		a.id AS "id",
@@ -9,8 +8,8 @@
 		a.trailer_license_no AS "trailerLicenseNo",
 		a.master_list AS "masterList",
 		a.prodect_time AS "prodectTime",
-		a.returnmessage AS "returnmessage",
 		a.agentno AS "agentno",
+		a.is_delete AS "isDelete",
 		a.agentname AS "agentname",
 		a.cocode AS "cocode",
 		a.drivername AS "drivername",
@@ -23,10 +22,12 @@
 		a.businesstype AS "businesstype",
 		a.turnoverflag AS "turnoverflag",
 		a.contrastflag AS "contrastflag",
+		a.barcode AS "barcode",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
-		a.update_date AS "updateDate"
+		a.update_date AS "updateDate",
+		a.isvalid AS "isvalid"
 	</sql>
 	
 	<sql id="landBusinesstypeListJoins">
@@ -46,6 +47,13 @@
 		FROM land_businesstype_list a
 		<include refid="landBusinesstypeListJoins"/>
 		<where>
+			a.is_delete = "0"
+			<if test="trailerFrameNo !=null and trailerFrameNo !=''">
+				and trailer_frame_no = #{trailerFrameNo}
+			</if>
+			<if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>
+				and create_by = #{createBy.id}
+			</if>
 			
 		</where>
 		<choose>
@@ -53,10 +61,32 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY a.update_date DESC
+				ORDER BY a.create_date DESC
 			</otherwise>
 		</choose>
 	</select>
+	<select id="findByStatus" resultType="LandBusinesstypeList">
+		SELECT 
+			<include refid="landBusinesstypeListColumns"/>
+		FROM land_businesstype_list a
+			<include refid="landBusinesstypeListJoins"/>
+		where a.is_delete = "0"
+			<if test="trailerFrameNo !=null and trailerFrameNo !=''">
+				and trailer_frame_no = #{trailerFrameNo}
+			</if>
+		order by a.create_date DESC
+	</select>
+	<select id="findByBarcode" resultType="LandBusinesstypeList">
+		SELECT 
+			<include refid="landBusinesstypeListColumns"/>
+		FROM land_businesstype_list a
+			<include refid="landBusinesstypeListJoins"/>
+		where a.is_delete = "0"
+			<if test="barcode !=null and barcode !=''">
+				and barcode = #{barcode}
+			</if>
+		order by a.create_date DESC
+	</select>
 	
 	<select id="findAllList" resultType="LandBusinesstypeList">
 		SELECT 
@@ -76,6 +106,11 @@
 		</choose>
 	</select>
 	
+	<update id="deleteByBarcode" parameterType="java.lang.String">
+		UPDATE land_businesstype_list set is_delete = "1",isvalid = "1"
+		WHERE barcode = #{barcode}
+	</update>
+	
 	<insert id="insert">
 		INSERT INTO land_businesstype_list(
 			massage_id,
@@ -84,8 +119,8 @@
 			trailer_license_no,
 			master_list,
 			prodect_time,
-			returnmessage,
 			agentno,
+			is_delete,
 			agentname,
 			cocode,
 			drivername,
@@ -98,10 +133,12 @@
 			businesstype,
 			turnoverflag,
 			contrastflag,
+			barcode,
 			create_by,
 			create_date,
 			update_by,
-			update_date
+			update_date,
+			isvalid
 		) VALUES (
 			#{massageId},
 			#{id},
@@ -109,8 +146,8 @@
 			#{trailerLicenseNo},
 			#{masterList},
 			#{prodectTime},
-			#{returnmessage},
 			#{agentno},
+			#{isDelete},
 			#{agentname},
 			#{cocode},
 			#{drivername},
@@ -123,10 +160,12 @@
 			#{businesstype},
 			#{turnoverflag},
 			#{contrastflag},
+			#{barcode},
 			#{createBy.id},
 			#{createDate},
 			#{updateBy.id},
-			#{updateDate}
+			#{updateDate},
+			#{isvalid}
 		)
 	</insert>
 	
@@ -137,8 +176,8 @@
 			trailer_license_no = #{trailerLicenseNo},
 			master_list = #{masterList},
 			prodect_time = #{prodectTime},
-			returnmessage = #{returnmessage},
 			agentno = #{agentno},
+			is_delete = #{isDelete},
 			agentname = #{agentname},
 			cocode = #{cocode},
 			drivername = #{drivername},
@@ -151,8 +190,10 @@
 			businesstype = #{businesstype},
 			turnoverflag = #{turnoverflag},
 			contrastflag = #{contrastflag},
+			barcode = #{barcode},
 			update_by = #{updateBy.id},
-			update_date = #{updateDate}
+			update_date = #{updateDate},
+			isvalid = #{isvalid}
 		WHERE id = #{id}
 	</update>
 	

@@ -64,7 +64,12 @@
 		a.belong_org_princinal AS "belongOrgPrincinal",
 		a.belong_org_phone AS "belongOrgPhone",
 		a.operayion_type_belong AS "operayionTypeBelong",
-		a.returnmessage AS "returnmessage"
+		a.returnmessage AS "returnmessage",
+		a.id AS "id",
+		a.create_by AS "createBy.id",
+		a.create_date AS "createDate",
+		a.update_by AS "updateBy.id",
+		a.update_date AS "updateDate"
 	</sql>
 	
 	<sql id="landCorporationInfoJoins">
@@ -84,13 +89,19 @@
 		FROM land_corporation_info a
 		<include refid="landCorporationInfoJoins"/>
 		<where>
-			
+			<if test='coCode !="1" and coCode !=null and coCode !=""'>
+				co_code = #{coCode}
+			</if>
+			<if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>
+				create_by = #{createBy.id}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
+				ORDER BY a.update_date DESC
 			</otherwise>
 		</choose>
 	</select>
@@ -108,6 +119,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
+				ORDER BY a.update_date DESC
 			</otherwise>
 		</choose>
 	</select>
@@ -175,7 +187,12 @@
 			belong_org_princinal,
 			belong_org_phone,
 			operayion_type_belong,
-			returnmessage
+			returnmessage,
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date
 		) VALUES (
 			#{eportId},
 			#{coCode},
@@ -238,7 +255,12 @@
 			#{belongOrgPrincinal},
 			#{belongOrgPhone},
 			#{operayionTypeBelong},
-			#{returnmessage}
+			#{returnmessage},
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate}
 		)
 	</insert>
 	
@@ -305,7 +327,9 @@
 			belong_org_princinal = #{belongOrgPrincinal},
 			belong_org_phone = #{belongOrgPhone},
 			operayion_type_belong = #{operayionTypeBelong},
-			returnmessage = #{returnmessage}
+			returnmessage = #{returnmessage},
+			update_by = #{updateBy.id},
+			update_date = #{updateDate}
 		WHERE id = #{id}
 	</update>
 	

@@ -51,7 +51,12 @@
 		FROM land_road_dr_record a
 		<include refid="landRoadDrRecordJoins"/>
 		<where>
-			
+			<if test='idCard !="1" and idCard !=null and idCard !=""'>
+				id_card = #{idCard}
+			</if>
+			<if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>
+				create_by = #{createBy.id}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -62,6 +67,28 @@
 			</otherwise>
 		</choose>
 	</select>
+	<select id="findList2" resultType="LandRoadDrRecord" parameterType="String">
+		SELECT 
+			<include refid="landRoadDrRecordColumns"/>
+		FROM land_road_dr_record a
+		<include refid="landRoadDrRecordJoins"/>
+		<where>
+			<if test='createBy =="1"'>
+				
+			</if>
+			<if test='createBy !="1" and createBy !=null and createBy !=""'>
+				create_by = #{createBy}
+			</if>
+		</where>
+		<choose>
+			<!-- <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when> -->
+			<otherwise>
+				ORDER BY a.update_date DESC
+			</otherwise>
+		</choose>
+	</select>
 	
 	<select id="findAllList" resultType="LandRoadDrRecord">
 		SELECT 

@@ -41,7 +41,12 @@
 		FROM land_road_trailer_record a
 		<include refid="landRoadTrailerRecordJoins"/>
 		<where>
-			
+			<if test='trailerLicenseNo !="1" and trailerLicenseNo !=null and trailerLicenseNo !=""'>
+				trailer_license_no = #{trailerLicenseNo}
+			</if>
+			<if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>
+				create_by = #{createBy.id}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -62,9 +67,9 @@
 			
 		</where>		
 		<choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+			<!-- <when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}
-			</when>
+			</when> -->
 			<otherwise>
 				ORDER BY a.update_date DESC
 			</otherwise>

@@ -57,6 +57,7 @@
 		a.foreign_license_pic AS "foreignLicensePic",
 		a.nationality AS "nationality",
 		a.returnmessage AS "returnmessage",
+		a.barcode AS "barcode",
 		a.id AS "id",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
@@ -81,7 +82,12 @@
 		FROM land_road_ve_record a
 		<include refid="landRoadVeRecordJoins"/>
 		<where>
-			
+			<if test='domesticLisenceNo !="1" and domesticLisenceNo !=null and domesticLisenceNo !=""'>
+				domestic_lisence_no = #{domesticLisenceNo}
+			</if>
+			<if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>
+				create_by = #{createBy.id}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -92,6 +98,9 @@
 			</otherwise>
 		</choose>
 	</select>
+	<select id="selectByFrameNo" parameterType="java.lang.String" resultType="LandRoadVeRecord">
+		SELECT * FROM land_road_ve_record WHERE domestic_lisence_no = #{domesticLisenceNo}
+	</select>
 	
 	<select id="findAllList" resultType="LandRoadVeRecord">
 		SELECT 
@@ -111,6 +120,7 @@
 		</choose>
 	</select>
 	
+	
 	<insert id="insert">
 		INSERT INTO land_road_ve_record(
 			eport_id,
@@ -167,6 +177,7 @@
 			foreign_license_pic,
 			nationality,
 			returnmessage,
+			barcode,
 			id,
 			create_by,
 			create_date,
@@ -227,6 +238,7 @@
 			#{foreignLicensePic},
 			#{nationality},
 			#{returnmessage},
+			#{barcode},
 			#{id},
 			#{createBy.id},
 			#{createDate},
@@ -291,6 +303,7 @@
 			foreign_license_pic = #{foreignLicensePic},
 			nationality = #{nationality},
 			returnmessage = #{returnmessage},
+			barcode = #{barcode},
 			update_by = #{updateBy.id},
 			update_date = #{updateDate}
 		WHERE id = #{id}

@@ -10,7 +10,7 @@
 	</sql>
 	
 	<sql id="bayonetJoins">
-		JOIN yard b ON b.id = a.yard_id
+		JOIN yard b ON b.stationid = a.yard_id
 	</sql>
     
 	<select id="get" resultType="Bayonet">
@@ -21,6 +21,22 @@
 		WHERE a.id = #{id}
 	</select>
 	
+	<select id="findByYardId" resultType="Bayonet" parameterType="String">
+		SELECT 
+			<include refid="bayonetColumns"/>
+		FROM bayonet a
+		<include refid="bayonetJoins"/>
+		WHERE a.yard_id = #{yardId}
+	</select>
+	
+	<select id="findByYardAndName" resultType="Bayonet" parameterType="String">
+		SELECT 
+			<include refid="bayonetColumns"/>
+		FROM bayonet a
+		<include refid="bayonetJoins"/>
+		WHERE a.yard_id = #{yardId} and a.name = #{name}
+	</select>
+	
 	<select id="findList" resultType="Bayonet">
 		SELECT 
 			<include refid="bayonetColumns"/>

@@ -5,6 +5,8 @@
 	<sql id="yardColumns">
 		a.id AS "id",
 		a.name AS "name",
+		a.area_code AS "areaCode",
+		a.stationid AS "stationid",
 		a.customs_code AS "customsCode",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
@@ -25,6 +27,14 @@
 		WHERE a.id = #{id}
 	</select>
 
+	<select id="findByStaionId" resultType="Yard" parameterType="String">
+		SELECT 
+			<include refid="yardColumns"/>
+		FROM yard a
+		<include refid="yardJoins"/>
+		WHERE a.stationid = #{stationid}
+	</select>
+	
 	<select id="findList" resultType="Yard">
 		SELECT 
 			<include refid="yardColumns"/>
@@ -74,6 +84,8 @@
 		INSERT INTO yard(
 			id,
 			name,
+			area_code,
+			stationid,
 			customs_code,
 			create_by,
 			create_date,
@@ -84,6 +96,8 @@
 		) VALUES (
 			#{id},
 			#{name},
+			#{areaCode},
+			#{stationid},
 			#{customsCode},
 			#{createBy.id},
 			#{createDate},
@@ -97,6 +111,8 @@
 	<update id="update">
 		UPDATE yard SET 	
 			name = #{name},
+			area_code = #{areaCode},
+			stationid = #{stationid},
 			customs_code = #{customsCode},
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},

@@ -93,10 +93,10 @@
 			<bean class="com.thinkgem.jeesite.modules.sys.interceptor.LogInterceptor" />
 		</mvc:interceptor>
 		<!-- 手机视图拦截器 -->
-		<mvc:interceptor>
+		<!-- <mvc:interceptor>
 			<mvc:mapping path="/**" />
 			<bean class="com.thinkgem.jeesite.modules.sys.interceptor.MobileInterceptor" />
-		</mvc:interceptor>
+		</mvc:interceptor> -->
 	</mvc:interceptors>
 	
 	<!-- 支持Shiro对Controller的方法级AOP安全控制 begin-->

@@ -4,7 +4,7 @@
 <!DOCTYPE html>
 <html style="overflow-x:auto;overflow-y:auto;">
 <head>
-	<title><sitemesh:title/></title><!--  - Powered By ShangYou -->
+	<title><sitemesh:title/></title><!--  - Powered By -->
 	<%@include file="/WEB-INF/views/include/head.jsp" %>
 	<!-- Baidu tongji analytics --><script>var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src="//hm.baidu.com/hm.js?82116c626a8d504a5c0675073362ef6f";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s);})();</script>
 	<sitemesh:head/>

@@ -4,7 +4,7 @@
 <!DOCTYPE html>
 <html style="overflow-x:auto;overflow-y:auto;">
 <head>
-	<title><sitemesh:title/> - Powered By ShangYou</title>
+	<title><sitemesh:title/> - Powered By</title>
 	<%@include file="/WEB-INF/views/include/head.jsp" %>		
 	<!-- Baidu tongji analytics --><script>var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src="//hm.baidu.com/hm.js?82116c626a8d504a5c0675073362ef6f";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s);})();</script>
 	<sitemesh:head/>

@@ -4,7 +4,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By ShangYou</title>
+	<title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By</title>
 	<%@include file="/WEB-INF/views/modules/cms/front/include/head.jsp" %>
 	<!-- Baidu tongji analytics --><script>var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src="//hm.baidu.com/hm.js?82116c626a8d504a5c0675073362ef6f";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s);})();</script>
 	<sitemesh:head/>

@@ -4,7 +4,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By ShangYou</title>
+	<title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By</title>
 	<meta name="viewport" content="width=device-width,height=device-height,inital-scale=1.0,maximum-scale=1.0,user-scalable=no;">
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="apple-mobile-web-app-status-bar-style" content="black">

@@ -5,9 +5,6 @@
 <title>流转管理</title>
 <meta name="decorator" content="default" />
 <script type="text/javascript">
-
-</script>
-<script type="text/javascript">
 	$(document).ready(function() {
 		//$("#name").focus();
 		$("#inputForm").validate({submitHandler : function(form) {
@@ -27,41 +24,52 @@
 });
 
 </script>
-<script type="text/javascript">
-	$(function(){
-		$('input').blur(function(){
-			this.value=this.value.toUpperCase();
-		});
-	})
-</script>
+
 <style type="text/css">
-	input{
-		text-transform:uppercase;
-	}
-	thead{
+input {
+	text-transform: uppercase;
+}
+
+thead {
 	background-color: #eee;
-	}
-	th,td{
-		border:1px solid #ddd;
-	}
+}
+
+th, td {
+	border: 1px solid #ddd;
+}
+.form-horizontal .input-large{
+	width:200px;
+}
+.ReadOnly{
+	disabled:ture !important;
+}
 </style>
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/land/landBusinesstypeList/">流转列表</a></li>
+		<li><a href="${ctx}/land/landBusinesstypeList/">申请列表</a></li>
 		<li class="active"><a
 			href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">流转<shiro:hasPermission
 					name="land:landBusinesstypeList:edit">${not empty landBusinesstypeList.id?'修改':'添加'}</shiro:hasPermission>
 				<shiro:lacksPermission name="land:landBusinesstypeList:edit">查看</shiro:lacksPermission></a></li>
 	</ul>
 	<br />
+	<div class="alert alert-block error_div" style="display: none">
+		<button type="button" class="close" data-dismiss="alert">&times;</button>
+		<h4>Warning!</h4>
+		<p id="error_p"></p>
+	</div>
 	<div class="form-horizontal">
 		<div class="control-group">
+			<h4>进出场业务申请</h4>
+		</div>	
+		<div class="control-group">
 			<label class="control-label">主单号：</label>
 			<div class="controls">
-				<input type="text" name="coCode" placeholder="请输入主单号，例如172-12341234" autocomplete="off"
-					class="input-xlarge" id="putMaster">
+				<input type="text" name="coCode" placeholder="请输入主单号，例如172-12341234"
+					autocomplete="off" class="input-xxlarge" id="putMaster">
 				<button class="btn btn-primary" id="select">查询</button>
+				<span class="help-inline"><font color="red">查询单号前请先选定业务类型</font>
 			</div>
 			<br>
 			<div class="controls">
@@ -77,8 +85,6 @@
 							<th width='80px'>重量</th>
 							<th width='80px'>关区</th>
 							<th width='150px'>时间</th>
-						<th width='80px'>状态</th>
-						<th width='80px'>海关状态</th>
 							<th width='400px'>回执内容</th>
 						</tr>
 					</thead>
@@ -92,37 +98,23 @@
 		class="form-horizontal">
 		<form:hidden path="id" />
 		<sys:message content="${message}" />
-		
 		<div class="control-group">
 			<label class="control-label">车牌号：</label>
 			<div class="controls">
-				<form:input path="trailerFrameNo" htmlEscape="false" maxlength="32"
-					class="input-xlarge required" />
-					<span class="help-inline"><font color="red">*</font></span>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">车架号：</label>
-			<div class="controls">
-				<form:input path="trailerLicenseNo" htmlEscape="false"
-					maxlength="64" class="input-xxlarge required" />
+				<form:select path="trailerFrameNo" htmlEscape="false" maxlength="64" class="input-xlarge required" id="frameNo" >
+					<form:option value="" label="--请选择--" />
+					<form:options items="${veList}" itemLabel="domesticLisenceNo" itemValue="domesticLisenceNo" htmlEscape="false" />
+				</form:select>
 				<span class="help-inline"><font color="red">*</font></span> 
+				<span class="help-inline" id="message" style="color: red"></span>
 			</div>
 		</div>
-		<div class="control-group">
 
-			<br>
-			<label class="control-label">主单列表：</label>
-			<div class="controls">
-				<form:textarea path="masterList" rows="5" maxlength="1000"
-					class="input-xxlarge textarea" />
-			</div>
-		</div>
 		<div class="control-group">
 			<label class="control-label">申请时间：</label>
 			<div class="controls">
 				<input name="prodectTime" type="text" readonly="readonly"
-					maxlength="20" class="input-medium Wdate "
+					maxlength="20" class="input-xlarge Wdate "
 					value="<fmt:formatDate value="${landBusinesstypeList.prodectTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
 					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
 			</div>
@@ -131,159 +123,298 @@
 			<label class="control-label">所在企业代码：</label>
 			<div class="controls">
 				<form:input path="cocode" htmlEscape="false" maxlength="32"
-					class="input-xlarge " />
+					class="input-xlarge " id="cocode" />
+				<span class="help-inline"><font color="red">*</font></span>
 			</div>
 		</div>
 		<div class="control-group">
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span6">
 						<label class="control-label">货代代码：</label>
-			<label class="control-label">
-				<form:input path="agentno" htmlEscape="false" maxlength="32" class="input-large required" />
-			</label>
+						<div class="controls">
+							<form:input path="agentno" htmlEscape="false" maxlength="32"
+								class="input-xlarge" id="agentno" style="disabled:true"/>
+						</div>
+					</div>
+					<div class="span6">
 						<label class="control-label">货代名称：</label>
-			<label class="control-label">
-				<form:input path="agentname" htmlEscape="false" maxlength="255" class="input-large " />
-			</label>
+						<div class="controls">
+							<form:input path="agentname" htmlEscape="false" maxlength="255"
+								class="input-xlarge" id="agentName" />
+						</div>
+					</div>
+				</div>
+			</div>
 		</div>
 		<div class="control-group">
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span6">
 						<label class="control-label">驾驶员ID：</label>
-			<label class="control-label">
-				<form:input path="driverid" htmlEscape="false" maxlength="32" class="input-large required" />
-			</label>
+						<div class="controls">
+							<form:input path="driverid" htmlEscape="false" maxlength="32"
+								class="input-xlarge" id="driverid" />
+						</div>
+					</div>
+					<div class="span6">
 						<label class="control-label">驾驶员姓名：</label>
-			<label class="control-label">
-				<form:input path="drivername" htmlEscape="false" maxlength="32" class="input-large " />
-			</label>
+						<div class="controls">
+							<form:input path="drivername" htmlEscape="false" maxlength="32"
+								class="input-xlarge " id="drivername" />
+						</div>
+					</div>
+				</div>
+			</div>
 		</div>
 		<div class="control-group">
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span6">
 						<label class="control-label">起始海关代码：</label>
-			<label class="control-label">
-				<form:select path="startport" class="input-large ">
-					<form:option value="" label="" />
+						<div class="controls">
+							<form:select path="startport" class="input-xlarge ">
+								<form:option value="" label="--请选择--" />
 								<form:option value="4604" label="4604" />
 								<form:option value="4613" label="4613" />
 								<form:option value="4620" label="4620" />
-					
 							</form:select>
-			</label>
+							<span class="help-inline"><font color="red">流转业务填写，其他业务可不填写</font></span>
+						</div>
+					</div>
+					<div class="span6">
 						<label class="control-label">目的关区代码：</label>
-			<label class="control-label">
-				<form:select path="endport" class="input-large ">
-					<form:option value="" label="" />
+						<div class="controls">
+							<form:select path="endport" class="input-xlarge ">
+								<form:option value="" label="--请选择--" />
 								<form:option value="4604" label="4604" />
 								<form:option value="4613" label="4613" />
 								<form:option value="4620" label="4620" />
 							</form:select>
-			</label>
 						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
 		<div class="control-group">
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span6">
 						<label class="control-label">起始场站：</label>
-			<label class="control-label">
-				<form:select path="startsatation" class="input-large ">
-					<form:option value="" label="" />
-					<form:options items="${yardList}" itemLabel="name" itemValue="name"
-						htmlEscape="false" />
+						<div class="controls">
+							<form:select path="startsatation" class="input-xlarge"
+								id="st_select">
+								<form:option value="" label="--请选择--" />
+								<form:options items="${yardList}" itemLabel="name"
+									itemValue="stationid" htmlEscape="false" />
 							</form:select>
-			</label>
-			<label class="control-label">目的场站：</label>
-			<label class="control-label">
-				<form:select path="endstation" class="input-large ">
-					<form:option value="" label="" />
-					<form:options items="${yardList}" itemLabel="name" itemValue="name"
-						htmlEscape="false" />
+							<span class="help-inline"><font color="red">流转业务填写，其他业务可不填写</font></span>
+						</div>
+					</div>
+					<div class="span6">
+						</label> <label class="control-label">目的场站：</label>
+						<div class="controls">
+							<form:select path="endstation" class="input-xlarge" id="en_select">
+								<form:option value="" label="--请选择--" />
+								<form:options items="${yardList}" itemLabel="name"
+									itemValue="stationid" htmlEscape="false" />
 							</form:select>
-			</label>
+						</div>
+					</div>
+				</div>
+			</div>
 		</div>
 		<div class="control-group">
-			<label class="control-label">通道/卡口：</label>
-			<label class="control-label">
-				<form:select path="aisle" class="input-large ">
-					<form:option value="" label="" />
-					<form:options items="${bayonets}" itemLabel="name" itemValue="name"
-						htmlEscape="false" />
+			<div class="row-fluid">
+				<div class="span12">
+					<div class="span6">
+						<label class="control-label">目的场站通道/卡口：</label>
+						<div class="controls">
+							<form:select path="aisle" class="input-xlarge" id="aisle">
+								<form:option value="" label="--请选择--" />
+							 	<form:options items="${bayonets}" itemLabel="name"
+									itemValue="channel" htmlEscape="false" /> 
 							</form:select>
-			</label>
+						</div>
+					</div>
+					<div class="span6">
 						<label class="control-label">业务类型：</label>
-			<label class="control-label">
-				<form:select path="businesstype" class="input-large ">
-					<form:option value="" label="" />
+						<div class="controls">
+							<form:select path="businesstype" class="input-xlarge" id="ieType">
+								<form:option value="" label="--请选择--" />
 								<form:option value="进口提货" label="进口提货" />
-					<form:option value="出口拉货" label="出口拉货" />
-					<form:option value="货物流转" label="货物流转" />
-					<form:option value="分拨分流" label="分拨分流" />
+								<form:option value="出口送货" label="出口送货" />
+								<form:option value="进口流转" label="进口流转" />
+								<form:option value="出口流转" label="出口流转" />
 							</form:select>
-			</label>
+						</div>
+					</div>
+				</div>
+			</div>
 		</div>
 		<div class="control-group">
 			<label class="control-label">进出场：</label>
-			<label class="control-label">
-				<form:select path="turnoverflag" class="input-xlarge ">
-					<form:option value="" label="" />
-					<form:option value="进场站" label="进场站" />
-					<form:option value="进场站" label="出场站" />
+			<div class="controls">
+				<form:select path="turnoverflag" class="input-xlarge">
+					<form:option value="" label="--请选择--" />
+					<form:option value="I" label="进场站"   selected = "selected"/>
+					<form:option value="E" label="出场站"/>
 				</form:select>
-			</label>
+				<span class="help-inline"><font color="red">无需改动</font></span>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">主单列表：</label>
+			<div class="controls">
+				<form:textarea path="masterList" rows="5" maxlength="1000"
+					placeholder="请输入主单号，例如172-12341234，多个单号以“,”（英文）分割"
+					class="input-xxlarge textarea" />
+			</div>
 		</div>
-		<span class="help-inline"><font color="red" >注：页面内容请全部填写(主单列表可空)</font></span>
 		<div class="form-actions">
 			<shiro:hasPermission name="land:landBusinesstypeList:edit">
 				<input id="btnSubmit" class="btn btn-primary" type="submit"
-					value="保 存" />&nbsp;</shiro:hasPermission>
+					value="保 存" />&nbsp;
+			</shiro:hasPermission>
 			<input id="btnCancel" class="btn" type="button" value="返 回"
 				onclick="history.go(-1)" />
 		</div>
 	</form:form>
+	<style>
+	</style>
+	<script type="text/javascript">
+		$(function(){
+			$('input').blur(function(){
+				this.value=this.value.toUpperCase();
+			});
+			$(".input-xlarge").each(function(){
+				if($(this).val()!==null){
+				//	$(this).attr("disabled","true");
+				}
+			});
+		})
+		$("#frameNo").change(function(){
+	 			var frameNo = $("#frameNo").val();
+				if(frameNo !=null && frameNo !="" ){
+					 $.ajax({
+							type:"post",
+							url:"${ctx}/land/landBusinesstypeList/check",
+							data:{frameNo:frameNo},
+							dataType:"json",
+							success:function(data){
+								var index = data.html.lastIndexOf(">");  
+								var str  = data.html.substring(index + 1, data.html.length);
+								if(data.list !=undefined){
+									$("#agentName").val(data.list[0].agentname)
+									$("#agentno").val(data.list[0].agentno)
+									$("#driverid").val(data.list[0].driverid)
+									$("#drivername").val(data.list[0].drivername)
+									$("#cocode").val(data.list[0].coCode)
+								}
+								if(data.list ==undefined){
+									$("#agentName").val("");
+									$("#agentno").val("");
+									$("#driverid").val("");
+									$("#drivername").val("");
+									$("#cocode").val("");
+								}
+								$("#message").html(str);
+							},
+							error:function(data){
+								$(".error_div").css("display","block");
+								$("#error_p").html(data.message);
+							}
+						}) 
+				}
+			 	
+		})
+		$("#en_select").change(function(){
+			var st_select = $("#en_select").val();
+			$.ajax({
+				type:"post",
+				url:"${ctx}/land/landBusinesstypeList/option",
+				data:{st_select,st_select},
+				dataType:"json",
+				success:function(data){
+					$("#aisle").val("");
+					$("#aisle").empty();
+					for(var i=0;i<data.list.length;i++){
+						var option = document.createElement("option");
+						$(option).val(data.list[i].channel);
+						$(option).text(data.list[i].name);
+						$("#aisle").append(option);
+					}
+				},
+				error:function(data){
+					$(".error_div").css("display","block");
+					$("#error_p").html(data);
+				}
+			})
+		})
+
+	</script>
 	<script type="text/javascript">
 		$("#putMaster").blur(function(){
 			var master = $("#putMaster").val();
 			var str = parseInt(master.substring(4,11));
 			var endStr = parseInt(master.substring(11));
 			if(str%7 != endStr){
-				alert("输入主单号不符合模七校验");
+				$(".error_div").css("display","block");
+				$("#error_p").html("输入主单号不符合模七校验");
+				$("#putMaster").val(" ");
 			}
 		})
-
 	$("#select").click(function(){
 		var masterNum = $("#putMaster").val();
-		console.log(masterNum)
-		 $.ajax({
-			url:'',
-		    type:'POST',
-		    data:JSON.stringify(masterNum.field),
-		    contentType:"application/json",
-		    dataType:'json',
-		    cache:false,
-		    success:function(data){
-		    	$("#tableInfo").find('tr').remove()
-		    	$each(result,function(index,val){
-		    		var tr = $([
-				           '<tr >',
-				           '<td><button class="layui-btn layui-btn-mini layui-btn" onclick="addData(this)">添加</button></td>',
-				           '<td>b</td>',
-				           '<td>等待上传</td>',
-				           '<td>bb</td>',
-				           '<td id="master">172-32021230</td>',
-				           '<td>bb</td>',
-				           '<td>bb</td>',
-				           '<td>bb</td>',
-				           '<td>bb</td>', 
-				           '<td>bb</td>',
-				           '<td>bb</td>', 
-				           '<td>bb</td>',
-				           '<td></td>', 
-				           '</tr>']
-				           .join(''));
-				  		$("#tableInfo").append(tr);
-		    	})
+		var ieType=$("#ieType").val();
 		
-		    },
-		    error:function(data){
-		    	alert("查询失败");
+		if(ieType=="进口提货" | ieType=="进口流转" ){
+			ieType="I";
+		}else if(ieType=="出口送货" | ieType=="出口流转"){ 
+			ieType="E";
+		}
+		var url = 'http://tjfx.15miaoo.com:8003/tj/orig/orig';
+		var xhr = new XMLHttpRequest();
+		// 访问nginx中的代理服务器
+		xhr.open('get', url+'?waybill='+masterNum+'&imp='+ieType, true);
+		xhr.send();
+		xhr.onreadystatechange = function(){
+		    if(xhr.readyState == 4){
+		        if(xhr.status ==200){
+		        	var flightNo = "";
+		        	var flightDate = "";
+		            var data = JSON.parse(xhr.responseText);
+		            if(ieType=="I"){
+		            	flightNo = data[0].flightno;
+		            	flightDate = timeFormat(data[0].flightDate).substring(0,10);
+		            }else{
+		            	flightNo = data[0].carrier+data[0].flightno
+		            	flightDate = timeFormat(data[0].flightdate).substring(0,10)
+		            }
+		            $("#tableInfo").children("tr").remove();
+		    		var str = '<tr>'+
+		    			'<td><button class="btn btn-primary" onclick="addData(this);">添加</button></td>'+
+		    			'<td>'+flightNo+'</td>'+
+		    			'<td>'+flightDate+'</td>'+
+		    			'<td>'+data[0].originatingstation+"-"+data[0].destinationstation+'</td>'+
+		    			'<td>'+data[0].waybillnomaster+'</td>'+
+		    			'<td>'+data[0].totalpiece +'</td>'+
+		    			'<td>'+data[0].totalweight +'</td>'+
+		    			'<td>'+data[0].customscode+'</td>'+
+		    			'<td>'+timeFormat(data[0].createdate) +'</td>'+
+		    			'<td>'+data[0].receiptinformation +'</td>'+
+		    		'</tr>';
+		    		$("#tableInfo").append(str);
+		        }
+		   }
 		}
-		})  
 		
 	})
-	function addData(){
-			var master = $("#master").html();
+
+	function addData(btn){
+		var tr = btn.parentNode.parentNode;
+		var master = (tr.getElementsByTagName("td")[4]).innerText;
 		var data = $(".textarea").val();
 		if(data.length==0){
 			$(".textarea").val(data+master);
@@ -291,6 +422,22 @@
 			$(".textarea").val(data+','+master);
 		}
 	}
+	function timeFormat(d) {
+		var date = new Date(d);
+		var y = date.getFullYear();
+		var m = date.getMonth() + 1;
+		m = m < 10 ? '0' + m : m;
+		var d = date.getDate();
+		d = d < 10 ? ("0" + d) : d;
+		var hours = date.getHours();
+		hours = hours < 10 ? '0' + hours : hours;
+		var minutes = date.getMinutes();
+		minutes = minutes < 10 ? '0' + minutes : minutes;
+		var second = date.getSeconds();
+		second = second < 10 ? '0' + second : second;
+		return y + "-" + m + "-" + d + " " + hours + ":" + minutes + ":" + second;
+	}
+	
 </script>
 </body>
 </html>
\ No newline at end of file

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <html>
 <head>
-	<title>流转管理</title>
+	<title>进出场业务管理</title>
 	<meta name="decorator" content="default"/>
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -18,9 +18,9 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li class="active"><a href="${ctx}/land/landBusinesstypeList/">流转列表</a></li>
+		<li class="active"><a href="${ctx}/land/landBusinesstypeList/">申请列表</a></li>
 		<shiro:hasPermission name="land:landBusinesstypeList:edit">
-		<li><a href="${ctx}/land/landBusinesstypeList/form">流转添加</a></li></shiro:hasPermission>
+		<li><a href="${ctx}/land/landBusinesstypeList/form">申请添加</a></li></shiro:hasPermission>
 	</ul>
 	<form:form id="searchForm" modelAttribute="landBusinesstypeList" action="${ctx}/land/landBusinesstypeList/" method="post" class="breadcrumb form-search">
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -40,14 +40,15 @@
 			<tr>
 				<th>车牌号</th>
 				<th>货代名称</th>
-				<th>起始海关</th>
-				<th>目的海关</th>
+				<th>起始海关代码</th>
 				<th>起始关区</th>
+				<th>目的海关代码</th>
 				<th>目的关区</th>
 				<th>卡口</th>
 				<th>业务类型</th>
 				<th>进出场站</th>
-				<th>更新时间</th>
+				<th>已进已出</th>
+				<th>创建时间</th>
 				<shiro:hasPermission name="land:landBusinesstypeList:edit"><th>操作</th></shiro:hasPermission>
 			</tr>
 		</thead>
@@ -61,18 +62,42 @@
 				</td>
 				<td>${landBusinesstypeList.agentname}</td>
 				<td>${landBusinesstypeList.startport}</td>
+				<td>
+					<c:if test='${landBusinesstypeList.startsatation =="4604000000"}'>西货站</c:if>
+					<c:if test='${landBusinesstypeList.startsatation =="4604499001"}'>军投货站</c:if>
+					<c:if test='${landBusinesstypeList.startsatation =="4604511001"}'>快邮站</c:if>
+				</td>
+				
 				<td>${landBusinesstypeList.endport}</td>
-				<td>${landBusinesstypeList.startsatation}</td>
-				<td>${landBusinesstypeList.endstation}</td>
-				<td>${landBusinesstypeList.aisle}</td>
+				<td>
+					<c:if test='${landBusinesstypeList.endstation =="4604000000"}'>西货站</c:if>
+					<c:if test='${landBusinesstypeList.endstation =="4604499001"}'>军投货站</c:if>
+					<c:if test='${landBusinesstypeList.endstation =="4604511001"}'>快邮站</c:if>
+				</td>				
+				<td>
+					<c:if test="${landBusinesstypeList.aisle =='4604333311'}">1号卡口-进</c:if>
+					<c:if test="${landBusinesstypeList.aisle =='4604111111'}">1号卡口-进</c:if>
+					<c:if test="${landBusinesstypeList.aisle =='4604444411'}">1号卡口-进</c:if>
+					<c:if test="${landBusinesstypeList.aisle =='4604333321'}">2号卡口-进</c:if>
+					<c:if test="${landBusinesstypeList.aisle =='4604333312'}">1号卡口-出</c:if>
+					<c:if test="${landBusinesstypeList.aisle =='4604444412'}">1号卡口-出</c:if>
+					<c:if test="${landBusinesstypeList.aisle =='4604110112'}">1号卡口-出</c:if>
+					<c:if test="${landBusinesstypeList.aisle =='4604333322'}">2号卡口-出</c:if>
+				</td>
 				<td>${landBusinesstypeList.businesstype}</td>
-				<td>${landBusinesstypeList.turnoverflag}</td>
-				<td><a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">
-					<fmt:formatDate value="${landBusinesstypeList.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
-				</a></td>
+				<td>
+					<c:if test="${landBusinesstypeList.turnoverflag =='E'}">出场站</c:if>
+					<c:if test="${landBusinesstypeList.turnoverflag =='I'}">进场站</c:if>
+				</td>
+				<td>${landBusinesstypeList.contrastflag}</td>
+				<td>
+					<fmt:formatDate value="${landBusinesstypeList.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+				</td>
 				<shiro:hasPermission name="land:landBusinesstypeList:edit"><td>
+					<c:if test="${landBusinesstypeList.contrastflag==null ||landBusinesstypeList.contrastflag==''}">
 						<a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">修改</a>
 						<a href="${ctx}/land/landBusinesstypeList/delete?id=${landBusinesstypeList.id}" onclick="return confirmx('确认要删除该流转吗？', this.href)">删除</a>
+					</c:if>
 				</td></shiro:hasPermission>
 			</tr>
 		</c:forEach>

-<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <html>
 <head>
-	<title>备案管理</title>
-	<meta name="decorator" content="default"/>
-	<script type="text/javascript">
-		$(document).ready(function() {
+<title>备案管理</title>
+<meta name="decorator" content="default" />
+<script type="text/javascript">
+	$(document).ready(
+			function() {
 				//$("#name").focus();
-			$("#inputForm").validate({
-				submitHandler: function(form){
+				$("#inputForm")
+						.validate(
+								{
+									submitHandler : function(form) {
 										loading('正在提交，请稍等...');
 										form.submit();
 									},
-				errorContainer: "#messageBox",
-				errorPlacement: function(error, element) {
+									errorContainer : "#messageBox",
+									errorPlacement : function(error, element) {
 										$("#messageBox").text("输入有误，请先更正。");
-					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-						error.appendTo(element.parent().parent());
+										if (element.is(":checkbox")
+												|| element.is(":radio")
+												|| element.parent().is(
+														".input-append")) {
+											error.appendTo(element.parent()
+													.parent());
 										} else {
 											error.insertAfter(element);
 										}
 									}
 								});
 			});
-		$(function(){
-			$('input').blur(function(){
-				this.value=this.value.toUpperCase();
+	$(function() {
+		$('input').blur(function() {
+			this.value = this.value.toUpperCase();
 		});
 	})
-	</script>
+</script>
 <script type="text/javascript">
-	$(function(){
-		$('input').blur(function(){
-			this.value=this.value.toUpperCase();
+	$(function() {
+		$('input').blur(function() {
+			this.value = this.value.toUpperCase();
 		});
 	})
 </script>
 <style type="text/css">
-	input{
-		text-transform:uppercase;
-	}
+input {
+	text-transform: uppercase;
+}
 </style>
-		<style type="text/css">
-		.row-lable{
-			margin-left:30px;
-			width:180px;
-			text-align:right;
-		}
-		.row-controls{
-			margin-left:20px;
+<style type="text/css">
+.row-lable {
+	width: 180px;
+	text-align: right;
+}
+
+.row-controls {
 	display: inline;
-			width:300px;
-		}
-	</style>
+	width: 280px;
+}
+</style>
 </head>
 <body>
 	<ul class="nav nav-tabs">
 		<li><a href="${ctx}/land/landCorporationInfo/">备案列表</a></li>
-		<li class="active"><a href="${ctx}/land/landCorporationInfo/form?id=${landCorporationInfo.id}">备案<shiro:hasPermission name="land:landCorporationInfo:edit">${not empty landCorporationInfo.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="land:landCorporationInfo:edit">查看</shiro:lacksPermission></a></li>
-	</ul><br/>
-	<form:form id="inputForm" modelAttribute="landCorporationInfo" action="${ctx}/land/landCorporationInfo/save" method="post" class="form-horizontal">
-		<form:hidden path="id"/>
-		<sys:message content="${message}"/>		
+		<li class="active"><a
+			href="${ctx}/land/landCorporationInfo/form?id=${landCorporationInfo.id}">备案<shiro:hasPermission
+					name="land:landCorporationInfo:edit">${not empty landCorporationInfo.id?'修改':'添加'}</shiro:hasPermission>
+				<shiro:lacksPermission name="land:landCorporationInfo:edit">查看</shiro:lacksPermission></a></li>
+	</ul>
+	<br />
+	<form:form id="inputForm" modelAttribute="landCorporationInfo"
+		action="${ctx}/land/landCorporationInfo/save" method="post"
+		class="form-horizontal">
+		<form:hidden path="id" />
+		<sys:message content="${message}" />
+		<div class="control-group">
+			<h4>企业信息</h4>
+		</div>
 		<div class="control-group">
 			<label class="row-lable">企业代码：</label>
 			<div class="row-controls">
-				<form:input path="coCode" htmlEscape="false" maxlength="20" class="input-large required"/>
+				<form:input path="coCode" htmlEscape="false" maxlength="20"
+					class="input-large required" />
 			</div>
 			<label class="row-lable">主管海关代码：</label>
 			<div class="row-controls">
-				<form:input path="mainPort" htmlEscape="false" maxlength="4" class="input-large required" id="mainPort"/>
+				<form:input path="mainPort" htmlEscape="false" maxlength="4"
+					class="input-large required" id="mainPort" />
 			</div>
+
+		</div>
+		<div class="control-group">
 			<label class="row-lable">企业注册地：</label>
 			<div class="row-controls">
-				<form:input path="coRegAddr" htmlEscape="false" maxlength="12" class="input-large required"/>
+				<form:input path="coRegAddr" htmlEscape="false" maxlength="12"
+					class="input-large required" />
 			</div>
-		</div>
-		<div class="control-group">
 			<label class="row-lable">批准海关：</label>
 			<div class="row-controls">
-				<form:input path="apprDep" htmlEscape="false" maxlength="64" class="input-large required"/>
+				<form:input path="apprDep" htmlEscape="false" maxlength="64"
+					class="input-large required" />
 			</div>
+		</div>
+		<div class="control-group">
 			<label class="row-lable">批准/许可批文号：</label>
 			<div class="row-controls">
-				<form:input path="apprNo" htmlEscape="false" maxlength="64" class="input-large required"/>
+				<form:input path="apprNo" htmlEscape="false" maxlength="64"
+					class="input-large required" />
 			</div>
 			<label class="row-lable">批准/许可批文有效期：</label>
 			<div class="row-controls">
-				<input name="apprValidTime" type="text" readonly="readonly" maxlength="20" class="input-large Wdate required"
+				<input name="apprValidTime" type="text" readonly="readonly"
+					maxlength="20" class="input-large Wdate required"
 					value="<fmt:formatDate value="${landCorporationInfo.apprValidTime}" pattern="yyyy-MM-dd"/>"
-					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="row-lable">批准行驶口岸：</label>
 			<div class="row-controls">
-				<form:input path="apprPorts" htmlEscape="false" maxlength="255" class="input-large required"/>
+				<form:input path="apprPorts" htmlEscape="false" maxlength="255"
+					class="input-large required" />
 			</div>
 			<label class="row-lable">企业中文名称：</label>
 			<div class="row-controls">
-				<form:input path="coNameCn" htmlEscape="false" maxlength="255" class="input-large "/>
+				<form:input path="coNameCn" htmlEscape="false" maxlength="255"
+					class="input-large " />
+			</div>
 		</div>
+		<div class="control-group">
 			<label class="row-lable">企业外文名称：</label>
 			<div class="row-controls">
-				<form:input path="coNameEn" htmlEscape="false" maxlength="255" class="input-large required"/>
-			</div>
+				<form:input path="coNameEn" htmlEscape="false" maxlength="255"
+					class="input-large required" />
 			</div>
-		<div class="control-group">
 			<label class="row-lable">企业地址：</label>
 			<div class="row-controls">
-				<form:input path="coAddr" htmlEscape="false" maxlength="255" class="input-large required"/>
+				<form:input path="coAddr" htmlEscape="false" maxlength="255"
+					class="input-large required" />
+			</div>
 		</div>
+		<div class="control-group">
 			<label class="row-lable">境内联系电话：</label>
 			<div class="row-controls">
-				<form:input path="insidePhone" htmlEscape="false" maxlength="64" class="input-large phone"/>
+				<form:input path="insidePhone" htmlEscape="false" maxlength="64"
+					class="input-large phone" />
 			</div>
 			<label class="row-lable">企业经营类型：</label>
 			<div class="row-controls">
 				<form:select path="coDealType" class="input-large required">
-					<form:option value="" label=""/>
-					<form:option value="" label=""/>
-					<form:option value="1" label="货运企业"/>
-					<form:option value="2" label="客运企业"/>
-					<form:option value="3" label="转关运输企业"/>
-					<form:option value="4" label="其他"/>
+					<form:option value="" label="" />
+					<form:option value="" label="" />
+					<form:option value="1" label="货运企业" />
+					<form:option value="2" label="客运企业" />
+					<form:option value="3" label="转关运输企业" />
+					<form:option value="4" label="其他" />
 
 				</form:select>
 			</div>
-			
 		</div>
 		<div class="control-group">
 			<label class="row-lable">企业负责人：</label>
 			<div class="row-controls">
-				<form:input path="coRep" htmlEscape="false" maxlength="64" class="input-large required"/>
+				<form:input path="coRep" htmlEscape="false" maxlength="64"
+					class="input-large required" />
 			</div>
 			<label class="row-lable">企业负责人联系电话：</label>
 			<div class="row-controls">
-				<form:input path="coRepPhon" htmlEscape="false" maxlength="64" class="input-large required phone"/>
+				<form:input path="coRepPhon" htmlEscape="false" maxlength="64"
+					class="input-large required phone" />
+			</div>
 		</div>
+		<div class="control-group">
 			<label class="row-lable">境内联系地址：</label>
 			<div class="row-controls">
-				<form:input path="insideAddr" htmlEscape="false" maxlength="255" class="input-large "/>
-			</div>
+				<form:input path="insideAddr" htmlEscape="false" maxlength="255"
+					class="input-large " />
 			</div>
-		<div class="control-group">
 			<label class="row-lable">企业经营资格：</label>
 			<div class="row-controls">
-				<form:input path="coDealQua" htmlEscape="false" maxlength="64" class="input-large "/>
+				<form:input path="coDealQua" htmlEscape="false" maxlength="64"
+					class="input-large " />
 			</div>
+		</div>
+		<div class="control-group">
 			<label class="row-lable">企业备案类别：</label>
 			<div class="row-controls">
 				<form:select path="coRecType" class="input-large required">
-					<form:option value="" label=""/>
-					<form:option value="1" label="经营性进出境公路运输企业"/>
-					<form:option value="2" label="非经营性进出境公路交通工具负责人"/>
-					<form:option value="3" label="进出境公路运输工具代理企业"/>
-					<form:option value="4" label="经营性来往港澳公路运输企业"/>
-					<form:option value="5" label="非经营性来往港澳公路交通工具负责人"/>
-					<form:option value="6" label="来往港澳公路运输工具代理企业"/>
+					<form:option value="" label="" />
+					<form:option value="1" label="经营性进出境公路运输企业" />
+					<form:option value="2" label="非经营性进出境公路交通工具负责人" />
+					<form:option value="3" label="进出境公路运输工具代理企业" />
+					<form:option value="4" label="经营性来往港澳公路运输企业" />
+					<form:option value="5" label="非经营性来往港澳公路交通工具负责人" />
+					<form:option value="6" label="来往港澳公路运输工具代理企业" />
 				</form:select>
 			</div>
 			<label class="row-lable">最新更新申请业务类型：</label>
 			<div class="row-controls">
 				<form:select path="currApplyBussine" class="input-large ">
-					<form:option value="" label=""/>
-					<form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+					<form:option value="" label="" />
+					<form:options items="${fns:getDictList('')}" itemLabel="label"
+						itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
 		<div class="control-group">
+			<h4>运输服务企业信息</h4>
+		</div>
+		<div class="control-group">
 			<label class="row-lable">运输工具服务企业名称：</label>
 			<div class="row-controls">
-				<form:input path="coServiceName" htmlEscape="false" maxlength="255" class="input-large required"/>
+				<form:input path="coServiceName" htmlEscape="false" maxlength="255"
+					class="input-large required" />
 			</div>
 			<label class="row-lable">运输工具服务企业地址：</label>
 			<div class="row-controls">
-				<form:input path="coServiceAddp" htmlEscape="false" maxlength="255" class="input-large "/>
+				<form:input path="coServiceAddp" htmlEscape="false" maxlength="255"
+					class="input-large " />
 			</div>
+
+		</div>
+		<div class="control-group">
 			<label class="row-lable">运输工具服务企业电话：</label>
 			<div class="row-controls">
-				<form:input path="coServicePhone" htmlEscape="false" maxlength="64" class="input-large required phone"/>
+				<form:input path="coServicePhone" htmlEscape="false" maxlength="64"
+					class="input-large required phone" />
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="row-lable">批准货运车辆指标数：</label>
 			<div class="row-controls">
-				<form:input path="apprGoodsVeCount" htmlEscape="false" maxlength="10" class="input-large "/>
+				<form:input path="apprGoodsVeCount" htmlEscape="false"
+					maxlength="10" class="input-large " />
 			</div>
 			<label class="row-lable">批准客运车辆指标数：</label>
 			<div class="row-controls">
-				<form:input path="apprPassengersVeCount" htmlEscape="false" maxlength="10" class="input-large "/>
+				<form:input path="apprPassengersVeCount" htmlEscape="false"
+					maxlength="10" class="input-large " />
 			</div>
 		</div>
 		<div class="control-group">
+			<h4>担保企业信息</h4>
+		</div>
+		<div class="control-group">
 			<label class="row-lable">担保函编号（唯一）：</label>
 			<div class="row-controls">
-				<form:input path="assureLetterNo" htmlEscape="false" maxlength="32" class="input-large required"/>
+				<form:input path="assureLetterNo" htmlEscape="false" maxlength="32"
+					class="input-large required" />
 			</div>
 			<label class="row-lable">担保函金额：</label>
 			<div class="row-controls">
-				<form:input path="assureMoney" htmlEscape="false" maxlength="12" class="input-large "/>
+				<form:input path="assureMoney" htmlEscape="false" maxlength="12"
+					class="input-large " />
 			</div>
+
+		</div>
+		<div class="control-group">
 			<label class="row-lable">担保方式：</label>
 			<div class="row-controls">
 				<form:select path="assureType" class="input-large ">
-					<form:option value="" label=""/>
-					<form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+					<form:option value="" label="" />
+					<form:options items="${fns:getDictList('')}" itemLabel="label"
+						itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
-		</div>
-		<div class="control-group">
 			<label class="row-lable">担保企业组织机构代码：</label>
 			<div class="row-controls">
-				<form:input path="assureCoOrgCode" htmlEscape="false" maxlength="255" class="input-large required"/>
+				<form:input path="assureCoOrgCode" htmlEscape="false"
+					maxlength="255" class="input-large required" />
+			</div>
 		</div>
+		<div class="control-group">
 			<label class="row-lable">担保企业名称（人/单位）：</label>
 			<div class="row-controls">
-				<form:input path="assureCoName" htmlEscape="false" maxlength="32" class="input-large "/>
+				<form:input path="assureCoName" htmlEscape="false" maxlength="32"
+					class="input-large " />
 			</div>
 			<label class="row-lable">担保期限：</label>
 			<div class="row-controls">
-				<input name="assureTerm" type="text" readonly="readonly" maxlength="20" class="input-large Wdate "
+				<input name="assureTerm" type="text" readonly="readonly"
+					maxlength="20" class="input-large Wdate "
 					value="<fmt:formatDate value="${landCorporationInfo.assureTerm}" pattern="yyyy-MM-dd"/>"
-					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="row-lable">担保企业法人代表：</label>
 			<div class="row-controls">
-				<form:input path="assureCoRep" htmlEscape="false" maxlength="32" class="input-large required"/>
+				<form:input path="assureCoRep" htmlEscape="false" maxlength="32"
+					class="input-large required" />
 			</div>
 			<label class="row-lable">担保企业电话：</label>
 			<div class="row-controls">
-				<form:input path="assureCoPhone" htmlEscape="false" maxlength="32" class="input-large required phone"/>
+				<form:input path="assureCoPhone" htmlEscape="false" maxlength="32"
+					class="input-large required phone" />
+			</div>
+
 		</div>
+		<div class="control-group">
 			<label class="row-lable">担保企业地址：</label>
 			<div class="row-controls">
-				<form:input path="assureOAddr" htmlEscape="false" maxlength="255" class="input-large "/>
-			</div>
+				<form:input path="assureOAddr" htmlEscape="false" maxlength="255"
+					class="input-large " />
 			</div>
-		<div class="control-group">
 			<label class="row-lable">担保企业联系人：</label>
 			<div class="row-controls">
-				<form:input path="assureContact" htmlEscape="false" maxlength="32" class="input-large required"/>
+				<form:input path="assureContact" htmlEscape="false" maxlength="32"
+					class="input-large required" />
 			</div>
-			<label class="row-lable">担保企业联系人电话：</label>
-			<div class="row-controls">
-				<form:input path="assureCoConPhone" htmlEscape="false" maxlength="32" class="input-large required"/>
 		</div>
+		<div class="control-group">
 
+			<label class="row-lable">担保企业联系人电话：</label>
+			<div class="row-controls">
+				<form:input path="assureCoConPhone" htmlEscape="false"
+					maxlength="32" class="input-large required" />
 			</div>
-		<div class="control-group">
 			<label class="row-lable">申请人：</label>
 			<div class="row-controls">
-				<form:input path="proposer" htmlEscape="false" maxlength="32" class="input-large required"/>
+				<form:input path="proposer" htmlEscape="false" maxlength="32"
+					class="input-large required" />
 			</div>
+		</div>
+		<div class="control-group">
 			<label class="row-lable">申请时间：</label>
 			<div class="row-controls">
-				<input name="proposeTime" type="text" readonly="readonly" maxlength="20" class="input-large Wdate "
+				<input name="proposeTime" type="text" readonly="readonly"
+					maxlength="20" class="input-large Wdate "
 					value="<fmt:formatDate value="${landCorporationInfo.proposeTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
+					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
 			</div>
 			<label class="row-lable">数据操作类型：</label>
 			<div class="row-controls">
 				<form:select path="operationType" class="input-large ">
-					<form:option value="" label=""/>
-					<form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+					<form:option value="" label="" />
+					<form:options items="${fns:getDictList('')}" itemLabel="label"
+						itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="control-label">批文扫描图：</label>
 			<div class="controls">
-				<form:hidden id="approNoPic" path="approNoPic" htmlEscape="false" maxlength="255" class="input-large "/>
-				<sys:ckfinder input="approNoPic" uploadPath="/photo" type="images" selectMultiple="false" maxWidth="100" maxHeight="100"/>
+				<form:hidden id="approNoPic" path="approNoPic" htmlEscape="false"
+					maxlength="255" class="input-large " />
+				<sys:ckfinder input="approNoPic" uploadPath="/photo" type="images"
+					selectMultiple="false" maxWidth="100" maxHeight="100" />
 			</div>
 		</div>
 		<div class="control-group">
+			<h4>境外商号信息</h4>
+		</div>
+		<div class="control-group">
 			<label class="row-lable">境外商号海关关键字：</label>
 			<div class="row-controls">
-				<form:input path="abroadId" htmlEscape="false" maxlength="32" class="input-large required"/>
+				<form:input path="abroadId" htmlEscape="false" maxlength="32"
+					class="input-large required" />
 			</div>
 			<label class="row-lable">境外商号注册人：</label>
 			<div class="row-controls">
-				<form:input path="abroadRegister" htmlEscape="false" maxlength="255" class="input-large required"/>
+				<form:input path="abroadRegister" htmlEscape="false" maxlength="255"
+					class="input-large required" />
 			</div>
+
+		</div>
+		<div class="control-group">
 			<label class="row-lable">境外商号地址：</label>
 			<div class="row-controls">
-				<form:input path="abroadAddr" htmlEscape="false" maxlength="255" class="input-large "/>
+				<form:input path="abroadAddr" htmlEscape="false" maxlength="255"
+					class="input-large " />
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="row-lable">境外商号电话：</label>
 			<div class="row-controls">
-				<form:input path="abroadPhone" htmlEscape="false" maxlength="32" class="input-large required"/>
+				<form:input path="abroadPhone" htmlEscape="false" maxlength="32"
+					class="input-large required" />
 			</div>
 			<label class="row-lable">数据操作类型：</label>
 			<div class="row-controls">
 				<form:select path="operationTypeAbroad" class="input-large ">
-					<form:option value="" label=""/>
-					<form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+					<form:option value="" label="" />
+					<form:options items="${fns:getDictList('')}" itemLabel="label"
+						itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
 		<div class="control-group">
+			<h4>内承单位信息</h4>
+		</div>
+		<div class="control-group">
 			<label class="row-lable">内承单位海关关键字：</label>
 			<div class="row-controls">
-				<form:input path="assumeId" htmlEscape="false" maxlength="36" class="input-large required"/>
+				<form:input path="assumeId" htmlEscape="false" maxlength="36"
+					class="input-large required" />
 			</div>
 			<label class="row-lable">内承单位名称：</label>
 			<div class="row-controls">
-				<form:input path="assumeName" htmlEscape="false" maxlength="255" class="input-large required"/>
+				<form:input path="assumeName" htmlEscape="false" maxlength="255"
+					class="input-large required" />
+			</div>
+
 		</div>
+		<div class="control-group">
 			<label class="row-lable">内承单位法人代表：</label>
 			<div class="row-controls">
-				<form:input path="assumeRep" htmlEscape="false" maxlength="32" class="input-large required"/>
-			</div>
+				<form:input path="assumeRep" htmlEscape="false" maxlength="32"
+					class="input-large required" />
 			</div>
-		<div class="control-group">
 			<label class="row-lable">内承单位法人代表电话：</label>
 			<div class="row-controls">
-				<form:input path="assumeRepPhone" htmlEscape="false" maxlength="32" class="input-large required"/>
+				<form:input path="assumeRepPhone" htmlEscape="false" maxlength="32"
+					class="input-large required" />
+			</div>
 		</div>
+		<div class="control-group">
 			<label class="row-lable">内承单位联系地址：</label>
 			<div class="row-controls">
-				<form:input path="assumeAddr" htmlEscape="false" maxlength="255" class="input-large "/>
+				<form:input path="assumeAddr" htmlEscape="false" maxlength="255"
+					class="input-large " />
 			</div>
 			<label class="row-lable">内承单位联系电话：</label>
 			<div class="row-controls">
-				<form:input path="assumePhone" htmlEscape="false" maxlength="32" class="input-large "/>
+				<form:input path="assumePhone" htmlEscape="false" maxlength="32"
+					class="input-large " />
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="row-lable">数据操作类型：</label>
 			<div class="row-controls">
-				<form:input path="operationTypeAssume" htmlEscape="false" maxlength="2" class="input-large "/>
+				<form:input path="operationTypeAssume" htmlEscape="false"
+					maxlength="2" class="input-large " />
+			</div>
 		</div>
+		<div class="control-group">
+			<h4>所属分支机构信息</h4>
 		</div>
 		<div class="control-group">
-			<label class="row-lable">企业所属分支机构海关关键字：</label>
+			<label class="row-lable">所属分支机构海关关键字：</label>
 			<div class="row-controls">
-				<form:input path="partOrgId" htmlEscape="false" maxlength="36" class="input-large "/>
+				<form:input path="partOrgId" htmlEscape="false" maxlength="36"
+					class="input-large " />
 			</div>
 			<label class="row-lable">所属分支机构名称：</label>
 			<div class="row-controls">
-				<form:input path="belongOrgName" htmlEscape="false" maxlength="32" class="input-large required"/>
+				<form:input path="belongOrgName" htmlEscape="false" maxlength="32"
+					class="input-large required" />
 			</div>
+		</div>
+		<div class="control-group">
 			<label class="row-lable">所属分支机构地址：</label>
 			<div class="row-controls">
-				<form:input path="belongOrgAddress" htmlEscape="false" maxlength="255" class="input-large "/>
+				<form:input path="belongOrgAddress" htmlEscape="false"
+					maxlength="255" class="input-large " />
 			</div>
-		</div>
-		<div class="control-group">
 			<label class="row-lable">所属分支机构负责人：</label>
 			<div class="row-controls">
-				<form:input path="belongOrgPrincinal" htmlEscape="false" maxlength="32" class="input-large required"/>
+				<form:input path="belongOrgPrincinal" htmlEscape="false"
+					maxlength="32" class="input-large required" />
 			</div>
+		</div>
+		<div class="control-group">
 			<label class="row-lable">所属分支机构联系电话：</label>
 			<div class="row-controls">
-				<form:input path="belongOrgPhone" htmlEscape="false" maxlength="32" class="input-large required"/>
+				<form:input path="belongOrgPhone" htmlEscape="false" maxlength="32"
+					class="input-large required" />
 			</div>
 			<label class="row-lable">数据操作类型：</label>
 			<div class="row-controls">
 				<form:select path="operayionTypeBelong" class="input-large ">
-					<form:option value="" label=""/>
-					<form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+					<form:option value="" label="" />
+					<form:options items="${fns:getDictList('')}" itemLabel="label"
+						itemValue="value" htmlEscape="false" />
 				</form:select>
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="row-lable">备注：</label>
 			<div class="row-controls">
-				<form:textarea path="memo" rows="3" htmlEscape="false" maxlength="255" class="input-xxlarge "/>
+				<form:textarea path="memo" rows="3" htmlEscape="false"
+					maxlength="255" class="input-xxlarge " />
 			</div>
 		</div>
-		<span class="help-inline"><font color="red" >注：页面内容请全部填写</font></span>
+		<span class="help-inline"><font color="red">注：页面内容请全部填写</font></span>
 		<div class="form-actions">
-			<shiro:hasPermission name="land:landCorporationInfo:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
-			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+			<shiro:hasPermission name="land:landCorporationInfo:edit">
+				<input id="btnSubmit" class="btn btn-primary" type="submit"
+					value="保 存" />&nbsp;</shiro:hasPermission>
+			<input id="btnCancel" class="btn" type="button" value="返 回"
+				onclick="history.go(-1)" />
 		</div>
 	</form:form>
 </body>

@@ -68,7 +68,7 @@
 				<td>${landCorporationInfo.assureCoName }</td>
 				<td>${landCorporationInfo.assumeName }</td>
 				<td>${landCorporationInfo.belongOrgName }</td>
-				<td><a href="${ctx}/land/landCorporationInfo/form?id=${landCorporationInfo.id}">
+				<td>
 					<fmt:formatDate value="${landCorporationInfo.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 				</a></td>
 				<shiro:hasPermission name="land:landCorporationInfo:edit"><td>

@@ -51,6 +51,9 @@
 		<form:hidden path="id"/>
 		<sys:message content="${message}"/>		
 		<div class="control-group">
+			<h4>驾驶员信息</h4>
+		</div>	
+		<div class="control-group">
 			<label class="control-label">主管海关代码：</label>
 			<div class="controls">
 				<form:input path="mainPort" htmlEscape="false" maxlength="4" class="input-xlarge " id="mainPort"/>

@@ -51,6 +51,9 @@
 		<form:hidden path="id"/>
 		<sys:message content="${message}"/>	
 		<div class="control-group">
+			<h4>挂车信息</h4>
+		</div>	
+		<div class="control-group">
 			<label class="control-label">主管海关代码：</label>
 			<div class="controls">
 				<form:input path="mainPort" htmlEscape="false" maxlength="4" id="mainPort" class="input-xlarge "/>

-<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <html>
 <head>
-	<title>备案管理</title>
-	<meta name="decorator" content="default"/>
-	<script type="text/javascript">
-		$(document).ready(function() {
+<title>备案管理</title>
+<meta name="decorator" content="default" />
+<script type="text/javascript">
+	$(document).ready(
+			function() {
 				//$("#name").focus();
-			$("#inputForm").validate({
-				submitHandler: function(form){
+				$("#inputForm")
+						.validate(
+								{
+									submitHandler : function(form) {
 										loading('正在提交，请稍等...');
 										form.submit();
 									},
-				errorContainer: "#messageBox",
-				errorPlacement: function(error, element) {
+									errorContainer : "#messageBox",
+									errorPlacement : function(error, element) {
 										$("#messageBox").text("输入有误，请先更正。");
-					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-						error.appendTo(element.parent().parent());
+										if (element.is(":checkbox")
+												|| element.is(":radio")
+												|| element.parent().is(
+														".input-append")) {
+											error.appendTo(element.parent()
+													.parent());
 										} else {
 											error.insertAfter(element);
 										}
 									}
 								});
 			});
-		$(function(){
-			$('input').blur(function(){
-				this.value=this.value.toUpperCase();
+	$(function() {
+		$('input').blur(function() {
+			this.value = this.value.toUpperCase();
 		});
 	})
-	</script>
+</script>
 <script type="text/javascript">
-	$(function(){
-		$('input').blur(function(){
-			this.value=this.value.toUpperCase();
+	$(function() {
+		$('input').blur(function() {
+			this.value = this.value.toUpperCase();
 		});
 	})
 </script>
 <style type="text/css">
-	input{
-		text-transform:uppercase;
-	}
+input {
+	text-transform: uppercase;
+}
 </style>
-	<style type="text/css">
-		.row-lable{
-			margin-left:30px;
-			width:180px;
-			text-align:right;
-		}
-		.row-controls{
-			margin-left:20px;
+<style type="text/css">
+.row-lable {
+	width: 180px;
+	text-align: right;
+}
+
+.row-controls {
 	display: inline;
-			width:300px;
-		}
-	</style>
+	width: 260px;
+}
+</style>
 </head>
 <body>
 	<ul class="nav nav-tabs">
 		<li><a href="${ctx}/land/landRoadVeRecord/">备案列表</a></li>
-		<li class="active"><a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">备案<shiro:hasPermission name="land:landRoadVeRecord:edit">${not empty landRoadVeRecord.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="land:landRoadVeRecord:edit">查看</shiro:lacksPermission></a></li>
-	</ul><br/>
-	<form:form id="inputForm" modelAttribute="landRoadVeRecord" action="${ctx}/land/landRoadVeRecord/save" method="post" class="form-horizontal">
-		<form:hidden path="id"/>
-		<sys:message content="${message}"/>		
+		<li class="active"><a
+			href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">备案<shiro:hasPermission
+					name="land:landRoadVeRecord:edit">${not empty landRoadVeRecord.id?'修改':'添加'}</shiro:hasPermission>
+				<shiro:lacksPermission name="land:landRoadVeRecord:edit">查看</shiro:lacksPermission></a></li>
+	</ul>
+	<br />
+	<form:form id="inputForm" modelAttribute="landRoadVeRecord"
+		action="${ctx}/land/landRoadVeRecord/save" method="post"
+		class="form-horizontal">
+		<form:hidden path="id" />
+		<sys:message content="${message}" />
+		<div class="control-group">
+			<h4>车辆信息</h4>
+		</div>
 		<div class="control-group">
 			<label class="row-lable">主管海关代码：</label>
 			<div class="row-controls">
-					<form:input path="mainPort" htmlEscape="false" maxlength="4" class="input-large required" id="mainPort"/>
+				<form:input path="mainPort" htmlEscape="false" maxlength="4"
+					class="input-large required" id="mainPort" />
 				<span class="help-inline"><font color="red">*</font></span>
 			</div>
 			<label class="row-lable">企业代码：</label>
 			<div class="row-controls">
-					<form:input path="coCode" htmlEscape="false" maxlength="20" class="input-large required"/>
+				<form:input path="coCode" htmlEscape="false" maxlength="20"
+					class="input-large required" />
 				<span class="help-inline"><font color="red">*</font></span>
 			</div>
 		</div>
 		<div class="control-group">
-		
-			<label class="row-lable">车牌指标编码：</label>
-			<span class="row-controls">
-				<form:input path="veTargetNo" htmlEscape="false" maxlength="20" class="input-large required"/>
-				<span class="help-inline"><font color="red">*</font></span>
-			</span>
 			<label class="row-lable">国内车牌：</label> 
 			<span class="row-controls">
-				<form:input path="domesticLisenceNo" htmlEscape="false" maxlength="32" class="input-large required"/>
-				<span class="help-inline"><font color="red">*</font></span>
-			</span>
-			<label class="row-lable">国籍：</label>
-			<span class="row-controls">
-				<form:input path="nationality" htmlEscape="false" maxlength="4" class="input-large "/>
-			</span>
-		</div>
-		</div>
-		<div class="control-group">
-			<label class="row-lable">注册地址：</label>
-			<span class="row-controls">
-				<form:input path="veRegPlace" htmlEscape="false" maxlength="4" class="input-large required"/>
-				<span class="help-inline"><font color="red">*</font></span>
-			</span>
-			<label class="row-lable">车牌颜色：</label>
-			<span class="row-controls">
-				<form:input path="domesticLicenseColor" htmlEscape="false" maxlength="4" class="input-large "/>
-			</span>
-			<label class="row-lable">外籍车牌：</label>
-			<span class="row-controls">
-				<form:input path="foreignLicense" htmlEscape="false" maxlength="32" class="input-large "/>
-			</span>
-		</div>
-		<div class="control-group">
-			<label class="row-lable">使用性质：</label>
-			<span class="row-controls">
-				<form:input path="veProperty" htmlEscape="false" maxlength="4" class="input-large required"/>
-				<span class="help-inline"><font color="red">*</font></span>
-			</span>
-			<label class="row-lable">车辆分类：</label>
-			<span class="row-controls">
-				<form:select path="veClassFlag" class="input-large required">
-					<form:option value="" label=""/>
-					<form:option value="进出境公路运输工具" label="进出境公路运输工具"/>
-					<form:option value="来往港澳公路运输工具" label="来往港澳公路运输工具"/>
-					<form:option value="进出境公/私用公路交通工具" label="进出境公/私用公路交通工具"/>
-					<form:option value="来往港澳公/私用公路交通工具 " label="来往港澳公/私用公路交通工具"/>
-				</form:select>
-				<span class="help-inline"><font color="red">*</font></span>
+				<form:input path="domesticLisenceNo" htmlEscape="false"
+					maxlength="32" class="input-large required" /> <span
+				class="help-inline"><font color="red">*</font></span>
 			</span>
-			<label class="row-lable">车辆运输资格：</label>
+			<label class="row-lable">车主姓名：</label> 
 			<span class="row-controls"> 
-			<form:input path="veConveyQua" htmlEscape="false" maxlength="4" class="input-large required"/>
+				<form:input path="veOwnerName"
+					htmlEscape="false" maxlength="255" class="input-large required" />
 				<span class="help-inline"><font color="red">*</font></span>
 			</span>
 		</div>
 		<div class="control-group">
-			
-			<label class="row-lable">车辆行驶证编号：</label>
-			<span class="row-controls">
-				<form:input path="veCardNo" htmlEscape="false" maxlength="32" class="input-large required"/>
-				<span class="help-inline"><font color="red">*</font></span>
-			</span>
-			<label class="row-lable">车辆登记车主名称：</label>
-			<span class="row-controls">
-				<form:input path="veOwnerName" htmlEscape="false" maxlength="255" class="input-large required"/>
-				<span class="help-inline"><font color="red">*</font></span>
-			</span>
-			<label class="row-lable">车辆登记车主证件号码：</label>
-			<span class="row-controls">
-				<form:input path="veOwnerNo" htmlEscape="false" maxlength="32" class="input-large required"/>
+			<label class="row-lable">车主证件号码：</label> <span
+				class="row-controls"> <form:input path="veOwnerNo"
+					htmlEscape="false" maxlength="32" class="input-large required" />
 				<span class="help-inline"><font color="red">*</font></span>
+			</span> <label class="row-lable">车主联系电话：</label> <span
+				class="row-controls"> <form:input path="ownerInsideTel"
+					htmlEscape="false" maxlength="32"
+					class="input-large required phone" /> <span class="help-inline"><font
+					color="red">*</font></span>
 			</span>
 		</div>
 		<div class="control-group">
-			<label class="row-lable">车主境内联系电话：</label>
-			<span class="row-controls">
-				<form:input path="ownerInsideTel" htmlEscape="false" maxlength="32" class="input-large required phone"/>
+			<label class="row-lable">核定载货重量：</label> <span
+				class="row-controls"> 
+				<form:input path="veTon" htmlEscape="false" maxlength="10"
+					class="input-large required numberCheck" placeholder="货车核载单位为：kg" /> 
 				<span class="help-inline"><font color="red">*</font></span>
 			</span> 
-			<label class="row-lable">车主境内联系地址：</label>
+			<label class="row-lable">自重（空车重量）：</label> 
 			<span class="row-controls"> 
-				<form:input path="ownerInsideAddr" htmlEscape="false" maxlength="255" class="input-large "/>
-			</span>
-			<label class="row-lable">车辆类型(型样)：</label>
-			<span class="row-controls">
-				<form:input path="veType" htmlEscape="false" maxlength="5" class="input-large "/>
-			</span>
-		</div>
-		<div class="control-group">
-			<label class="row-lable">厂牌：</label>
-			<span class="row-controls">
-				<form:input path="brand" htmlEscape="false" maxlength="20" class="input-large "/>
-			</span>
-			<label class="row-lable">车型：</label>
-			<span class="row-controls">
-				<form:input path="model" htmlEscape="false" maxlength="9" class="input-large "/>
-			</span>
-			<label class="row-lable">排气量(L)：</label>
-			<span class="row-controls">
-				<form:input path="exhaustCapacity" htmlEscape="false" maxlength="20" class="input-large numberCheck"/>
-			</span>
-		</div>
-		<div class="control-group">
-			<label class="row-lable">车架号（车辆识别代号）：</label>
-			<span class="row-controls">
-				<form:input path="veFrameNo" htmlEscape="false" maxlength="30" class="input-large required"/>
+				<form:input path="selfWt" htmlEscape="false" maxlength="10" placeholder="单位：kg"
+					class="input-large required numberCheck" /> 
 					<span class="help-inline"><font color="red">*</font></span>
 			</span>
-			<label class="row-lable">车辆出厂日期：</label>
-			<span class="row-controls">
-				<input name="veFactoryDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
-					value="<fmt:formatDate value="${landRoadVeRecord.veFactoryDate}" pattern="yyyy-MM-dd"/>"
-					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-			</span>
-			<label class="row-lable">发动机号：</label>
-			<span class="row-controls">
-				<form:input path="veMotorNo" htmlEscape="false" maxlength="30" class="input-large "/>
-			</span>
 		</div>
 		<div class="control-group">
-			<label class="row-lable">核定载客/核定载质量：</label>
-			<span class="row-controls">
-				<form:input path="veTon" htmlEscape="false" maxlength="10" class="input-large required numberCheck" 
-				placeholder="客车核载单位为：人,货车核载单位为：kg。"/>
-				<span class="help-inline"><font color="red">*</font></span>
-			</span>
-			<label class="row-lable">自重（整备质量）：</label>
-			<span class="row-controls">
-				<form:input path="selfWt" htmlEscape="false" maxlength="10" class="input-large required numberCheck"/>
-				<span class="help-inline"><font color="red">*</font></span>
-			</span>
-			<label class="row-lable">准牵引总质量：</label>
-			<span class="row-controls">
-				<form:input path="allowTowTotalWt" htmlEscape="false" maxlength="10" class="input-large required numberCheck"/>
-				<span class="help-inline"><font color="red">*</font></span>
-			</span>
-		</div>
-		<div class="control-group">
-			<label class="row-lable">货箱内部长度（M）：</label>
-			<span class="row-controls">
-				<form:input path="containerInnerLength" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>
-			</span>
-			<label class="row-lable">货箱内部宽度（M）：</label>
-			<span class="row-controls">
-				<form:input path="containerInnerWidth" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>
-			</span>
-			<label class="row-lable">货箱内部高度（M）：</label>
-			<span class="row-controls">
-				<form:input path="containerInnerHeight" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>
-			</span>
-		</div>
-		<div class="control-group">
-		<label class="row-lable">外廓长度（M）：</label>
-			<span class="row-controls">
-				<form:input path="outerLength" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>
-			</span>
-			<label class="row-lable">外廓宽度（M）：</label>
-			<span class="row-controls">
-				<form:input path="outerWidth" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>
-			</span>
-			<label class="row-lable">外廓高度（M）：</label>
-			<span class="row-controls">
-				<form:input path="outerHeight" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>
-			</span>
-		</div>
-		<div class="control-group">
-			<label class="row-lable">车身颜色：</label>
-			<span class="row-controls">
-				<form:input path="veBodyColor" htmlEscape="false" maxlength="10" class="input-large "/>
-			</span>
-			<label class="row-lable">油箱容量（升）：</label>
-			<span class="row-controls">
-				<form:input path="oilBoxCapcity" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>
-			</span>
-			<label class="row-lable">最新更新申请业务类型：</label>
-			<span class="row-controls">
-				<form:select path="currApplyBussiness" class="input-large ">
-					<form:option value="" label=""/>
-					<form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-				</form:select>
-			</span>
-		</div>
-		<div class="control-group">
-			<label class="row-lable">批准车辆进出口岸：</label>
-			<span class="row-controls">
-				<form:input path="allowVeIePort" htmlEscape="false" maxlength="255" class="input-large required"/>
-				<span class="help-inline"><font color="red">*</font></span>
-			</span>
-			<label class="row-lable">批文/许可证编号：</label>
-			<span class="row-controls">
-				<form:input path="apprNo" htmlEscape="false" maxlength="5" class="input-large required"/>
-				<span class="help-inline"><font color="red">*</font></span>
-			</span>
-			<label class="row-lable">批文/许可证有效期：</label>
-			<span class="row-controls">
-				<input name="apprPeriod" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate required"
-					value="<fmt:formatDate value="${landRoadVeRecord.apprPeriod}" pattern="yyyy-MM-dd"/>"
-					onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-					<span class="help-inline"><font color="red">*</font></span>
-			</span>
-		</div>
-		<div class="control-group">
-			<label class="control-label">车前45度照片:</label>
-			<div class="controls">
-				<form:hidden id="front45cPic" path="front45cPic" htmlEscape="false" maxlength="255" class="input-large"/>
-				<sys:ckfinder input="front45cPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">车后45度照片：</label>
-			<div class="controls">
-				<form:hidden id="back45cPic" path="back45cPic" htmlEscape="false" maxlength="255" class="input-large "/>
-				<sys:ckfinder input="back45cPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-			</div>
-		</div> 
-		<div class="control-group">
-			<label class="control-label">油箱照片：</label>
-			<div class="controls">
-				<form:hidden id="oilBoxPic" path="oilBoxPic" htmlEscape="false" maxlength="255" class="input-large "/>
-				<sys:ckfinder input="oilBoxPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">车底照片：</label>
-			<div class="controls">
-				<form:hidden id="veBottomPic" path="veBottomPic" htmlEscape="false" maxlength="255" class="input-large "/>
-				<sys:ckfinder input="veBottomPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-			</div>
-		</div>
-	
-		<div class="control-group">
 			<label class="row-lable">申请人：</label> 
 			<span class="row-controls">
-				<form:input path="proposer" htmlEscape="false" maxlength="32" class="input-large required"/>
+				<form:input path="proposer" htmlEscape="false" maxlength="32"
+					class="input-large required" /> 
 					<span class="help-inline"><font color="red">*</font></span>
 			</span> 
 			<label class="row-lable">申请时间：</label> 
 			<span class="row-controls">
-				<input name="proposeTime" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
+				<input name="proposeTime" type="text" readonly="readonly"
+				maxlength="20" class="input-medium Wdate required"
 				value="<fmt:formatDate value="${landRoadVeRecord.proposeTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-					onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>
-			</span>
-			<label class="row-lable">数据操作类型：</label>
-			<span class="row-controls">
-				<form:select path="operationType" class="input-large ">
-					<form:option value="" label=""/>
-					<form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
-				</form:select>
+				onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
+				<span class="help-inline"><font color="red">*</font></span>
 			</span> 
 		</div>
 		<div class="control-group">
 			<label class="row-lable">挂车牌号：</label> 
 			<span class="row-controls">
-				<form:input path="trailerLicenseNo" htmlEscape="false" maxlength="32" class="input-large required"/>
-				<span class="help-inline"><font color="red">*</font></span>
+				<form:input path="trailerLicenseNo" htmlEscape="false"
+					maxlength="32" class="input-large" />
 			</span>
 			<label class="row-lable">挂车车架号：</label> 
 			<span class="row-controls">
-				<form:input path="trailerFrameNo" htmlEscape="false" maxlength="32" class="input-large required"/>
-				<span class="help-inline"><font color="red">*</font></span>
+				<form:input path="trailerFrameNo" htmlEscape="false" maxlength="32"
+					class="input-large" />
 			</span>
 
 		</div>
 		<div class="control-group">
-			<label class="control-label">批文扫描图：</label>
-			<div class="controls">
-				<form:hidden id="approNoPic" path="approNoPic" htmlEscape="false" maxlength="255" class="input-large "/>
-				<sys:ckfinder input="approNoPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">车架号扫描图：</label>
-			<div class="controls">
-				<form:hidden id="veFrameNoPic" path="veFrameNoPic" htmlEscape="false" maxlength="255" class="input-large "/>
-				<sys:ckfinder input="veFrameNoPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">发动机拓印件：</label>
-			<div class="controls">
-				<form:hidden id="motorNoPic" path="motorNoPic" htmlEscape="false" maxlength="255" class="input-large "/>
-				<sys:ckfinder input="motorNoPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="control-label">外籍车牌照片：</label>
-			<div class="controls">
-				<form:hidden id="foreignLicensePic" path="foreignLicensePic" htmlEscape="false" maxlength="255" class="input-large "/>
-				<sys:ckfinder input="foreignLicensePic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-			</div>
-		</div>
-		<div class="control-group">
-			<label class="row-lable">备注：</label>
-			<span class="row-controls">
-				<form:textarea path="memo" rows="3"  htmlEscape="false" maxlength="512" class="input-xxlarge required"/>
+			<label class="row-lable">备注：</label> <span class="row-controls">
+				<form:textarea path="memo" rows="3" htmlEscape="false"
+					maxlength="512" class="input-xxlarge" />
 			</span>
 		</div>
- 		<span class="help-inline"><font color="red" >注：页面内容请全部填写</font></span>
 		<div class="form-actions">
-			<shiro:hasPermission name="land:landRoadVeRecord:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>
-			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
+			<shiro:hasPermission name="land:landRoadVeRecord:edit">
+				<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存" />&nbsp;
+			</shiro:hasPermission>
+			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)" />
 		</div>
 	</form:form>
 </body>

@@ -62,6 +62,7 @@
 				<td>${landRoadVeRecord.selfWt }</td> 
 				<td>${landRoadVeRecord.allowTowTotalWt }</td> 
 				<td>${landRoadVeRecord.veClassFlag }</td> 
+				<td>${landRoadVeRecord.returnmessage }</td> 
 				<td><a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">
 					<fmt:formatDate value="${landRoadVeRecord.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
 				</a></td>

@@ -222,7 +222,7 @@
 				</div>
 			</div>
 		    <div id="footer" class="row-fluid">
-	            Copyright &copy; 2012-${fns:getConfig('copyrightYear')} ${fns:getConfig('productName')} - Powered By <a href="#" target="_blank">ShangYou</a> ${fns:getConfig('version')}
+	            Copyright &copy; 2012-${fns:getConfig('copyrightYear')} ${fns:getConfig('productName')} - Powered By <a href="#" target="_blank"></a> ${fns:getConfig('version')}
 			</div>
 		</div>
 	</div>

@@ -68,7 +68,7 @@
 		</div>
 	</form>
 	<div class="footer">
-		Copyright &copy; ${fns:getConfig('copyrightYear')} <a href="${pageContext.request.contextPath}${fns:getFrontPath()}">${fns:getConfig('productName')}</a> - Powered By <a href="#" target="_blank">ShangYou</a> ${fns:getConfig('version')} 
+		Copyright &copy; ${fns:getConfig('copyrightYear')} <a href="${pageContext.request.contextPath}${fns:getFrontPath()}">${fns:getConfig('productName')}</a> - Powered By <a href="#" target="_blank"></a> ${fns:getConfig('version')} 
 	</div>
 	<script src="${ctxStatic}/flash/zoom.min.js" type="text/javascript"></script>
 </body>

@@ -39,7 +39,7 @@
 				<%-- <form:input path="yardId" htmlEscape="false" maxlength="64" class="input-xlarge "/> --%>
 				<form:select path="yardId" class="input-medium required">
 					<form:option value="" label="" />
-					<form:options items="${yardList}"  itemLabel="name" itemValue="id" htmlEscape="false"/>
+					<form:options items="${yardList}"  itemLabel="name" itemValue="stationid" htmlEscape="false"/>
 				</form:select>
 				<span class="help-inline"><font color="red">*</font> </span>
 			</div>

@@ -41,6 +41,18 @@
 			</div>
 		</div>
 		<div class="control-group">
+			<label class="control-label">区域代码：</label>
+			<div class="controls">
+				<form:input path="areaCode" htmlEscape="false" maxlength="5" class="input-xlarge "/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">场站ID：</label>
+			<div class="controls">
+				<form:input path="stationid" htmlEscape="false" maxlength="10" class="input-xlarge "/>
+			</div>
+		</div>
+		<div class="control-group">
 			<label class="control-label">关区代码：</label>
 			<div class="controls">
 				<%-- <form:input path="customsCode" htmlEscape="false" maxlength="10" class="input-xlarge required"/>

@@ -40,6 +40,8 @@
 		<thead>
 			<tr>
 				<th>场站名称</th>
+				<th>区域代码</th>
+				<th>场站ID</th>
 				<th>关区代码</th>
 				<th>备注信息</th>
 				<shiro:hasPermission name="yard:yard:edit"><th>操作</th></shiro:hasPermission>
@@ -52,6 +54,12 @@
 					${yard.name}
 				</a></td>
 				<td>
+					${yard.areaCode}
+				</td>
+				<td>
+					${yard.stationid}
+				</td>
+				<td>
 					${yard.customsCode}
 				</td>
 				<td>

 $(function(){
 	$("input").blur(function(){
-		if(new RegExp("[`~!@#$^&*()=|{}';'\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；”“'。，、？%+_]").test(this.value)){
+		if(new RegExp("[`~!@#$^&*()=|{}';'.<>?~！@#￥……&*（）——|{}【】‘；”“'。，、？%+_]").test(this.value)){
 			this.value= this.value.replace(/[^\u4e00-\u9fa5\w]/g,'');
 		}
 	})