张天舒 / station · 提交

转到一个项目

作者 zhangFan
提交 f654bff38f141228b361ddebd602c2a9dc6c5427 1 个父辈 302d0568

卡口1.0 稳定版

内嵌 并排对比
正在显示 50 个修改的文件 包含 1540 行增加 和 841 行删除
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <freemarker.version>2.3.20</freemarker.version> 43 <freemarker.version>2.3.20</freemarker.version>
44 44
45 <!-- jdbc driver setting --> 45 <!-- jdbc driver setting -->
46 - <mysql.driver.version>5.1.30</mysql.driver.version> 46 + <mysql.driver.version>8.0.13</mysql.driver.version>
47 <oracle.driver.version>10.2.0.4.0</oracle.driver.version> 47 <oracle.driver.version>10.2.0.4.0</oracle.driver.version>
48 <mssql.driver.version>1.3.1</mssql.driver.version> 48 <mssql.driver.version>1.3.1</mssql.driver.version>
49 49
@@ -317,7 +317,6 @@ @@ -317,7 +317,6 @@
317 <version>${shiro.version}</version> 317 <version>${shiro.version}</version>
318 </dependency> 318 </dependency>
319 <!-- SECURITY end --> 319 <!-- SECURITY end -->
320 -  
321 <!-- Activiti --> 320 <!-- Activiti -->
322 <dependency> 321 <dependency>
323 <groupId>org.activiti</groupId> 322 <groupId>org.activiti</groupId>
@@ -453,12 +452,12 @@ @@ -453,12 +452,12 @@
453 <version>${jackson.version}</version> 452 <version>${jackson.version}</version>
454 </dependency> 453 </dependency>
455 454
456 - <!-- fastjson json 455 + <!-- fastjson json-->
457 <dependency> 456 <dependency>
458 <groupId>com.alibaba</groupId> 457 <groupId>com.alibaba</groupId>
459 <artifactId>fastjson</artifactId> 458 <artifactId>fastjson</artifactId>
460 <version>${fastjson.version}</version> 459 <version>${fastjson.version}</version>
461 - </dependency> --> 460 + </dependency>
462 461
463 <!-- xstream xml --> 462 <!-- xstream xml -->
464 <dependency> 463 <dependency>
@@ -5,6 +5,8 @@ package com.thinkgem.jeesite.common.persistence; @@ -5,6 +5,8 @@ package com.thinkgem.jeesite.common.persistence;
5 5
6 import java.util.List; 6 import java.util.List;
7 7
  8 +import org.apache.ibatis.annotations.Param;
  9 +
8 /** 10 /**
9 * DAO支持类实现 11 * DAO支持类实现
10 * @author ThinkGem 12 * @author ThinkGem
@@ -34,6 +36,9 @@ public interface CrudDao<T> extends BaseDao { @@ -34,6 +36,9 @@ public interface CrudDao<T> extends BaseDao {
34 */ 36 */
35 public List<T> findList(T entity); 37 public List<T> findList(T entity);
36 38
  39 +
  40 + public List<T> findList2(T entity,@Param("createBy")String createBy);
  41 +
37 /** 42 /**
38 * 查询所有数据列表 43 * 查询所有数据列表
39 * @param entity 44 * @param entity
@@ -49,6 +49,8 @@ public class Page<T> { @@ -49,6 +49,8 @@ public class Page<T> {
49 private String funcParam = ""; // 函数的附加参数，第三个参数值。 49 private String funcParam = ""; // 函数的附加参数，第三个参数值。
50 50
51 private String message = ""; // 设置提示消息，显示在“共n条”之后 51 private String message = ""; // 设置提示消息，显示在“共n条”之后
  52 +
  53 + private String resultMsg = "";
52 54
53 public Page() { 55 public Page() {
54 this.pageSize = -1; 56 this.pageSize = -1;
@@ -275,6 +277,7 @@ public class Page<T> { @@ -275,6 +277,7 @@ public class Page<T> {
275 sb.insert(0,"<ul>\n").append("</ul>\n"); 277 sb.insert(0,"<ul>\n").append("</ul>\n");
276 278
277 sb.append("<div style=\"clear:both;\"></div>"); 279 sb.append("<div style=\"clear:both;\"></div>");
  280 + sb.append((resultMsg!=null?resultMsg:""));
278 281
279 // sb.insert(0,"<div class=\"page\">\n").append("</div>\n"); 282 // sb.insert(0,"<div class=\"page\">\n").append("</div>\n");
280 283
@@ -539,6 +542,10 @@ public class Page<T> { @@ -539,6 +542,10 @@ public class Page<T> {
539 return getPageSize(); 542 return getPageSize();
540 } 543 }
541 544
  545 + public void setResultMsg(String resultMsg) {
  546 + this.resultMsg = resultMsg;
  547 + }
  548 +
542 // /** 549 // /**
543 // * 获取 Spring data JPA 分页对象 550 // * 获取 Spring data JPA 分页对象
544 // */ 551 // */
@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.common.service; @@ -5,6 +5,7 @@ package com.thinkgem.jeesite.common.service;
5 5
6 import java.util.List; 6 import java.util.List;
7 7
  8 +import org.apache.ibatis.annotations.Param;
8 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
9 import org.springframework.transaction.annotation.Transactional; 10 import org.springframework.transaction.annotation.Transactional;
10 11
@@ -52,7 +53,6 @@ public abstract class CrudService<D extends CrudDao<T>, T extends DataEntity<T>> @@ -52,7 +53,6 @@ public abstract class CrudService<D extends CrudDao<T>, T extends DataEntity<T>>
52 public List<T> findList(T entity) { 53 public List<T> findList(T entity) {
53 return dao.findList(entity); 54 return dao.findList(entity);
54 } 55 }
55 -  
56 /** 56 /**
57 * 查询分页数据 57 * 查询分页数据
58 * @param page 分页对象 58 * @param page 分页对象
@@ -64,7 +64,6 @@ public abstract class CrudService<D extends CrudDao<T>, T extends DataEntity<T>> @@ -64,7 +64,6 @@ public abstract class CrudService<D extends CrudDao<T>, T extends DataEntity<T>>
64 page.setList(dao.findList(entity)); 64 page.setList(dao.findList(entity));
65 return page; 65 return page;
66 } 66 }
67 -  
68 /** 67 /**
69 * 保存数据（插入或更新） 68 * 保存数据（插入或更新）
70 * @param entity 69 * @param entity
@@ -3,6 +3,10 @@ @@ -3,6 +3,10 @@
3 */ 3 */
4 package com.thinkgem.jeesite.modules.land.dao; 4 package com.thinkgem.jeesite.modules.land.dao;
5 5
  6 +import java.util.List;
  7 +
  8 +import org.apache.ibatis.annotations.Param;
  9 +
6 import com.thinkgem.jeesite.common.persistence.CrudDao; 10 import com.thinkgem.jeesite.common.persistence.CrudDao;
7 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao; 11 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
8 import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList; 12 import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList;
@@ -15,4 +19,11 @@ import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList; @@ -15,4 +19,11 @@ import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList;
15 @MyBatisDao 19 @MyBatisDao
16 public interface LandBusinesstypeListDao extends CrudDao<LandBusinesstypeList> { 20 public interface LandBusinesstypeListDao extends CrudDao<LandBusinesstypeList> {
17 21
  22 + List<LandBusinesstypeList> findByStatus(@Param("trailerFrameNo")String frameNo);
  23 +
  24 + List<LandBusinesstypeList> findByBarcode(@Param("barcode")String barcode);
  25 +
  26 + int deleteByBarcode(@Param("barcode")String barcode);
  27 +
  28 + int updateByBarcode(LandBusinesstypeList landBusinesstypeList);
18 } 29 }
@@ -3,6 +3,10 @@ @@ -3,6 +3,10 @@
3 */ 3 */
4 package com.thinkgem.jeesite.modules.land.dao; 4 package com.thinkgem.jeesite.modules.land.dao;
5 5
  6 +import java.util.List;
  7 +
  8 +import org.apache.ibatis.annotations.Param;
  9 +
6 import com.thinkgem.jeesite.common.persistence.CrudDao; 10 import com.thinkgem.jeesite.common.persistence.CrudDao;
7 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao; 11 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
8 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord; 12 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
@@ -15,4 +19,6 @@ import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord; @@ -15,4 +19,6 @@ import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
15 @MyBatisDao 19 @MyBatisDao
16 public interface LandRoadVeRecordDao extends CrudDao<LandRoadVeRecord> { 20 public interface LandRoadVeRecordDao extends CrudDao<LandRoadVeRecord> {
17 21
  22 + List<LandRoadVeRecord> selectByFrameNo(@Param("domesticLisenceNo") String domesticLisenceNo);
  23 +
18 } 24 }
1 /** 1 /**
2 - * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved. 2 + *
3 */ 3 */
4 package com.thinkgem.jeesite.modules.land.entity; 4 package com.thinkgem.jeesite.modules.land.entity;
5 5
@@ -12,7 +12,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity; @@ -12,7 +12,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity;
12 /** 12 /**
13 * 货物流转类型Entity 13 * 货物流转类型Entity
14 * @author zhangfan 14 * @author zhangfan
15 - * @version 2018-10-08 15 + * @version 2019-02-12
16 */ 16 */
17 public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { 17 public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
18 18
@@ -21,21 +21,23 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -21,21 +21,23 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
21 private String trailerFrameNo; // 车牌号 21 private String trailerFrameNo; // 车牌号
22 private String trailerLicenseNo; // 车架号 22 private String trailerLicenseNo; // 车架号
23 private String masterList; // 主单列表 23 private String masterList; // 主单列表
24 - private Date prodectTime; // prodect_time  
25 - private String returnmessage; // 回执内容 24 + private Date prodectTime; // 申请时间
26 private String agentno; // 货代代码 25 private String agentno; // 货代代码
  26 + private String isDelete; // 删除标识0：未删除，1删除
27 private String agentname; // 货代名称 27 private String agentname; // 货代名称
28 private String cocode; // 所在企业代码 28 private String cocode; // 所在企业代码
29 private String drivername; // 驾驶员姓名 29 private String drivername; // 驾驶员姓名
30 private String driverid; // 驾驶员ID 30 private String driverid; // 驾驶员ID
31 private String startport; // 起始海关代码 31 private String startport; // 起始海关代码
32 private String endport; // 目的关区代码 32 private String endport; // 目的关区代码
33 - private String startsatation; // 场站 33 + private String startsatation; // 起始场站
34 private String endstation; // 目的场站 34 private String endstation; // 目的场站
35 - private String aisle; // 通道，卡口  
36 - private String businesstype; // 业务类型(1.出口送货，2：进口提货，3：分拨分流，4：货运调拨) 35 + private String aisle; // 通道/卡口
  36 + private String businesstype; // 业务类型
37 private String turnoverflag; // 进出场标识 37 private String turnoverflag; // 进出场标识
38 private String contrastflag; // 校验标识 38 private String contrastflag; // 校验标识
  39 + private String barcode; // 二维码
  40 + private String isvalid; // 是否失效：0：有效，1：无效
39 41
40 public LandBusinesstypeList() { 42 public LandBusinesstypeList() {
41 super(); 43 super();
@@ -90,15 +92,6 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -90,15 +92,6 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
90 this.prodectTime = prodectTime; 92 this.prodectTime = prodectTime;
91 } 93 }
92 94
93 - @Length(min=0, max=255, message="回执内容长度必须介于 0 和 255 之间")  
94 - public String getReturnmessage() {  
95 - return returnmessage;  
96 - }  
97 -  
98 - public void setReturnmessage(String returnmessage) {  
99 - this.returnmessage = returnmessage;  
100 - }  
101 -  
102 @Length(min=0, max=32, message="货代代码长度必须介于 0 和 32 之间") 95 @Length(min=0, max=32, message="货代代码长度必须介于 0 和 32 之间")
103 public String getAgentno() { 96 public String getAgentno() {
104 return agentno; 97 return agentno;
@@ -108,6 +101,15 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -108,6 +101,15 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
108 this.agentno = agentno; 101 this.agentno = agentno;
109 } 102 }
110 103
  104 + @Length(min=0, max=2, message="删除标识0：未删除，1删除长度必须介于 0 和 2 之间")
  105 + public String getIsDelete() {
  106 + return isDelete;
  107 + }
  108 +
  109 + public void setIsDelete(String isDelete) {
  110 + this.isDelete = isDelete;
  111 + }
  112 +
111 @Length(min=0, max=255, message="货代名称长度必须介于 0 和 255 之间") 113 @Length(min=0, max=255, message="货代名称长度必须介于 0 和 255 之间")
112 public String getAgentname() { 114 public String getAgentname() {
113 return agentname; 115 return agentname;
@@ -162,7 +164,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -162,7 +164,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
162 this.endport = endport; 164 this.endport = endport;
163 } 165 }
164 166
165 - @Length(min=0, max=64, message="场站长度必须介于 0 和 64 之间") 167 + @Length(min=0, max=64, message="起始场站长度必须介于 0 和 64 之间")
166 public String getStartsatation() { 168 public String getStartsatation() {
167 return startsatation; 169 return startsatation;
168 } 170 }
@@ -180,7 +182,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -180,7 +182,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
180 this.endstation = endstation; 182 this.endstation = endstation;
181 } 183 }
182 184
183 - @Length(min=0, max=32, message="通道，卡口长度必须介于 0 和 32 之间") 185 + @Length(min=0, max=32, message="通道/卡口长度必须介于 0 和 32 之间")
184 public String getAisle() { 186 public String getAisle() {
185 return aisle; 187 return aisle;
186 } 188 }
@@ -189,6 +191,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -189,6 +191,7 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
189 this.aisle = aisle; 191 this.aisle = aisle;
190 } 192 }
191 193
  194 + @Length(min=0, max=10, message="业务类型长度必须介于 0 和 10 之间")
192 public String getBusinesstype() { 195 public String getBusinesstype() {
193 return businesstype; 196 return businesstype;
194 } 197 }
@@ -215,4 +218,21 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> { @@ -215,4 +218,21 @@ public class LandBusinesstypeList extends DataEntity<LandBusinesstypeList> {
215 this.contrastflag = contrastflag; 218 this.contrastflag = contrastflag;
216 } 219 }
217 220
  221 + @Length(min=0, max=32, message="二维码长度必须介于 0 和 32 之间")
  222 + public String getBarcode() {
  223 + return barcode;
  224 + }
  225 +
  226 + public void setBarcode(String barcode) {
  227 + this.barcode = barcode;
  228 + }
  229 +
  230 + @Length(min=0, max=2, message="是否失效：0：有效，1：无效长度必须介于 0 和 2 之间")
  231 + public String getIsvalid() {
  232 + return isvalid;
  233 + }
  234 +
  235 + public void setIsvalid(String isvalid) {
  236 + this.isvalid = isvalid;
  237 + }
218 } 238 }
1 /** 1 /**
2 - * Copyright &copy; 2012-2016 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved. 2 + *
3 */ 3 */
4 package com.thinkgem.jeesite.modules.land.entity; 4 package com.thinkgem.jeesite.modules.land.entity;
5 5
@@ -12,7 +12,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity; @@ -12,7 +12,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity;
12 /** 12 /**
13 * 汽车备案Entity 13 * 汽车备案Entity
14 * @author zhangfan 14 * @author zhangfan
15 - * @version 2018-10-08 15 + * @version 2019-02-12
16 */ 16 */
17 public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> { 17 public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
18 18
@@ -24,7 +24,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> { @@ -24,7 +24,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
24 private String domesticLisenceNo; // 国内车牌 24 private String domesticLisenceNo; // 国内车牌
25 private String domesticLicenseColor; // 车牌颜色 25 private String domesticLicenseColor; // 车牌颜色
26 private String foreignLicense; // 外籍车牌 26 private String foreignLicense; // 外籍车牌
27 - private String veRegPlace; // ve_reg_place 27 + private String veRegPlace; // 注册地址
28 private String veProperty; // 使用性质 28 private String veProperty; // 使用性质
29 private String veConveyQua; // 车辆运输资格 29 private String veConveyQua; // 车辆运输资格
30 private String veCardNo; // 车辆行驶证编号 30 private String veCardNo; // 车辆行驶证编号
@@ -34,9 +34,9 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> { @@ -34,9 +34,9 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
34 private String ownerInsideTel; // 车主境内联系电话 34 private String ownerInsideTel; // 车主境内联系电话
35 private String veType; // 车辆类型(型样) 35 private String veType; // 车辆类型(型样)
36 private String brand; // 厂牌 36 private String brand; // 厂牌
37 - private String model; // model 37 + private String model; // 车型
38 private String exhaustCapacity; // 排气量 38 private String exhaustCapacity; // 排气量
39 - private Date veFactoryDate; // 车辆出厂日期（yyyyMMdd-0） 39 + private Date veFactoryDate; // 车辆出厂日期
40 private String veMotorNo; // 发动机号 40 private String veMotorNo; // 发动机号
41 private String veFrameNo; // 车架号（车辆识别代号） 41 private String veFrameNo; // 车架号（车辆识别代号）
42 private String veTon; // 核定载客/核定载质量：客车的核定载客单位仍为：人；货车的核定载客单位改为：千克。 42 private String veTon; // 核定载客/核定载质量：客车的核定载客单位仍为：人；货车的核定载客单位改为：千克。
@@ -52,7 +52,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> { @@ -52,7 +52,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
52 private String oilBoxCapcity; // 油箱容量（升） 52 private String oilBoxCapcity; // 油箱容量（升）
53 private String allowVeIePort; // 批准车辆进出口岸 53 private String allowVeIePort; // 批准车辆进出口岸
54 private String apprNo; // 批文/许可证编号 54 private String apprNo; // 批文/许可证编号
55 - private Date apprPeriod; // 批文/许可证有效期（yyyyMMdd-0） 55 + private Date apprPeriod; // 批文/许可证有效期
56 private String currApplyBussiness; // 最新更新申请业务类型 56 private String currApplyBussiness; // 最新更新申请业务类型
57 private String front45cPic; // 车前45度照片 57 private String front45cPic; // 车前45度照片
58 private String back45cPic; // 车后45度照片 58 private String back45cPic; // 车后45度照片
@@ -60,8 +60,8 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> { @@ -60,8 +60,8 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
60 private String veBottomPic; // 车底照片 60 private String veBottomPic; // 车底照片
61 private String memo; // 备注 61 private String memo; // 备注
62 private String proposer; // 申请人 62 private String proposer; // 申请人
63 - private Date proposeTime; // 申请时间 yyyyMMddHHmmss  
64 - private String veClassFlag; // 车辆分类。1是进出境公路运输工具；2是来往港澳公路运输工具；3是进出境公/私用公路交通工具；4是来往港澳公/私用公路交通工具 63 + private Date proposeTime; // 申请时间
  64 + private String veClassFlag; // 车辆分类
65 private String operationType; // 数据操作类型 65 private String operationType; // 数据操作类型
66 private String trailerLicenseNo; // 挂车牌号 66 private String trailerLicenseNo; // 挂车牌号
67 private String trailerFrameNo; // 挂车车架号 67 private String trailerFrameNo; // 挂车车架号
@@ -71,6 +71,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> { @@ -71,6 +71,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
71 private String foreignLicensePic; // 外籍车牌照片 71 private String foreignLicensePic; // 外籍车牌照片
72 private String nationality; // 国籍 72 private String nationality; // 国籍
73 private String returnmessage; // 回执内容 73 private String returnmessage; // 回执内容
  74 + private String barcode; // 二维码
74 75
75 public LandRoadVeRecord() { 76 public LandRoadVeRecord() {
76 super(); 77 super();
@@ -143,7 +144,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> { @@ -143,7 +144,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
143 this.foreignLicense = foreignLicense; 144 this.foreignLicense = foreignLicense;
144 } 145 }
145 146
146 - @Length(min=0, max=4, message="ve_reg_place长度必须介于 0 和 4 之间") 147 + @Length(min=0, max=4, message="注册地址长度必须介于 0 和 4 之间")
147 public String getVeRegPlace() { 148 public String getVeRegPlace() {
148 return veRegPlace; 149 return veRegPlace;
149 } 150 }
@@ -233,7 +234,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> { @@ -233,7 +234,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
233 this.brand = brand; 234 this.brand = brand;
234 } 235 }
235 236
236 - @Length(min=0, max=9, message="model长度必须介于 0 和 9 之间") 237 + @Length(min=0, max=9, message="车型长度必须介于 0 和 9 之间")
237 public String getModel() { 238 public String getModel() {
238 return model; 239 return model;
239 } 240 }
@@ -476,7 +477,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> { @@ -476,7 +477,7 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
476 this.proposeTime = proposeTime; 477 this.proposeTime = proposeTime;
477 } 478 }
478 479
479 - @Length(min=0, max=2, message="车辆分类。1是进出境公路运输工具；2是来往港澳公路运输工具；3是进出境公/私用公路交通工具；4是来往港澳公/私用公路交通工具长度必须介于 0 和 2 之间") 480 + @Length(min=0, max=64, message="车辆分类长度必须介于 0 和 64 之间")
480 public String getVeClassFlag() { 481 public String getVeClassFlag() {
481 return veClassFlag; 482 return veClassFlag;
482 } 483 }
@@ -566,4 +567,13 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> { @@ -566,4 +567,13 @@ public class LandRoadVeRecord extends DataEntity<LandRoadVeRecord> {
566 this.returnmessage = returnmessage; 567 this.returnmessage = returnmessage;
567 } 568 }
568 569
  570 + @Length(min=0, max=32, message="二维码长度必须介于 0 和 32 之间")
  571 + public String getBarcode() {
  572 + return barcode;
  573 + }
  574 +
  575 + public void setBarcode(String barcode) {
  576 + this.barcode = barcode;
  577 + }
  578 +
569 } 579 }
@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.land.service; @@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.land.service;
5 5
6 import java.util.List; 6 import java.util.List;
7 7
  8 +import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
9 import org.springframework.transaction.annotation.Transactional; 10 import org.springframework.transaction.annotation.Transactional;
10 11
@@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.land.dao.LandBusinesstypeListDao; @@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.land.dao.LandBusinesstypeListDao;
22 @Transactional(readOnly = true) 23 @Transactional(readOnly = true)
23 public class LandBusinesstypeListService extends CrudService<LandBusinesstypeListDao, LandBusinesstypeList> { 24 public class LandBusinesstypeListService extends CrudService<LandBusinesstypeListDao, LandBusinesstypeList> {
24 25
  26 + @Autowired
  27 + private LandBusinesstypeListDao dao;
  28 +
25 public LandBusinesstypeList get(String id) { 29 public LandBusinesstypeList get(String id) {
26 return super.get(id); 30 return super.get(id);
27 } 31 }
@@ -44,4 +48,23 @@ public class LandBusinesstypeListService extends CrudService<LandBusinesstypeLis @@ -44,4 +48,23 @@ public class LandBusinesstypeListService extends CrudService<LandBusinesstypeLis
44 super.delete(landBusinesstypeList); 48 super.delete(landBusinesstypeList);
45 } 49 }
46 50
  51 + @Transactional(readOnly = false)
  52 + public List<LandBusinesstypeList> findByStatus(String frameNo) {
  53 + return dao.findByStatus(frameNo);
  54 + }
  55 +
  56 + @Transactional(readOnly = false)
  57 + public List<LandBusinesstypeList> findByBarcode(String barcode) {
  58 + return dao.findByBarcode(barcode);
  59 + }
  60 +
  61 + @Transactional(readOnly = false)
  62 + public int deleteByBarcode(String barcode) {
  63 + return dao.deleteByBarcode(barcode);
  64 + }
  65 +
  66 + @Transactional(readOnly = false)
  67 + public int updateByBarcode(LandBusinesstypeList landBusinesstypeList) {
  68 + return dao.updateByBarcode(landBusinesstypeList);
  69 + }
47 } 70 }
@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.land.service; @@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.land.service;
5 5
6 import java.util.List; 6 import java.util.List;
7 7
  8 +import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
9 import org.springframework.transaction.annotation.Transactional; 10 import org.springframework.transaction.annotation.Transactional;
10 11
@@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.land.dao.LandRoadVeRecordDao; @@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.land.dao.LandRoadVeRecordDao;
22 @Transactional(readOnly = true) 23 @Transactional(readOnly = true)
23 public class LandRoadVeRecordService extends CrudService<LandRoadVeRecordDao, LandRoadVeRecord> { 24 public class LandRoadVeRecordService extends CrudService<LandRoadVeRecordDao, LandRoadVeRecord> {
24 25
  26 + @Autowired
  27 + LandRoadVeRecordDao dao;
  28 +
25 public LandRoadVeRecord get(String id) { 29 public LandRoadVeRecord get(String id) {
26 return super.get(id); 30 return super.get(id);
27 } 31 }
@@ -44,4 +48,10 @@ public class LandRoadVeRecordService extends CrudService<LandRoadVeRecordDao, La @@ -44,4 +48,10 @@ public class LandRoadVeRecordService extends CrudService<LandRoadVeRecordDao, La
44 super.delete(landRoadVeRecord); 48 super.delete(landRoadVeRecord);
45 } 49 }
46 50
  51 + @Transactional(readOnly = false)
  52 + public List<LandRoadVeRecord> selectByFrameNo(String domesticLisenceNo) {
  53 + return dao.selectByFrameNo(domesticLisenceNo);
  54 + }
  55 +
  56 +
47 } 57 }
@@ -3,38 +3,39 @@ @@ -3,38 +3,39 @@
3 */ 3 */
4 package com.thinkgem.jeesite.modules.land.web; 4 package com.thinkgem.jeesite.modules.land.web;
5 5
  6 +import java.text.SimpleDateFormat;
  7 +import java.util.Date;
6 import java.util.List; 8 import java.util.List;
7 9
  10 +import javax.annotation.PostConstruct;
8 import javax.servlet.http.HttpServletRequest; 11 import javax.servlet.http.HttpServletRequest;
9 import javax.servlet.http.HttpServletResponse; 12 import javax.servlet.http.HttpServletResponse;
10 -import javax.sound.midi.MidiDevice.Info;  
11 13
12 import org.apache.shiro.authz.annotation.RequiresPermissions; 14 import org.apache.shiro.authz.annotation.RequiresPermissions;
13 -import org.h2.util.New;  
14 import org.springframework.beans.factory.annotation.Autowired; 15 import org.springframework.beans.factory.annotation.Autowired;
15 import org.springframework.stereotype.Controller; 16 import org.springframework.stereotype.Controller;
16 import org.springframework.ui.Model; 17 import org.springframework.ui.Model;
17 import org.springframework.web.bind.annotation.ModelAttribute; 18 import org.springframework.web.bind.annotation.ModelAttribute;
18 import org.springframework.web.bind.annotation.RequestMapping; 19 import org.springframework.web.bind.annotation.RequestMapping;
19 import org.springframework.web.bind.annotation.RequestParam; 20 import org.springframework.web.bind.annotation.RequestParam;
  21 +import org.springframework.web.bind.annotation.ResponseBody;
20 import org.springframework.web.servlet.mvc.support.RedirectAttributes; 22 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
21 23
  24 +import com.thinkgem.jeesite.common.barCode.buildBarCode;
22 import com.thinkgem.jeesite.common.config.Global; 25 import com.thinkgem.jeesite.common.config.Global;
23 import com.thinkgem.jeesite.common.persistence.Page; 26 import com.thinkgem.jeesite.common.persistence.Page;
24 import com.thinkgem.jeesite.common.web.BaseController; 27 import com.thinkgem.jeesite.common.web.BaseController;
25 import com.thinkgem.jeesite.common.utils.StringUtils; 28 import com.thinkgem.jeesite.common.utils.StringUtils;
26 -import com.thinkgem.jeesite.modules.bw.entity.dct.DCTXStram2;  
27 -import com.thinkgem.jeesite.modules.bw.entity.dct.DCTXStram3;  
28 -import com.thinkgem.jeesite.modules.bw.entity.dct.DTC_Message;  
29 -import com.thinkgem.jeesite.modules.bw.entity.dct.PortManifestBody;  
30 -import com.thinkgem.jeesite.modules.bw.service.dct.DtcmessageheadService;  
31 -import com.thinkgem.jeesite.modules.bw.service.dct.GatherinfoService;  
32 -import com.thinkgem.jeesite.modules.bw.service.dct.PortManifestBodyService;  
33 -import com.thinkgem.jeesite.modules.bw.service.dct.PortManifestHeadService;  
34 -import com.thinkgem.jeesite.modules.bw.service.dct.PortManifestHeadStatService;  
35 -import com.thinkgem.jeesite.modules.bw.service.dct.VExpressBillnoService;  
36 import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList; 29 import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList;
  30 +import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
  31 +import com.thinkgem.jeesite.modules.land.entity.VehicleMainifist;
37 import com.thinkgem.jeesite.modules.land.service.LandBusinesstypeListService; 32 import com.thinkgem.jeesite.modules.land.service.LandBusinesstypeListService;
  33 +import com.thinkgem.jeesite.modules.land.service.LandRoadVeRecordService;
  34 +import com.thinkgem.jeesite.modules.land.service.VehicleMainifistService;
  35 +import com.thinkgem.jeesite.modules.sys.entity.User;
  36 +import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
  37 +import com.thinkgem.jeesite.modules.sys.service.SystemService;
  38 +import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
38 import com.thinkgem.jeesite.modules.yard.entity.Bayonet; 39 import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
39 import com.thinkgem.jeesite.modules.yard.entity.Yard; 40 import com.thinkgem.jeesite.modules.yard.entity.Yard;
40 import com.thinkgem.jeesite.modules.yard.service.BayonetService; 41 import com.thinkgem.jeesite.modules.yard.service.BayonetService;
@@ -59,22 +60,18 @@ public class LandBusinesstypeListController extends BaseController { @@ -59,22 +60,18 @@ public class LandBusinesstypeListController extends BaseController {
59 private BayonetService bayService; 60 private BayonetService bayService;
60 61
61 @Autowired 62 @Autowired
62 - private VExpressBillnoService veService; 63 + private VehicleMainifistService veMainService;
63 64
64 @Autowired 65 @Autowired
65 - private GatherinfoService InfoServeice; 66 + private LandRoadVeRecordService roadVeService;
66 67
67 @Autowired 68 @Autowired
68 - private DtcmessageheadService dtcMessageheadService; 69 + private SystemService systemService;
69 70
70 - @Autowired  
71 - private PortManifestBodyService bodyService;  
72 -  
73 - @Autowired  
74 - private PortManifestHeadService headService;  
75 -  
76 - @Autowired  
77 - private PortManifestHeadStatService statService; 71 + private static final String TYPE1 = "进口流转";
  72 + private static final String TYPE2 = "进口提货";
  73 + private static final String TYPE3 = "出口送货";
  74 + private static final String TYPE4 = "出口流转";
78 75
79 76
80 @ModelAttribute 77 @ModelAttribute
@@ -92,21 +89,76 @@ public class LandBusinesstypeListController extends BaseController { @@ -92,21 +89,76 @@ public class LandBusinesstypeListController extends BaseController {
92 @RequiresPermissions("land:landBusinesstypeList:view") 89 @RequiresPermissions("land:landBusinesstypeList:view")
93 @RequestMapping(value = {"list", ""}) 90 @RequestMapping(value = {"list", ""})
94 public String list(LandBusinesstypeList landBusinesstypeList, HttpServletRequest request, HttpServletResponse response, Model model) { 91 public String list(LandBusinesstypeList landBusinesstypeList, HttpServletRequest request, HttpServletResponse response, Model model) {
  92 + Principal principal = UserUtils.getPrincipal();
  93 + String loginName = principal.getLoginName();
  94 + User user = systemService.getUserByLoginName(loginName);
  95 + landBusinesstypeList.setCreateBy(user);
95 Page<LandBusinesstypeList> page = landBusinesstypeListService.findPage(new Page<LandBusinesstypeList>(request, response), landBusinesstypeList); 96 Page<LandBusinesstypeList> page = landBusinesstypeListService.findPage(new Page<LandBusinesstypeList>(request, response), landBusinesstypeList);
96 model.addAttribute("page", page); 97 model.addAttribute("page", page);
97 return "modules/land/landBusinesstypeListList"; 98 return "modules/land/landBusinesstypeListList";
98 99
99 } 100 }
  101 +
  102 + @RequiresPermissions("land:landBusinesstypeList:view")
  103 + @RequestMapping(value = "check")
  104 + @ResponseBody
  105 + public Page<LandRoadVeRecord> list(String frameNo) throws Exception {
  106 + Page<LandRoadVeRecord> page = new Page<LandRoadVeRecord>();
  107 + //List<LandBusinesstypeList> list = landBusinesstypeListService.findByStatus(frameNo);
  108 + List<LandRoadVeRecord> list = roadVeService.selectByFrameNo(frameNo);
  109 +// if(list.size()>0 ) {
  110 +// for (int i = 0; i < list.size(); i++) {
  111 +// System.out.println(list.get(i));
  112 +// boolean flag = (list.get(i).getContrastflag()==null ||list.get(i).getContrastflag()=="" ||list.get(i).getContrastflag().length()<=0);
  113 +// if("进场站".equals(list.get(i).getTurnoverflag()) && flag) {
  114 +// page.setResultMsg("此车辆存在进场业务，请勿重新申报");
  115 +// }else if("已进站".equals(list.get(i).getContrastflag())) {
  116 +// page.setResultMsg("此车辆有出站业务未完成");
  117 +// }else if("出场站".equals(list.get(i).getTurnoverflag())&& flag ) {
  118 +// page.setResultMsg("此车辆存在出场业务，请勿重新申报");
  119 +// }
  120 +// }
  121 +// }else {
  122 +// page.setResultMsg("此车辆可以正常申报业务");
  123 +// }
  124 + page.setList(list);
  125 + return page;
  126 +
  127 + }
  128 + @RequiresPermissions("land:landBusinesstypeList:view")
  129 + @RequestMapping(value = "option")
  130 + @ResponseBody
  131 + public Page<Bayonet> option(String st_select,Model model) throws Exception {
  132 + Page<Bayonet>page = new Page<Bayonet>();
  133 + Yard yard = yardService.findByStaionId(st_select);
  134 + List<Bayonet> bayonet = bayService.findByYardId(yard.getStationid());
  135 + page.setList(bayonet);
  136 + return page;
  137 + }
100 138
101 @RequiresPermissions("land:landBusinesstypeList:view") 139 @RequiresPermissions("land:landBusinesstypeList:view")
102 @RequestMapping(value = "form") 140 @RequestMapping(value = "form")
103 public String form(LandBusinesstypeList landBusinesstypeList, Model model) { 141 public String form(LandBusinesstypeList landBusinesstypeList, Model model) {
  142 + System.out.println(landBusinesstypeList);
104 Yard yard = new Yard(); 143 Yard yard = new Yard();
105 - Bayonet bayonet = new Bayonet();  
106 - List<Bayonet> bayonets = bayService.findList(bayonet);  
107 List<Yard> yardList = yardService.findList(yard); 144 List<Yard> yardList = yardService.findList(yard);
  145 + LandRoadVeRecord ve = new LandRoadVeRecord();
  146 + Principal principal = UserUtils.getPrincipal();
  147 + String loginName = principal.getLoginName();
  148 + User user = systemService.getUserByLoginName(loginName);
  149 + ve.setCreateBy(user);
  150 +
  151 + List<LandRoadVeRecord> veList = roadVeService.findList(ve);
  152 + if(landBusinesstypeList.getEndstation() !=null) {
  153 + Yard yard1 = yardService.findByStaionId(landBusinesstypeList.getEndstation());
  154 + List<Bayonet> bayonets = bayService.findByYardId(yard1.getStationid());
  155 + model.addAttribute("bayonets", bayonets);
  156 + }
  157 +// Bayonet bayonet = new Bayonet();
  158 +// List<Bayonet> bayonets = bayService.findList(bayonet);
  159 +// model.addAttribute("bayonets", bayonets);
  160 + model.addAttribute("veList",veList);
108 model.addAttribute("yardList", yardList); 161 model.addAttribute("yardList", yardList);
109 - model.addAttribute("bayonets", bayonets);  
110 model.addAttribute("landBusinesstypeList", landBusinesstypeList); 162 model.addAttribute("landBusinesstypeList", landBusinesstypeList);
111 return "modules/land/landBusinesstypeListForm"; 163 return "modules/land/landBusinesstypeListForm";
112 } 164 }
@@ -117,18 +169,245 @@ public class LandBusinesstypeListController extends BaseController { @@ -117,18 +169,245 @@ public class LandBusinesstypeListController extends BaseController {
117 if (!beanValidator(model, landBusinesstypeList)){ 169 if (!beanValidator(model, landBusinesstypeList)){
118 return form(landBusinesstypeList, model); 170 return form(landBusinesstypeList, model);
119 } 171 }
120 -  
121 - landBusinesstypeListService.save(landBusinesstypeList);  
122 - addMessage(redirectAttributes, "保存流转成功"); 172 + landBusinesstypeList.setIsDelete("0");
  173 + landBusinesstypeList.setIsvalid("0");
  174 + if(landBusinesstypeList.getId().length()>0) {
  175 + String masterList = landBusinesstypeList.getMasterList();
  176 + System.out.println(masterList);
  177 + insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),masterList);
  178 + List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode());
  179 + for (int i = 0; i < list.size(); i++) {
  180 + if(list.get(i).getMasterList().length()>0) {
  181 + list.get(i).setMasterList(masterList);
  182 + landBusinesstypeListService.save(list.get(i));
  183 + }
  184 + }
  185 + }else{
  186 + if(TYPE1.equals(landBusinesstypeList.getBusinesstype())) {
  187 + insertType1(landBusinesstypeList);
  188 + }
  189 + if(TYPE2.equals(landBusinesstypeList.getBusinesstype())) {
  190 + insertType2(landBusinesstypeList);
  191 + }
  192 + if(TYPE3.equals(landBusinesstypeList.getBusinesstype())) {
  193 + insertType3(landBusinesstypeList);
  194 + }
  195 + if(TYPE4.equals(landBusinesstypeList.getBusinesstype())) {
  196 + insertType1(landBusinesstypeList);
  197 + }
  198 + }
  199 + addMessage(redirectAttributes, "保存申请单成功");
123 return "redirect:"+Global.getAdminPath()+"/land/landBusinesstypeList/?repage"; 200 return "redirect:"+Global.getAdminPath()+"/land/landBusinesstypeList/?repage";
124 } 201 }
125 202
126 @RequiresPermissions("land:landBusinesstypeList:edit") 203 @RequiresPermissions("land:landBusinesstypeList:edit")
127 @RequestMapping(value = "delete") 204 @RequestMapping(value = "delete")
128 public String delete(LandBusinesstypeList landBusinesstypeList, RedirectAttributes redirectAttributes) { 205 public String delete(LandBusinesstypeList landBusinesstypeList, RedirectAttributes redirectAttributes) {
129 - landBusinesstypeListService.delete(landBusinesstypeList);  
130 - addMessage(redirectAttributes, "删除流转成功"); 206 + boolean flag = false;
  207 + List<LandBusinesstypeList> list = landBusinesstypeListService.findByBarcode(landBusinesstypeList.getBarcode());
  208 + for (int i = 0; i < list.size(); i++) {
  209 + String flag1 = list.get(i).getContrastflag();
  210 + if(flag1!=null) {
  211 + flag =true;
  212 + break;
  213 + }
  214 + }
  215 + if(!flag) {
  216 + landBusinesstypeListService.deleteByBarcode(landBusinesstypeList.getBarcode());
  217 + veMainService.deleteById(landBusinesstypeList.getMassageId());
  218 + buildBarCode.cancleBarCode(landBusinesstypeList.getTrailerFrameNo());
  219 + addMessage(redirectAttributes, "删除申请单成功");
  220 + }else {
  221 + addMessage(redirectAttributes, "删除失败,已有业务已进出站");
  222 + }
  223 +
131 return "redirect:"+Global.getAdminPath()+"/land/landBusinesstypeList/?repage"; 224 return "redirect:"+Global.getAdminPath()+"/land/landBusinesstypeList/?repage";
132 } 225 }
  226 +
  227 + public void insertType1(LandBusinesstypeList landBusinesstypeList) {
  228 + //first entry in
  229 + String messageId = LandBusinesstypeListController.dateTimeFormat();
  230 + String mainfistList = landBusinesstypeList.getMasterList();
  231 + String startport = landBusinesstypeList.getStartport();
  232 + System.out.println("startport:"+startport);
  233 + String endport = landBusinesstypeList.getEndport();
  234 + System.out.println("endport:"+endport);
  235 + String startStation = landBusinesstypeList.getStartsatation();
  236 + System.out.println("startStation:"+startStation);
  237 + String endStation = landBusinesstypeList.getEndstation();
  238 + System.out.println("endStation:"+endStation);
  239 + landBusinesstypeList.setMassageId(messageId);
  240 + String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
  241 + landBusinesstypeList.setStartport("");
  242 + landBusinesstypeList.setStartsatation("");
  243 + landBusinesstypeList.setEndport(startport);
  244 + landBusinesstypeList.setEndstation(startStation);
  245 + landBusinesstypeList.setBarcode(barCode);
  246 + landBusinesstypeList.setMasterList("");
  247 + landBusinesstypeList.setAisle(bayService.findByYardAndName(startStation, "1号卡口-进").getChannel());
  248 + landBusinesstypeListService.save(landBusinesstypeList);
  249 + insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),mainfistList);
  250 +
  251 + //second out
  252 + LandBusinesstypeList list = new LandBusinesstypeList();
  253 + list.setAgentname(landBusinesstypeList.getAgentname());
  254 + list.setAgentno(landBusinesstypeList.getAgentno());
  255 + list.setBarcode(barCode);
  256 + list.setIsDelete("0");
  257 + list.setIsvalid("0");
  258 + list.setBusinesstype(landBusinesstypeList.getBusinesstype());
  259 + list.setCocode(landBusinesstypeList.getCocode());
  260 + list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  261 + list.setEndport(startport);
  262 + list.setEndstation(startStation);
  263 + list.setProdectTime(new Date());
  264 + list.setMasterList(mainfistList);
  265 + list.setDriverid(landBusinesstypeList.getDriverid());
  266 + list.setDrivername(landBusinesstypeList.getDrivername());
  267 + list.setAisle(bayService.findByYardAndName(startStation, "1号卡口-出").getChannel());
  268 + list.setTurnoverflag("E");
  269 + list.setMassageId(messageId);
  270 + landBusinesstypeListService.save(list);
  271 +
  272 + //third
  273 + LandBusinesstypeList list1 = new LandBusinesstypeList();
  274 + list1.setAgentname(landBusinesstypeList.getAgentname());
  275 + list1.setAgentno(landBusinesstypeList.getAgentno());
  276 + list1.setIsDelete("0");
  277 + list1.setIsvalid("0");
  278 + list1.setBarcode(barCode);
  279 + list1.setBusinesstype(landBusinesstypeList.getBusinesstype());
  280 + list1.setCocode(landBusinesstypeList.getCocode());
  281 + list1.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  282 + list1.setStartport(startport);
  283 + list1.setStartsatation(startStation);
  284 + list1.setEndport(endport);
  285 + list1.setEndstation(endStation);
  286 + list1.setProdectTime(new Date());
  287 + list1.setMasterList(mainfistList);
  288 + list1.setDriverid(landBusinesstypeList.getDriverid());
  289 + list1.setDrivername(landBusinesstypeList.getDrivername());
  290 + list1.setAisle(bayService.findByYardAndName(endStation, "1号卡口-进").getChannel());
  291 + list1.setTurnoverflag("I");
  292 + list1.setMassageId(messageId);
  293 + landBusinesstypeListService.save(list1);
  294 +
  295 + //four
  296 + LandBusinesstypeList list2 = new LandBusinesstypeList();
  297 + list2.setAgentname(landBusinesstypeList.getAgentname());
  298 + list2.setAgentno(landBusinesstypeList.getAgentno());
  299 + list2.setBarcode(barCode);
  300 + list2.setIsDelete("0");
  301 + list2.setIsvalid("0");
  302 + list2.setBusinesstype(landBusinesstypeList.getBusinesstype());
  303 + list2.setCocode(landBusinesstypeList.getCocode());
  304 + list2.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  305 + list2.setStartport("");
  306 + list2.setStartsatation("");
  307 + list1.setStartport(startport);
  308 + list1.setStartsatation(startStation);
  309 + list2.setEndport(endport);
  310 + list2.setEndstation(endStation);
  311 + list2.setProdectTime(new Date());
  312 + list2.setMasterList("");
  313 + list2.setDriverid(landBusinesstypeList.getDriverid());
  314 + list2.setDrivername(landBusinesstypeList.getDrivername());
  315 + list2.setAisle(bayService.findByYardAndName(endStation, "1号卡口-出").getChannel());
  316 + list2.setTurnoverflag("E");
  317 + list2.setMassageId(messageId);
  318 + landBusinesstypeListService.save(list2);
  319 +
  320 + }
  321 +
  322 + public void insertType2(LandBusinesstypeList landBusinesstypeList) {
  323 + //first entry
  324 + String messageId = dateTimeFormat();
  325 + String mainfistList = landBusinesstypeList.getMasterList();
  326 + System.out.println(mainfistList);
  327 + landBusinesstypeList.setMassageId(messageId);
  328 + String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
  329 + landBusinesstypeList.setBarcode(barCode);
  330 + landBusinesstypeList.setMasterList("");
  331 + landBusinesstypeListService.save(landBusinesstypeList);
  332 + insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),mainfistList);
  333 + //second
  334 + LandBusinesstypeList list = new LandBusinesstypeList();
  335 + list.setAgentname(landBusinesstypeList.getAgentname());
  336 + list.setAgentno(landBusinesstypeList.getAgentno());
  337 + list.setIsDelete("0");
  338 + list.setIsvalid("0");
  339 + list.setBarcode(barCode);
  340 + list.setBusinesstype(landBusinesstypeList.getBusinesstype());
  341 + list.setCocode(landBusinesstypeList.getCocode());
  342 + list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  343 + list.setStartport(landBusinesstypeList.getStartport());
  344 + list.setStartsatation(landBusinesstypeList.getStartsatation());
  345 + list.setEndport(landBusinesstypeList.getEndport());
  346 + list.setEndstation(landBusinesstypeList.getEndstation());
  347 + list.setProdectTime(new Date());
  348 + list.setMasterList(mainfistList);
  349 + list.setDriverid(landBusinesstypeList.getDriverid());
  350 + list.setDrivername(landBusinesstypeList.getDrivername());
  351 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
  352 + list.setTurnoverflag("E");
  353 + list.setMassageId(messageId);
  354 + landBusinesstypeListService.save(list);
  355 + }
  356 +
  357 + public void insertType3(LandBusinesstypeList landBusinesstypeList) {
  358 + //first entry
  359 +
  360 + String messageId = dateTimeFormat();
  361 + landBusinesstypeList.setMassageId(messageId);
  362 + String mainfistList = landBusinesstypeList.getMasterList();
  363 + String barCode = buildBarCode.CreateBarCode(landBusinesstypeList.getTrailerFrameNo(),messageId);
  364 +// String barCode = messageId;
  365 + landBusinesstypeList.setBarcode(barCode);
  366 + landBusinesstypeListService.save(landBusinesstypeList);
  367 + insertVm(landBusinesstypeList.getMassageId(),landBusinesstypeList.getTrailerFrameNo(),mainfistList);
  368 + //second
  369 + LandBusinesstypeList list = new LandBusinesstypeList();
  370 + list.setAgentname(landBusinesstypeList.getAgentname());
  371 + list.setAgentno(landBusinesstypeList.getAgentno());
  372 + list.setIsDelete("0");
  373 + list.setIsvalid("0");
  374 + list.setBarcode(barCode);
  375 + list.setBusinesstype(landBusinesstypeList.getBusinesstype());
  376 + list.setCocode(landBusinesstypeList.getCocode());
  377 + list.setTrailerFrameNo(landBusinesstypeList.getTrailerFrameNo());
  378 + list.setStartport(landBusinesstypeList.getStartport());
  379 + list.setStartsatation(landBusinesstypeList.getStartsatation());
  380 + list.setEndport(landBusinesstypeList.getEndport());
  381 + list.setEndstation(landBusinesstypeList.getEndstation());
  382 + list.setProdectTime(new Date());
  383 + list.setMasterList("");
  384 + list.setDriverid(landBusinesstypeList.getDriverid());
  385 + list.setDrivername(landBusinesstypeList.getDrivername());
  386 + list.setAisle(bayService.findByYardAndName(landBusinesstypeList.getEndstation(), "1号卡口-出").getChannel());
  387 + list.setTurnoverflag("E");
  388 + list.setMassageId(messageId);
  389 + landBusinesstypeListService.save(list);
  390 + }
  391 +
  392 + public static String dateTimeFormat() {
  393 + Date dateTime = new Date();
  394 + SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
  395 + return format.format(dateTime);
  396 + }
  397 +
  398 + public void insertVm(String id ,String frameNo,String mainfistList) {
  399 + veMainService.deleteById(id);
  400 + if(mainfistList.length()>0) {
  401 + String[] list = mainfistList.split(",");
  402 + for (int i = 0; i < list.length; i++) {
  403 + VehicleMainifist vehicleMainifist = new VehicleMainifist();
  404 + vehicleMainifist.setBusinessId(id);
  405 + vehicleMainifist.setBusinessNum(frameNo);
  406 + vehicleMainifist.setMainifist(list[i]);
  407 + veMainService.save(vehicleMainifist);
  408 + }
  409 + }
  410 + }
  411 +
133 412
134 } 413 }
@@ -21,6 +21,10 @@ import com.thinkgem.jeesite.common.web.BaseController; @@ -21,6 +21,10 @@ import com.thinkgem.jeesite.common.web.BaseController;
21 import com.thinkgem.jeesite.common.utils.StringUtils; 21 import com.thinkgem.jeesite.common.utils.StringUtils;
22 import com.thinkgem.jeesite.modules.land.entity.LandCorporationInfo; 22 import com.thinkgem.jeesite.modules.land.entity.LandCorporationInfo;
23 import com.thinkgem.jeesite.modules.land.service.LandCorporationInfoService; 23 import com.thinkgem.jeesite.modules.land.service.LandCorporationInfoService;
  24 +import com.thinkgem.jeesite.modules.sys.entity.User;
  25 +import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
  26 +import com.thinkgem.jeesite.modules.sys.service.SystemService;
  27 +import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
24 28
25 /** 29 /**
26 * 企业备案Controller 30 * 企业备案Controller
@@ -34,6 +38,9 @@ public class LandCorporationInfoController extends BaseController { @@ -34,6 +38,9 @@ public class LandCorporationInfoController extends BaseController {
34 @Autowired 38 @Autowired
35 private LandCorporationInfoService landCorporationInfoService; 39 private LandCorporationInfoService landCorporationInfoService;
36 40
  41 + @Autowired
  42 + private SystemService systemService;
  43 +
37 @ModelAttribute 44 @ModelAttribute
38 public LandCorporationInfo get(@RequestParam(required=false) String id) { 45 public LandCorporationInfo get(@RequestParam(required=false) String id) {
39 LandCorporationInfo entity = null; 46 LandCorporationInfo entity = null;
@@ -49,7 +56,12 @@ public class LandCorporationInfoController extends BaseController { @@ -49,7 +56,12 @@ public class LandCorporationInfoController extends BaseController {
49 @RequiresPermissions("land:landCorporationInfo:view") 56 @RequiresPermissions("land:landCorporationInfo:view")
50 @RequestMapping(value = {"list", ""}) 57 @RequestMapping(value = {"list", ""})
51 public String list(LandCorporationInfo landCorporationInfo, HttpServletRequest request, HttpServletResponse response, Model model) { 58 public String list(LandCorporationInfo landCorporationInfo, HttpServletRequest request, HttpServletResponse response, Model model) {
52 - Page<LandCorporationInfo> page = landCorporationInfoService.findPage(new Page<LandCorporationInfo>(request, response), landCorporationInfo); 59 + Principal principal = UserUtils.getPrincipal();
  60 + String loginName = principal.getLoginName();
  61 + User user = systemService.getUserByLoginName(loginName);
  62 + landCorporationInfo.setCreateBy(user);
  63 + Page<LandCorporationInfo> page =
  64 + landCorporationInfoService.findPage(new Page<LandCorporationInfo>(request, response), landCorporationInfo);
53 model.addAttribute("page", page); 65 model.addAttribute("page", page);
54 return "modules/land/landCorporationInfoList"; 66 return "modules/land/landCorporationInfoList";
55 } 67 }
@@ -3,6 +3,9 @@ @@ -3,6 +3,9 @@
3 */ 3 */
4 package com.thinkgem.jeesite.modules.land.web; 4 package com.thinkgem.jeesite.modules.land.web;
5 5
  6 +import java.text.SimpleDateFormat;
  7 +import java.util.Date;
  8 +
6 import javax.servlet.http.HttpServletRequest; 9 import javax.servlet.http.HttpServletRequest;
7 import javax.servlet.http.HttpServletResponse; 10 import javax.servlet.http.HttpServletResponse;
8 11
@@ -19,8 +22,13 @@ import com.thinkgem.jeesite.common.config.Global; @@ -19,8 +22,13 @@ import com.thinkgem.jeesite.common.config.Global;
19 import com.thinkgem.jeesite.common.persistence.Page; 22 import com.thinkgem.jeesite.common.persistence.Page;
20 import com.thinkgem.jeesite.common.web.BaseController; 23 import com.thinkgem.jeesite.common.web.BaseController;
21 import com.thinkgem.jeesite.common.utils.StringUtils; 24 import com.thinkgem.jeesite.common.utils.StringUtils;
  25 +import com.thinkgem.jeesite.modules.land.entity.LandBusinesstypeList;
22 import com.thinkgem.jeesite.modules.land.entity.LandRoadDrRecord; 26 import com.thinkgem.jeesite.modules.land.entity.LandRoadDrRecord;
23 import com.thinkgem.jeesite.modules.land.service.LandRoadDrRecordService; 27 import com.thinkgem.jeesite.modules.land.service.LandRoadDrRecordService;
  28 +import com.thinkgem.jeesite.modules.sys.entity.User;
  29 +import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
  30 +import com.thinkgem.jeesite.modules.sys.service.SystemService;
  31 +import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
24 32
25 /** 33 /**
26 * 驾驶员备案Controller 34 * 驾驶员备案Controller
@@ -34,6 +42,9 @@ public class LandRoadDrRecordController extends BaseController { @@ -34,6 +42,9 @@ public class LandRoadDrRecordController extends BaseController {
34 @Autowired 42 @Autowired
35 private LandRoadDrRecordService landRoadDrRecordService; 43 private LandRoadDrRecordService landRoadDrRecordService;
36 44
  45 + @Autowired
  46 + private SystemService systemService;
  47 +
37 @ModelAttribute 48 @ModelAttribute
38 public LandRoadDrRecord get(@RequestParam(required=false) String id) { 49 public LandRoadDrRecord get(@RequestParam(required=false) String id) {
39 LandRoadDrRecord entity = null; 50 LandRoadDrRecord entity = null;
@@ -49,7 +60,12 @@ public class LandRoadDrRecordController extends BaseController { @@ -49,7 +60,12 @@ public class LandRoadDrRecordController extends BaseController {
49 @RequiresPermissions("land:landRoadDrRecord:view") 60 @RequiresPermissions("land:landRoadDrRecord:view")
50 @RequestMapping(value = {"list", ""}) 61 @RequestMapping(value = {"list", ""})
51 public String list(LandRoadDrRecord landRoadDrRecord, HttpServletRequest request, HttpServletResponse response, Model model) { 62 public String list(LandRoadDrRecord landRoadDrRecord, HttpServletRequest request, HttpServletResponse response, Model model) {
52 - Page<LandRoadDrRecord> page = landRoadDrRecordService.findPage(new Page<LandRoadDrRecord>(request, response), landRoadDrRecord); 63 + Principal principal = UserUtils.getPrincipal();
  64 + String loginName = principal.getLoginName();
  65 + User user = systemService.getUserByLoginName(loginName);
  66 + landRoadDrRecord.setCreateBy(user);
  67 + Page<LandRoadDrRecord> page =
  68 + landRoadDrRecordService.findPage(new Page<LandRoadDrRecord>(request, response), landRoadDrRecord);
53 model.addAttribute("page", page); 69 model.addAttribute("page", page);
54 return "modules/land/landRoadDrRecordList"; 70 return "modules/land/landRoadDrRecordList";
55 } 71 }
@@ -21,6 +21,10 @@ import com.thinkgem.jeesite.common.web.BaseController; @@ -21,6 +21,10 @@ import com.thinkgem.jeesite.common.web.BaseController;
21 import com.thinkgem.jeesite.common.utils.StringUtils; 21 import com.thinkgem.jeesite.common.utils.StringUtils;
22 import com.thinkgem.jeesite.modules.land.entity.LandRoadTrailerRecord; 22 import com.thinkgem.jeesite.modules.land.entity.LandRoadTrailerRecord;
23 import com.thinkgem.jeesite.modules.land.service.LandRoadTrailerRecordService; 23 import com.thinkgem.jeesite.modules.land.service.LandRoadTrailerRecordService;
  24 +import com.thinkgem.jeesite.modules.sys.entity.User;
  25 +import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
  26 +import com.thinkgem.jeesite.modules.sys.service.SystemService;
  27 +import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
24 28
25 /** 29 /**
26 * 挂车备案Controller 30 * 挂车备案Controller
@@ -34,6 +38,9 @@ public class LandRoadTrailerRecordController extends BaseController { @@ -34,6 +38,9 @@ public class LandRoadTrailerRecordController extends BaseController {
34 @Autowired 38 @Autowired
35 private LandRoadTrailerRecordService landRoadTrailerRecordService; 39 private LandRoadTrailerRecordService landRoadTrailerRecordService;
36 40
  41 + @Autowired
  42 + private SystemService systemService;
  43 +
37 @ModelAttribute 44 @ModelAttribute
38 public LandRoadTrailerRecord get(@RequestParam(required=false) String id) { 45 public LandRoadTrailerRecord get(@RequestParam(required=false) String id) {
39 LandRoadTrailerRecord entity = null; 46 LandRoadTrailerRecord entity = null;
@@ -49,7 +56,12 @@ public class LandRoadTrailerRecordController extends BaseController { @@ -49,7 +56,12 @@ public class LandRoadTrailerRecordController extends BaseController {
49 @RequiresPermissions("land:landRoadTrailerRecord:view") 56 @RequiresPermissions("land:landRoadTrailerRecord:view")
50 @RequestMapping(value = {"list", ""}) 57 @RequestMapping(value = {"list", ""})
51 public String list(LandRoadTrailerRecord landRoadTrailerRecord, HttpServletRequest request, HttpServletResponse response, Model model) { 58 public String list(LandRoadTrailerRecord landRoadTrailerRecord, HttpServletRequest request, HttpServletResponse response, Model model) {
52 - Page<LandRoadTrailerRecord> page = landRoadTrailerRecordService.findPage(new Page<LandRoadTrailerRecord>(request, response), landRoadTrailerRecord); 59 + Principal principal = UserUtils.getPrincipal();
  60 + String loginName = principal.getLoginName();
  61 + User user = systemService.getUserByLoginName(loginName);
  62 + landRoadTrailerRecord.setCreateBy(user);
  63 + Page<LandRoadTrailerRecord> page =
  64 + landRoadTrailerRecordService.findPage(new Page<LandRoadTrailerRecord>(request, response), landRoadTrailerRecord);
53 model.addAttribute("page", page); 65 model.addAttribute("page", page);
54 return "modules/land/landRoadTrailerRecordList"; 66 return "modules/land/landRoadTrailerRecordList";
55 } 67 }
@@ -15,12 +15,17 @@ import org.springframework.web.bind.annotation.RequestMapping; @@ -15,12 +15,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
15 import org.springframework.web.bind.annotation.RequestParam; 15 import org.springframework.web.bind.annotation.RequestParam;
16 import org.springframework.web.servlet.mvc.support.RedirectAttributes; 16 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
17 17
  18 +import com.thinkgem.jeesite.common.barCode.buildBarCode;
18 import com.thinkgem.jeesite.common.config.Global; 19 import com.thinkgem.jeesite.common.config.Global;
19 import com.thinkgem.jeesite.common.persistence.Page; 20 import com.thinkgem.jeesite.common.persistence.Page;
20 import com.thinkgem.jeesite.common.web.BaseController; 21 import com.thinkgem.jeesite.common.web.BaseController;
21 import com.thinkgem.jeesite.common.utils.StringUtils; 22 import com.thinkgem.jeesite.common.utils.StringUtils;
22 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord; 23 import com.thinkgem.jeesite.modules.land.entity.LandRoadVeRecord;
23 import com.thinkgem.jeesite.modules.land.service.LandRoadVeRecordService; 24 import com.thinkgem.jeesite.modules.land.service.LandRoadVeRecordService;
  25 +import com.thinkgem.jeesite.modules.sys.entity.User;
  26 +import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm.Principal;
  27 +import com.thinkgem.jeesite.modules.sys.service.SystemService;
  28 +import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
24 29
25 /** 30 /**
26 * 汽车备案Controller 31 * 汽车备案Controller
@@ -34,6 +39,9 @@ public class LandRoadVeRecordController extends BaseController { @@ -34,6 +39,9 @@ public class LandRoadVeRecordController extends BaseController {
34 @Autowired 39 @Autowired
35 private LandRoadVeRecordService landRoadVeRecordService; 40 private LandRoadVeRecordService landRoadVeRecordService;
36 41
  42 + @Autowired
  43 + private SystemService systemService;
  44 +
37 @ModelAttribute 45 @ModelAttribute
38 public LandRoadVeRecord get(@RequestParam(required=false) String id) { 46 public LandRoadVeRecord get(@RequestParam(required=false) String id) {
39 LandRoadVeRecord entity = null; 47 LandRoadVeRecord entity = null;
@@ -49,7 +57,12 @@ public class LandRoadVeRecordController extends BaseController { @@ -49,7 +57,12 @@ public class LandRoadVeRecordController extends BaseController {
49 @RequiresPermissions("land:landRoadVeRecord:view") 57 @RequiresPermissions("land:landRoadVeRecord:view")
50 @RequestMapping(value = {"list", ""}) 58 @RequestMapping(value = {"list", ""})
51 public String list(LandRoadVeRecord landRoadVeRecord, HttpServletRequest request, HttpServletResponse response, Model model) { 59 public String list(LandRoadVeRecord landRoadVeRecord, HttpServletRequest request, HttpServletResponse response, Model model) {
52 - Page<LandRoadVeRecord> page = landRoadVeRecordService.findPage(new Page<LandRoadVeRecord>(request, response), landRoadVeRecord); 60 + Principal principal = UserUtils.getPrincipal();
  61 + String loginName = principal.getLoginName();
  62 + User user = systemService.getUserByLoginName(loginName);
  63 + landRoadVeRecord.setCreateBy(user);
  64 + Page<LandRoadVeRecord> page =
  65 + landRoadVeRecordService.findPage(new Page<LandRoadVeRecord>(request, response), landRoadVeRecord);
53 model.addAttribute("page", page); 66 model.addAttribute("page", page);
54 return "modules/land/landRoadVeRecordList"; 67 return "modules/land/landRoadVeRecordList";
55 } 68 }
@@ -67,6 +80,16 @@ public class LandRoadVeRecordController extends BaseController { @@ -67,6 +80,16 @@ public class LandRoadVeRecordController extends BaseController {
67 if (!beanValidator(model, landRoadVeRecord)){ 80 if (!beanValidator(model, landRoadVeRecord)){
68 return form(landRoadVeRecord, model); 81 return form(landRoadVeRecord, model);
69 } 82 }
  83 + String barcode = landRoadVeRecord.getBarcode();
  84 + if(barcode ==null) {
  85 + String barCode = buildBarCode.crateCar(landRoadVeRecord);
  86 + if("0".equals(barCode)) {
  87 + landRoadVeRecord.setReturnmessage("备案成功");
  88 + }else {
  89 + landRoadVeRecord.setReturnmessage("备案失败");
  90 + }
  91 + landRoadVeRecord.setBarcode(barCode);
  92 + }
70 landRoadVeRecordService.save(landRoadVeRecord); 93 landRoadVeRecordService.save(landRoadVeRecord);
71 addMessage(redirectAttributes, "保存备案成功"); 94 addMessage(redirectAttributes, "保存备案成功");
72 return "redirect:"+Global.getAdminPath()+"/land/landRoadVeRecord/?repage"; 95 return "redirect:"+Global.getAdminPath()+"/land/landRoadVeRecord/?repage";
@@ -76,6 +99,7 @@ public class LandRoadVeRecordController extends BaseController { @@ -76,6 +99,7 @@ public class LandRoadVeRecordController extends BaseController {
76 @RequestMapping(value = "delete") 99 @RequestMapping(value = "delete")
77 public String delete(LandRoadVeRecord landRoadVeRecord, RedirectAttributes redirectAttributes) { 100 public String delete(LandRoadVeRecord landRoadVeRecord, RedirectAttributes redirectAttributes) {
78 landRoadVeRecordService.delete(landRoadVeRecord); 101 landRoadVeRecordService.delete(landRoadVeRecord);
  102 + buildBarCode.cancleCar(landRoadVeRecord);
79 addMessage(redirectAttributes, "删除备案成功"); 103 addMessage(redirectAttributes, "删除备案成功");
80 return "redirect:"+Global.getAdminPath()+"/land/landRoadVeRecord/?repage"; 104 return "redirect:"+Global.getAdminPath()+"/land/landRoadVeRecord/?repage";
81 } 105 }
@@ -402,7 +402,7 @@ public class SystemService extends BaseService implements InitializingBean { @@ -402,7 +402,7 @@ public class SystemService extends BaseService implements InitializingBean {
402 public static boolean printKeyLoadMessage(){ 402 public static boolean printKeyLoadMessage(){
403 StringBuilder sb = new StringBuilder(); 403 StringBuilder sb = new StringBuilder();
404 sb.append("\r\n======================================================================\r\n"); 404 sb.append("\r\n======================================================================\r\n");
405 - sb.append("\r\n 欢迎使用 "+Global.getConfig("productName")+" - Powered By ShangYou"); 405 + sb.append("\r\n 欢迎使用 "+Global.getConfig("productName")+" - Powered By");
406 sb.append("\r\n======================================================================\r\n"); 406 sb.append("\r\n======================================================================\r\n");
407 System.out.println(sb.toString()); 407 System.out.println(sb.toString());
408 return true; 408 return true;
@@ -50,10 +50,10 @@ public class LoginController extends BaseController{ @@ -50,10 +50,10 @@ public class LoginController extends BaseController{
50 Principal principal = UserUtils.getPrincipal(); 50 Principal principal = UserUtils.getPrincipal();
51 51
52 // // 默认页签模式 52 // // 默认页签模式
53 -// String tabmode = CookieUtils.getCookie(request, "tabmode");  
54 -// if (tabmode == null){  
55 -// CookieUtils.setCookie(response, "tabmode", "1");  
56 -// } 53 +/* String tabmode = CookieUtils.getCookie(request, "tabmode");
  54 + if (tabmode == null){
  55 + CookieUtils.setCookie(response, "tabmode", "1");
  56 + }*/
57 57
58 if (logger.isDebugEnabled()){ 58 if (logger.isDebugEnabled()){
59 logger.debug("login, active session size: {}", sessionDAO.getActiveSessions(false).size()); 59 logger.debug("login, active session size: {}", sessionDAO.getActiveSessions(false).size());
@@ -3,6 +3,10 @@ @@ -3,6 +3,10 @@
3 */ 3 */
4 package com.thinkgem.jeesite.modules.yard.dao; 4 package com.thinkgem.jeesite.modules.yard.dao;
5 5
  6 +import java.util.List;
  7 +
  8 +import org.apache.ibatis.annotations.Param;
  9 +
6 import com.thinkgem.jeesite.common.persistence.CrudDao; 10 import com.thinkgem.jeesite.common.persistence.CrudDao;
7 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao; 11 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
8 import com.thinkgem.jeesite.modules.yard.entity.Bayonet; 12 import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
@@ -14,5 +18,6 @@ import com.thinkgem.jeesite.modules.yard.entity.Bayonet; @@ -14,5 +18,6 @@ import com.thinkgem.jeesite.modules.yard.entity.Bayonet;
14 */ 18 */
15 @MyBatisDao 19 @MyBatisDao
16 public interface BayonetDao extends CrudDao<Bayonet> { 20 public interface BayonetDao extends CrudDao<Bayonet> {
17 - 21 + List<Bayonet> findByYardId(@Param("yardId")String yardId);
  22 + Bayonet findByYardAndName(@Param("yardId")String yardId,@Param("name")String Name);
18 } 23 }
@@ -14,5 +14,5 @@ import com.thinkgem.jeesite.modules.yard.entity.Yard; @@ -14,5 +14,5 @@ import com.thinkgem.jeesite.modules.yard.entity.Yard;
14 */ 14 */
15 @MyBatisDao 15 @MyBatisDao
16 public interface YardDao extends CrudDao<Yard> { 16 public interface YardDao extends CrudDao<Yard> {
17 - 17 + Yard findByStaionId(String stationid);
18 } 18 }
1 /** 1 /**
2 - * 2 + *
3 */ 3 */
4 package com.thinkgem.jeesite.modules.yard.entity; 4 package com.thinkgem.jeesite.modules.yard.entity;
5 5
6 -import java.util.List;  
7 -  
8 -import javax.validation.constraints.NotNull;  
9 -  
10 import org.hibernate.validator.constraints.Length; 6 import org.hibernate.validator.constraints.Length;
11 7
12 -import com.google.common.collect.Lists;  
13 import com.thinkgem.jeesite.common.persistence.DataEntity; 8 import com.thinkgem.jeesite.common.persistence.DataEntity;
14 9
15 /** 10 /**
16 * 场站管理Entity 11 * 场站管理Entity
17 * @author promise 12 * @author promise
18 - * @version 2018-09-29 13 + * @version 2019-01-11
19 */ 14 */
20 public class Yard extends DataEntity<Yard> { 15 public class Yard extends DataEntity<Yard> {
21 16
22 private static final long serialVersionUID = 1L; 17 private static final long serialVersionUID = 1L;
23 private String name; // 场站名称 18 private String name; // 场站名称
  19 + private String areaCode; // 区域代码
  20 + private String stationid; // 场站ID
24 private String customsCode; // 关区代码 21 private String customsCode; // 关区代码
25 22
26 - private List<Bayonet> bayonetList = Lists.newArrayList(); // 卡口  
27 -  
28 - private List<Wharf> WarfList = Lists.newArrayList(); // 码头  
29 -  
30 - private List<Warehouse> warehouseList = Lists.newArrayList(); // 仓库  
31 -  
32 public Yard() { 23 public Yard() {
33 super(); 24 super();
34 } 25 }
@@ -36,7 +27,7 @@ public class Yard extends DataEntity<Yard> { @@ -36,7 +27,7 @@ public class Yard extends DataEntity<Yard> {
36 public Yard(String id){ 27 public Yard(String id){
37 super(id); 28 super(id);
38 } 29 }
39 - @NotNull(message="场站名称不能为空") 30 +
40 @Length(min=0, max=100, message="场站名称长度必须介于 0 和 100 之间") 31 @Length(min=0, max=100, message="场站名称长度必须介于 0 和 100 之间")
41 public String getName() { 32 public String getName() {
42 return name; 33 return name;
@@ -46,38 +37,31 @@ public class Yard extends DataEntity<Yard> { @@ -46,38 +37,31 @@ public class Yard extends DataEntity<Yard> {
46 this.name = name; 37 this.name = name;
47 } 38 }
48 39
49 - @NotNull(message="关区代码不能为空")  
50 - @Length(min=0, max=10, message="关区代码长度必须介于 0 和 10 之间")  
51 - public String getCustomsCode() {  
52 - return customsCode;  
53 - }  
54 -  
55 - public void setCustomsCode(String customsCode) {  
56 - this.customsCode = customsCode;  
57 - }  
58 -  
59 - public List<Bayonet> getBayonetList() {  
60 - return bayonetList; 40 + @Length(min=0, max=5, message="区域代码长度必须介于 0 和 5 之间")
  41 + public String getAreaCode() {
  42 + return areaCode;
61 } 43 }
62 44
63 - public void setBayonetList(List<Bayonet> bayonetList) {  
64 - this.bayonetList = bayonetList; 45 + public void setAreaCode(String areaCode) {
  46 + this.areaCode = areaCode;
65 } 47 }
66 -  
67 - public List<Warehouse> getWarehouseList() {  
68 - return warehouseList; 48 +
  49 + @Length(min=0, max=10, message="场站ID长度必须介于 0 和 10 之间")
  50 + public String getStationid() {
  51 + return stationid;
69 } 52 }
70 53
71 - public void setWarehouseList(List<Warehouse> warehouseList) {  
72 - this.warehouseList = warehouseList; 54 + public void setStationid(String stationid) {
  55 + this.stationid = stationid;
73 } 56 }
74 -  
75 - public List<Wharf> getWarfList() {  
76 - return WarfList; 57 +
  58 + @Length(min=0, max=10, message="关区代码长度必须介于 0 和 10 之间")
  59 + public String getCustomsCode() {
  60 + return customsCode;
77 } 61 }
78 62
79 - public void setWarfList(List<Wharf> warfList) {  
80 - WarfList = warfList; 63 + public void setCustomsCode(String customsCode) {
  64 + this.customsCode = customsCode;
81 } 65 }
82 66
83 } 67 }
@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.yard.service; @@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.yard.service;
5 5
6 import java.util.List; 6 import java.util.List;
7 7
  8 +import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
9 import org.springframework.transaction.annotation.Transactional; 10 import org.springframework.transaction.annotation.Transactional;
10 11
@@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.yard.dao.BayonetDao; @@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.yard.dao.BayonetDao;
22 @Transactional(readOnly = true) 23 @Transactional(readOnly = true)
23 public class BayonetService extends CrudService<BayonetDao, Bayonet> { 24 public class BayonetService extends CrudService<BayonetDao, Bayonet> {
24 25
  26 + @Autowired
  27 + private BayonetDao dao;
  28 +
25 public Bayonet get(String id) { 29 public Bayonet get(String id) {
26 return super.get(id); 30 return super.get(id);
27 } 31 }
@@ -46,4 +50,14 @@ public class BayonetService extends CrudService<BayonetDao, Bayonet> { @@ -46,4 +50,14 @@ public class BayonetService extends CrudService<BayonetDao, Bayonet> {
46 super.delete(bayonet); 50 super.delete(bayonet);
47 } 51 }
48 52
  53 + @Transactional(readOnly = false)
  54 + public List<Bayonet> findByYardId(String yardId) {
  55 + return dao.findByYardId(yardId);
  56 + }
  57 +
  58 + @Transactional(readOnly = false)
  59 + public Bayonet findByYardAndName(String yardId,String yardName) {
  60 + return dao.findByYardAndName(yardId,yardName);
  61 + }
  62 +
49 } 63 }
@@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.yard.service; @@ -5,6 +5,7 @@ package com.thinkgem.jeesite.modules.yard.service;
5 5
6 import java.util.List; 6 import java.util.List;
7 7
  8 +import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
9 import org.springframework.transaction.annotation.Transactional; 10 import org.springframework.transaction.annotation.Transactional;
10 11
@@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.yard.dao.YardDao; @@ -22,6 +23,9 @@ import com.thinkgem.jeesite.modules.yard.dao.YardDao;
22 @Transactional(readOnly = true) 23 @Transactional(readOnly = true)
23 public class YardService extends CrudService<YardDao, Yard> { 24 public class YardService extends CrudService<YardDao, Yard> {
24 25
  26 + @Autowired
  27 + private YardDao dao;
  28 +
25 public Yard get(String id) { 29 public Yard get(String id) {
26 return super.get(id); 30 return super.get(id);
27 } 31 }
@@ -44,4 +48,8 @@ public class YardService extends CrudService<YardDao, Yard> { @@ -44,4 +48,8 @@ public class YardService extends CrudService<YardDao, Yard> {
44 super.delete(yard); 48 super.delete(yard);
45 } 49 }
46 50
  51 + @Transactional(readOnly = false)
  52 + public Yard findByStaionId(String stationid) {
  53 + return dao.findByStaionId(stationid);
  54 + }
47 } 55 }
@@ -56,7 +56,7 @@ public class BayonetController extends BaseController { @@ -56,7 +56,7 @@ public class BayonetController extends BaseController {
56 @RequiresPermissions("yard:bayonet:view") 56 @RequiresPermissions("yard:bayonet:view")
57 @RequestMapping(value = {"list", ""}) 57 @RequestMapping(value = {"list", ""})
58 public String list(Bayonet bayonet, HttpServletRequest request, HttpServletResponse response, Model model) { 58 public String list(Bayonet bayonet, HttpServletRequest request, HttpServletResponse response, Model model) {
59 - Page<Bayonet> page = bayonetService.findPage(new Page<Bayonet>(request, response), bayonet); 59 + Page<Bayonet> page = bayonetService.findPage(new Page<Bayonet>(request, response), bayonet);
60 model.addAttribute("page", page); 60 model.addAttribute("page", page);
61 return "modules/yard/bayonetList"; 61 return "modules/yard/bayonetList";
62 } 62 }
@@ -66,6 +66,7 @@ public class BayonetController extends BaseController { @@ -66,6 +66,7 @@ public class BayonetController extends BaseController {
66 public String form(Bayonet bayonet, Model model) { 66 public String form(Bayonet bayonet, Model model) {
67 Yard yard = new Yard(); 67 Yard yard = new Yard();
68 List<Yard> yardList = yardService.findList(yard); 68 List<Yard> yardList = yardService.findList(yard);
  69 + System.out.println(yardList);
69 model.addAttribute("yardList", yardList); 70 model.addAttribute("yardList", yardList);
70 model.addAttribute("bayonet", bayonet); 71 model.addAttribute("bayonet", bayonet);
71 return "modules/yard/bayonetForm"; 72 return "modules/yard/bayonetForm";
@@ -11,10 +11,16 @@ @@ -11,10 +11,16 @@
11 11
12 #mysql database setting 12 #mysql database setting
13 jdbc.type=mysql 13 jdbc.type=mysql
14 -jdbc.driver=com.mysql.jdbc.Driver  
15 -jdbc.url=jdbc:mysql://localhost:3306/station?useUnicode=true&characterEncoding=utf-8  
16 -jdbc.username=root  
17 -jdbc.password=123456 14 +jdbc.driver=com.mysql.cj.jdbc.Driver
  15 +jdbc.url=jdbc:mysql://10.50.7.70:3306/station?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true
  16 +jdbc.username=station
  17 +jdbc.password=station@10.50.7.70
  18 +
  19 +#jdbc.type=mysql
  20 +#jdbc.driver=com.mysql.cj.jdbc.Driver
  21 +#jdbc.url=jdbc:mysql://localhost:3306/station?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true
  22 +#jdbc.username=root
  23 +#jdbc.password=root
18 24
19 #mssql database settings 25 #mssql database settings
20 #jdbc.type=mssql 26 #jdbc.type=mssql
@@ -41,7 +47,7 @@ redis.port=6379 @@ -41,7 +47,7 @@ redis.port=6379
41 #============================# 47 #============================#
42 48
43 #\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e 49 #\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
44 -productName=\u573A\u7AD9\u7BA1\u7406\u7CFB\u7EDF 50 +productName=\u6D77\u5173\u8F85\u52A9\u7BA1\u7406\u7CFB\u7EDF
45 copyrightYear=2018 51 copyrightYear=2018
46 #version=V1.2.7 52 #version=V1.2.7
47 53
1 <?xml version="1.0" encoding="UTF-8" ?> 1 <?xml version="1.0" encoding="UTF-8" ?>
2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 <mapper namespace="com.thinkgem.jeesite.modules.land.dao.LandBusinesstypeListDao"> 3 <mapper namespace="com.thinkgem.jeesite.modules.land.dao.LandBusinesstypeListDao">
4 -  
5 - <sql id="landBusinesstypeListColumns"> 4 + <sql id="landBusinesstypeListColumns">
6 a.massage_id AS "massageId", 5 a.massage_id AS "massageId",
7 a.id AS "id", 6 a.id AS "id",
8 a.trailer_frame_no AS "trailerFrameNo", 7 a.trailer_frame_no AS "trailerFrameNo",
9 a.trailer_license_no AS "trailerLicenseNo", 8 a.trailer_license_no AS "trailerLicenseNo",
10 a.master_list AS "masterList", 9 a.master_list AS "masterList",
11 a.prodect_time AS "prodectTime", 10 a.prodect_time AS "prodectTime",
12 - a.returnmessage AS "returnmessage",  
13 a.agentno AS "agentno", 11 a.agentno AS "agentno",
  12 + a.is_delete AS "isDelete",
14 a.agentname AS "agentname", 13 a.agentname AS "agentname",
15 a.cocode AS "cocode", 14 a.cocode AS "cocode",
16 a.drivername AS "drivername", 15 a.drivername AS "drivername",
@@ -23,10 +22,12 @@ @@ -23,10 +22,12 @@
23 a.businesstype AS "businesstype", 22 a.businesstype AS "businesstype",
24 a.turnoverflag AS "turnoverflag", 23 a.turnoverflag AS "turnoverflag",
25 a.contrastflag AS "contrastflag", 24 a.contrastflag AS "contrastflag",
  25 + a.barcode AS "barcode",
26 a.create_by AS "createBy.id", 26 a.create_by AS "createBy.id",
27 a.create_date AS "createDate", 27 a.create_date AS "createDate",
28 a.update_by AS "updateBy.id", 28 a.update_by AS "updateBy.id",
29 - a.update_date AS "updateDate" 29 + a.update_date AS "updateDate",
  30 + a.isvalid AS "isvalid"
30 </sql> 31 </sql>
31 32
32 <sql id="landBusinesstypeListJoins"> 33 <sql id="landBusinesstypeListJoins">
@@ -46,6 +47,13 @@ @@ -46,6 +47,13 @@
46 FROM land_businesstype_list a 47 FROM land_businesstype_list a
47 <include refid="landBusinesstypeListJoins"/> 48 <include refid="landBusinesstypeListJoins"/>
48 <where> 49 <where>
  50 + a.is_delete = "0"
  51 + <if test="trailerFrameNo !=null and trailerFrameNo !=''">
  52 + and trailer_frame_no = #{trailerFrameNo}
  53 + </if>
  54 + <if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>
  55 + and create_by = #{createBy.id}
  56 + </if>
49 57
50 </where> 58 </where>
51 <choose> 59 <choose>
@@ -53,10 +61,32 @@ @@ -53,10 +61,32 @@
53 ORDER BY ${page.orderBy} 61 ORDER BY ${page.orderBy}
54 </when> 62 </when>
55 <otherwise> 63 <otherwise>
56 - ORDER BY a.update_date DESC 64 + ORDER BY a.create_date DESC
57 </otherwise> 65 </otherwise>
58 </choose> 66 </choose>
59 </select> 67 </select>
  68 + <select id="findByStatus" resultType="LandBusinesstypeList">
  69 + SELECT
  70 + <include refid="landBusinesstypeListColumns"/>
  71 + FROM land_businesstype_list a
  72 + <include refid="landBusinesstypeListJoins"/>
  73 + where a.is_delete = "0"
  74 + <if test="trailerFrameNo !=null and trailerFrameNo !=''">
  75 + and trailer_frame_no = #{trailerFrameNo}
  76 + </if>
  77 + order by a.create_date DESC
  78 + </select>
  79 + <select id="findByBarcode" resultType="LandBusinesstypeList">
  80 + SELECT
  81 + <include refid="landBusinesstypeListColumns"/>
  82 + FROM land_businesstype_list a
  83 + <include refid="landBusinesstypeListJoins"/>
  84 + where a.is_delete = "0"
  85 + <if test="barcode !=null and barcode !=''">
  86 + and barcode = #{barcode}
  87 + </if>
  88 + order by a.create_date DESC
  89 + </select>
60 90
61 <select id="findAllList" resultType="LandBusinesstypeList"> 91 <select id="findAllList" resultType="LandBusinesstypeList">
62 SELECT 92 SELECT
@@ -76,6 +106,11 @@ @@ -76,6 +106,11 @@
76 </choose> 106 </choose>
77 </select> 107 </select>
78 108
  109 + <update id="deleteByBarcode" parameterType="java.lang.String">
  110 + UPDATE land_businesstype_list set is_delete = "1",isvalid = "1"
  111 + WHERE barcode = #{barcode}
  112 + </update>
  113 +
79 <insert id="insert"> 114 <insert id="insert">
80 INSERT INTO land_businesstype_list( 115 INSERT INTO land_businesstype_list(
81 massage_id, 116 massage_id,
@@ -84,8 +119,8 @@ @@ -84,8 +119,8 @@
84 trailer_license_no, 119 trailer_license_no,
85 master_list, 120 master_list,
86 prodect_time, 121 prodect_time,
87 - returnmessage,  
88 agentno, 122 agentno,
  123 + is_delete,
89 agentname, 124 agentname,
90 cocode, 125 cocode,
91 drivername, 126 drivername,
@@ -98,10 +133,12 @@ @@ -98,10 +133,12 @@
98 businesstype, 133 businesstype,
99 turnoverflag, 134 turnoverflag,
100 contrastflag, 135 contrastflag,
  136 + barcode,
101 create_by, 137 create_by,
102 create_date, 138 create_date,
103 update_by, 139 update_by,
104 - update_date 140 + update_date,
  141 + isvalid
105 ) VALUES ( 142 ) VALUES (
106 #{massageId}, 143 #{massageId},
107 #{id}, 144 #{id},
@@ -109,8 +146,8 @@ @@ -109,8 +146,8 @@
109 #{trailerLicenseNo}, 146 #{trailerLicenseNo},
110 #{masterList}, 147 #{masterList},
111 #{prodectTime}, 148 #{prodectTime},
112 - #{returnmessage},  
113 #{agentno}, 149 #{agentno},
  150 + #{isDelete},
114 #{agentname}, 151 #{agentname},
115 #{cocode}, 152 #{cocode},
116 #{drivername}, 153 #{drivername},
@@ -123,10 +160,12 @@ @@ -123,10 +160,12 @@
123 #{businesstype}, 160 #{businesstype},
124 #{turnoverflag}, 161 #{turnoverflag},
125 #{contrastflag}, 162 #{contrastflag},
  163 + #{barcode},
126 #{createBy.id}, 164 #{createBy.id},
127 #{createDate}, 165 #{createDate},
128 #{updateBy.id}, 166 #{updateBy.id},
129 - #{updateDate} 167 + #{updateDate},
  168 + #{isvalid}
130 ) 169 )
131 </insert> 170 </insert>
132 171
@@ -137,8 +176,8 @@ @@ -137,8 +176,8 @@
137 trailer_license_no = #{trailerLicenseNo}, 176 trailer_license_no = #{trailerLicenseNo},
138 master_list = #{masterList}, 177 master_list = #{masterList},
139 prodect_time = #{prodectTime}, 178 prodect_time = #{prodectTime},
140 - returnmessage = #{returnmessage},  
141 agentno = #{agentno}, 179 agentno = #{agentno},
  180 + is_delete = #{isDelete},
142 agentname = #{agentname}, 181 agentname = #{agentname},
143 cocode = #{cocode}, 182 cocode = #{cocode},
144 drivername = #{drivername}, 183 drivername = #{drivername},
@@ -151,8 +190,10 @@ @@ -151,8 +190,10 @@
151 businesstype = #{businesstype}, 190 businesstype = #{businesstype},
152 turnoverflag = #{turnoverflag}, 191 turnoverflag = #{turnoverflag},
153 contrastflag = #{contrastflag}, 192 contrastflag = #{contrastflag},
  193 + barcode = #{barcode},
154 update_by = #{updateBy.id}, 194 update_by = #{updateBy.id},
155 - update_date = #{updateDate} 195 + update_date = #{updateDate},
  196 + isvalid = #{isvalid}
156 WHERE id = #{id} 197 WHERE id = #{id}
157 </update> 198 </update>
158 199
@@ -160,5 +201,5 @@ @@ -160,5 +201,5 @@
160 DELETE FROM land_businesstype_list 201 DELETE FROM land_businesstype_list
161 WHERE id = #{id} 202 WHERE id = #{id}
162 </update> 203 </update>
163 - 204 +
164 </mapper> 205 </mapper>
@@ -64,7 +64,12 @@ @@ -64,7 +64,12 @@
64 a.belong_org_princinal AS "belongOrgPrincinal", 64 a.belong_org_princinal AS "belongOrgPrincinal",
65 a.belong_org_phone AS "belongOrgPhone", 65 a.belong_org_phone AS "belongOrgPhone",
66 a.operayion_type_belong AS "operayionTypeBelong", 66 a.operayion_type_belong AS "operayionTypeBelong",
67 - a.returnmessage AS "returnmessage" 67 + a.returnmessage AS "returnmessage",
  68 + a.id AS "id",
  69 + a.create_by AS "createBy.id",
  70 + a.create_date AS "createDate",
  71 + a.update_by AS "updateBy.id",
  72 + a.update_date AS "updateDate"
68 </sql> 73 </sql>
69 74
70 <sql id="landCorporationInfoJoins"> 75 <sql id="landCorporationInfoJoins">
@@ -84,13 +89,19 @@ @@ -84,13 +89,19 @@
84 FROM land_corporation_info a 89 FROM land_corporation_info a
85 <include refid="landCorporationInfoJoins"/> 90 <include refid="landCorporationInfoJoins"/>
86 <where> 91 <where>
87 - 92 + <if test='coCode !="1" and coCode !=null and coCode !=""'>
  93 + co_code = #{coCode}
  94 + </if>
  95 + <if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>
  96 + create_by = #{createBy.id}
  97 + </if>
88 </where> 98 </where>
89 <choose> 99 <choose>
90 <when test="page !=null and page.orderBy != null and page.orderBy != ''"> 100 <when test="page !=null and page.orderBy != null and page.orderBy != ''">
91 ORDER BY ${page.orderBy} 101 ORDER BY ${page.orderBy}
92 </when> 102 </when>
93 <otherwise> 103 <otherwise>
  104 + ORDER BY a.update_date DESC
94 </otherwise> 105 </otherwise>
95 </choose> 106 </choose>
96 </select> 107 </select>
@@ -108,6 +119,7 @@ @@ -108,6 +119,7 @@
108 ORDER BY ${page.orderBy} 119 ORDER BY ${page.orderBy}
109 </when> 120 </when>
110 <otherwise> 121 <otherwise>
  122 + ORDER BY a.update_date DESC
111 </otherwise> 123 </otherwise>
112 </choose> 124 </choose>
113 </select> 125 </select>
@@ -175,7 +187,12 @@ @@ -175,7 +187,12 @@
175 belong_org_princinal, 187 belong_org_princinal,
176 belong_org_phone, 188 belong_org_phone,
177 operayion_type_belong, 189 operayion_type_belong,
178 - returnmessage 190 + returnmessage,
  191 + id,
  192 + create_by,
  193 + create_date,
  194 + update_by,
  195 + update_date
179 ) VALUES ( 196 ) VALUES (
180 #{eportId}, 197 #{eportId},
181 #{coCode}, 198 #{coCode},
@@ -238,7 +255,12 @@ @@ -238,7 +255,12 @@
238 #{belongOrgPrincinal}, 255 #{belongOrgPrincinal},
239 #{belongOrgPhone}, 256 #{belongOrgPhone},
240 #{operayionTypeBelong}, 257 #{operayionTypeBelong},
241 - #{returnmessage} 258 + #{returnmessage},
  259 + #{id},
  260 + #{createBy.id},
  261 + #{createDate},
  262 + #{updateBy.id},
  263 + #{updateDate}
242 ) 264 )
243 </insert> 265 </insert>
244 266
@@ -305,7 +327,9 @@ @@ -305,7 +327,9 @@
305 belong_org_princinal = #{belongOrgPrincinal}, 327 belong_org_princinal = #{belongOrgPrincinal},
306 belong_org_phone = #{belongOrgPhone}, 328 belong_org_phone = #{belongOrgPhone},
307 operayion_type_belong = #{operayionTypeBelong}, 329 operayion_type_belong = #{operayionTypeBelong},
308 - returnmessage = #{returnmessage} 330 + returnmessage = #{returnmessage},
  331 + update_by = #{updateBy.id},
  332 + update_date = #{updateDate}
309 WHERE id = #{id} 333 WHERE id = #{id}
310 </update> 334 </update>
311 335
@@ -51,7 +51,12 @@ @@ -51,7 +51,12 @@
51 FROM land_road_dr_record a 51 FROM land_road_dr_record a
52 <include refid="landRoadDrRecordJoins"/> 52 <include refid="landRoadDrRecordJoins"/>
53 <where> 53 <where>
54 - 54 + <if test='idCard !="1" and idCard !=null and idCard !=""'>
  55 + id_card = #{idCard}
  56 + </if>
  57 + <if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>
  58 + create_by = #{createBy.id}
  59 + </if>
55 </where> 60 </where>
56 <choose> 61 <choose>
57 <when test="page !=null and page.orderBy != null and page.orderBy != ''"> 62 <when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -62,6 +67,28 @@ @@ -62,6 +67,28 @@
62 </otherwise> 67 </otherwise>
63 </choose> 68 </choose>
64 </select> 69 </select>
  70 + <select id="findList2" resultType="LandRoadDrRecord" parameterType="String">
  71 + SELECT
  72 + <include refid="landRoadDrRecordColumns"/>
  73 + FROM land_road_dr_record a
  74 + <include refid="landRoadDrRecordJoins"/>
  75 + <where>
  76 + <if test='createBy =="1"'>
  77 +
  78 + </if>
  79 + <if test='createBy !="1" and createBy !=null and createBy !=""'>
  80 + create_by = #{createBy}
  81 + </if>
  82 + </where>
  83 + <choose>
  84 + <!-- <when test="page !=null and page.orderBy != null and page.orderBy != ''">
  85 + ORDER BY ${page.orderBy}
  86 + </when> -->
  87 + <otherwise>
  88 + ORDER BY a.update_date DESC
  89 + </otherwise>
  90 + </choose>
  91 + </select>
65 92
66 <select id="findAllList" resultType="LandRoadDrRecord"> 93 <select id="findAllList" resultType="LandRoadDrRecord">
67 SELECT 94 SELECT
@@ -41,7 +41,12 @@ @@ -41,7 +41,12 @@
41 FROM land_road_trailer_record a 41 FROM land_road_trailer_record a
42 <include refid="landRoadTrailerRecordJoins"/> 42 <include refid="landRoadTrailerRecordJoins"/>
43 <where> 43 <where>
44 - 44 + <if test='trailerLicenseNo !="1" and trailerLicenseNo !=null and trailerLicenseNo !=""'>
  45 + trailer_license_no = #{trailerLicenseNo}
  46 + </if>
  47 + <if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>
  48 + create_by = #{createBy.id}
  49 + </if>
45 </where> 50 </where>
46 <choose> 51 <choose>
47 <when test="page !=null and page.orderBy != null and page.orderBy != ''"> 52 <when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -62,9 +67,9 @@ @@ -62,9 +67,9 @@
62 67
63 </where> 68 </where>
64 <choose> 69 <choose>
65 - <when test="page !=null and page.orderBy != null and page.orderBy != ''"> 70 + <!-- <when test="page !=null and page.orderBy != null and page.orderBy != ''">
66 ORDER BY ${page.orderBy} 71 ORDER BY ${page.orderBy}
67 - </when> 72 + </when> -->
68 <otherwise> 73 <otherwise>
69 ORDER BY a.update_date DESC 74 ORDER BY a.update_date DESC
70 </otherwise> 75 </otherwise>
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
57 a.foreign_license_pic AS "foreignLicensePic", 57 a.foreign_license_pic AS "foreignLicensePic",
58 a.nationality AS "nationality", 58 a.nationality AS "nationality",
59 a.returnmessage AS "returnmessage", 59 a.returnmessage AS "returnmessage",
  60 + a.barcode AS "barcode",
60 a.id AS "id", 61 a.id AS "id",
61 a.create_by AS "createBy.id", 62 a.create_by AS "createBy.id",
62 a.create_date AS "createDate", 63 a.create_date AS "createDate",
@@ -81,7 +82,12 @@ @@ -81,7 +82,12 @@
81 FROM land_road_ve_record a 82 FROM land_road_ve_record a
82 <include refid="landRoadVeRecordJoins"/> 83 <include refid="landRoadVeRecordJoins"/>
83 <where> 84 <where>
84 - 85 + <if test='domesticLisenceNo !="1" and domesticLisenceNo !=null and domesticLisenceNo !=""'>
  86 + domestic_lisence_no = #{domesticLisenceNo}
  87 + </if>
  88 + <if test='createBy.id !="1" and createBy.id !=null and createBy.id !=""'>
  89 + create_by = #{createBy.id}
  90 + </if>
85 </where> 91 </where>
86 <choose> 92 <choose>
87 <when test="page !=null and page.orderBy != null and page.orderBy != ''"> 93 <when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -92,6 +98,9 @@ @@ -92,6 +98,9 @@
92 </otherwise> 98 </otherwise>
93 </choose> 99 </choose>
94 </select> 100 </select>
  101 + <select id="selectByFrameNo" parameterType="java.lang.String" resultType="LandRoadVeRecord">
  102 + SELECT * FROM land_road_ve_record WHERE domestic_lisence_no = #{domesticLisenceNo}
  103 + </select>
95 104
96 <select id="findAllList" resultType="LandRoadVeRecord"> 105 <select id="findAllList" resultType="LandRoadVeRecord">
97 SELECT 106 SELECT
@@ -111,6 +120,7 @@ @@ -111,6 +120,7 @@
111 </choose> 120 </choose>
112 </select> 121 </select>
113 122
  123 +
114 <insert id="insert"> 124 <insert id="insert">
115 INSERT INTO land_road_ve_record( 125 INSERT INTO land_road_ve_record(
116 eport_id, 126 eport_id,
@@ -167,6 +177,7 @@ @@ -167,6 +177,7 @@
167 foreign_license_pic, 177 foreign_license_pic,
168 nationality, 178 nationality,
169 returnmessage, 179 returnmessage,
  180 + barcode,
170 id, 181 id,
171 create_by, 182 create_by,
172 create_date, 183 create_date,
@@ -227,6 +238,7 @@ @@ -227,6 +238,7 @@
227 #{foreignLicensePic}, 238 #{foreignLicensePic},
228 #{nationality}, 239 #{nationality},
229 #{returnmessage}, 240 #{returnmessage},
  241 + #{barcode},
230 #{id}, 242 #{id},
231 #{createBy.id}, 243 #{createBy.id},
232 #{createDate}, 244 #{createDate},
@@ -291,6 +303,7 @@ @@ -291,6 +303,7 @@
291 foreign_license_pic = #{foreignLicensePic}, 303 foreign_license_pic = #{foreignLicensePic},
292 nationality = #{nationality}, 304 nationality = #{nationality},
293 returnmessage = #{returnmessage}, 305 returnmessage = #{returnmessage},
  306 + barcode = #{barcode},
294 update_by = #{updateBy.id}, 307 update_by = #{updateBy.id},
295 update_date = #{updateDate} 308 update_date = #{updateDate}
296 WHERE id = #{id} 309 WHERE id = #{id}
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </sql> 10 </sql>
11 11
12 <sql id="bayonetJoins"> 12 <sql id="bayonetJoins">
13 - JOIN yard b ON b.id = a.yard_id 13 + JOIN yard b ON b.stationid = a.yard_id
14 </sql> 14 </sql>
15 15
16 <select id="get" resultType="Bayonet"> 16 <select id="get" resultType="Bayonet">
@@ -21,6 +21,22 @@ @@ -21,6 +21,22 @@
21 WHERE a.id = #{id} 21 WHERE a.id = #{id}
22 </select> 22 </select>
23 23
  24 + <select id="findByYardId" resultType="Bayonet" parameterType="String">
  25 + SELECT
  26 + <include refid="bayonetColumns"/>
  27 + FROM bayonet a
  28 + <include refid="bayonetJoins"/>
  29 + WHERE a.yard_id = #{yardId}
  30 + </select>
  31 +
  32 + <select id="findByYardAndName" resultType="Bayonet" parameterType="String">
  33 + SELECT
  34 + <include refid="bayonetColumns"/>
  35 + FROM bayonet a
  36 + <include refid="bayonetJoins"/>
  37 + WHERE a.yard_id = #{yardId} and a.name = #{name}
  38 + </select>
  39 +
24 <select id="findList" resultType="Bayonet"> 40 <select id="findList" resultType="Bayonet">
25 SELECT 41 SELECT
26 <include refid="bayonetColumns"/> 42 <include refid="bayonetColumns"/>
@@ -5,6 +5,8 @@ @@ -5,6 +5,8 @@
5 <sql id="yardColumns"> 5 <sql id="yardColumns">
6 a.id AS "id", 6 a.id AS "id",
7 a.name AS "name", 7 a.name AS "name",
  8 + a.area_code AS "areaCode",
  9 + a.stationid AS "stationid",
8 a.customs_code AS "customsCode", 10 a.customs_code AS "customsCode",
9 a.create_by AS "createBy.id", 11 a.create_by AS "createBy.id",
10 a.create_date AS "createDate", 12 a.create_date AS "createDate",
@@ -24,6 +26,14 @@ @@ -24,6 +26,14 @@
24 <include refid="yardJoins"/> 26 <include refid="yardJoins"/>
25 WHERE a.id = #{id} 27 WHERE a.id = #{id}
26 </select> 28 </select>
  29 +
  30 + <select id="findByStaionId" resultType="Yard" parameterType="String">
  31 + SELECT
  32 + <include refid="yardColumns"/>
  33 + FROM yard a
  34 + <include refid="yardJoins"/>
  35 + WHERE a.stationid = #{stationid}
  36 + </select>
27 37
28 <select id="findList" resultType="Yard"> 38 <select id="findList" resultType="Yard">
29 SELECT 39 SELECT
@@ -74,6 +84,8 @@ @@ -74,6 +84,8 @@
74 INSERT INTO yard( 84 INSERT INTO yard(
75 id, 85 id,
76 name, 86 name,
  87 + area_code,
  88 + stationid,
77 customs_code, 89 customs_code,
78 create_by, 90 create_by,
79 create_date, 91 create_date,
@@ -84,6 +96,8 @@ @@ -84,6 +96,8 @@
84 ) VALUES ( 96 ) VALUES (
85 #{id}, 97 #{id},
86 #{name}, 98 #{name},
  99 + #{areaCode},
  100 + #{stationid},
87 #{customsCode}, 101 #{customsCode},
88 #{createBy.id}, 102 #{createBy.id},
89 #{createDate}, 103 #{createDate},
@@ -97,6 +111,8 @@ @@ -97,6 +111,8 @@
97 <update id="update"> 111 <update id="update">
98 UPDATE yard SET 112 UPDATE yard SET
99 name = #{name}, 113 name = #{name},
  114 + area_code = #{areaCode},
  115 + stationid = #{stationid},
100 customs_code = #{customsCode}, 116 customs_code = #{customsCode},
101 update_by = #{updateBy.id}, 117 update_by = #{updateBy.id},
102 update_date = #{updateDate}, 118 update_date = #{updateDate},
@@ -93,10 +93,10 @@ @@ -93,10 +93,10 @@
93 <bean class="com.thinkgem.jeesite.modules.sys.interceptor.LogInterceptor" /> 93 <bean class="com.thinkgem.jeesite.modules.sys.interceptor.LogInterceptor" />
94 </mvc:interceptor> 94 </mvc:interceptor>
95 <!-- 手机视图拦截器 --> 95 <!-- 手机视图拦截器 -->
96 - <mvc:interceptor> 96 + <!-- <mvc:interceptor>
97 <mvc:mapping path="/**" /> 97 <mvc:mapping path="/**" />
98 <bean class="com.thinkgem.jeesite.modules.sys.interceptor.MobileInterceptor" /> 98 <bean class="com.thinkgem.jeesite.modules.sys.interceptor.MobileInterceptor" />
99 - </mvc:interceptor> 99 + </mvc:interceptor> -->
100 </mvc:interceptors> 100 </mvc:interceptors>
101 101
102 <!-- 支持Shiro对Controller的方法级AOP安全控制 begin--> 102 <!-- 支持Shiro对Controller的方法级AOP安全控制 begin-->
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <!DOCTYPE html> 4 <!DOCTYPE html>
5 <html style="overflow-x:auto;overflow-y:auto;"> 5 <html style="overflow-x:auto;overflow-y:auto;">
6 <head> 6 <head>
7 - <title><sitemesh:title/></title><!-- - Powered By ShangYou --> 7 + <title><sitemesh:title/></title><!-- - Powered By -->
8 <%@include file="/WEB-INF/views/include/head.jsp" %> 8 <%@include file="/WEB-INF/views/include/head.jsp" %>
9 <!-- 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> 9 <!-- 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>
10 <sitemesh:head/> 10 <sitemesh:head/>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <!DOCTYPE html> 4 <!DOCTYPE html>
5 <html style="overflow-x:auto;overflow-y:auto;"> 5 <html style="overflow-x:auto;overflow-y:auto;">
6 <head> 6 <head>
7 - <title><sitemesh:title/> - Powered By ShangYou</title> 7 + <title><sitemesh:title/> - Powered By</title>
8 <%@include file="/WEB-INF/views/include/head.jsp" %> 8 <%@include file="/WEB-INF/views/include/head.jsp" %>
9 <!-- 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> 9 <!-- 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>
10 <sitemesh:head/> 10 <sitemesh:head/>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <!DOCTYPE html> 4 <!DOCTYPE html>
5 <html> 5 <html>
6 <head> 6 <head>
7 - <title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By ShangYou</title> 7 + <title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By</title>
8 <%@include file="/WEB-INF/views/modules/cms/front/include/head.jsp" %> 8 <%@include file="/WEB-INF/views/modules/cms/front/include/head.jsp" %>
9 <!-- 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> 9 <!-- 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>
10 <sitemesh:head/> 10 <sitemesh:head/>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <!DOCTYPE html> 4 <!DOCTYPE html>
5 <html> 5 <html>
6 <head> 6 <head>
7 - <title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By ShangYou</title> 7 + <title><sitemesh:title default="欢迎光临"/> - ${site.title} - Powered By</title>
8 <meta name="viewport" content="width=device-width,height=device-height,inital-scale=1.0,maximum-scale=1.0,user-scalable=no;"> 8 <meta name="viewport" content="width=device-width,height=device-height,inital-scale=1.0,maximum-scale=1.0,user-scalable=no;">
9 <meta name="apple-mobile-web-app-capable" content="yes"> 9 <meta name="apple-mobile-web-app-capable" content="yes">
10 <meta name="apple-mobile-web-app-status-bar-style" content="black"> 10 <meta name="apple-mobile-web-app-status-bar-style" content="black">
@@ -5,9 +5,6 @@ @@ -5,9 +5,6 @@
5 <title>流转管理</title> 5 <title>流转管理</title>
6 <meta name="decorator" content="default" /> 6 <meta name="decorator" content="default" />
7 <script type="text/javascript"> 7 <script type="text/javascript">
8 -  
9 -</script>  
10 -<script type="text/javascript">  
11 $(document).ready(function() { 8 $(document).ready(function() {
12 //$("#name").focus(); 9 //$("#name").focus();
13 $("#inputForm").validate({submitHandler : function(form) { 10 $("#inputForm").validate({submitHandler : function(form) {
@@ -27,63 +24,72 @@ @@ -27,63 +24,72 @@
27 }); 24 });
28 25
29 </script> 26 </script>
30 -<script type="text/javascript">  
31 - $(function(){  
32 - $('input').blur(function(){  
33 - this.value=this.value.toUpperCase();  
34 - });  
35 - })  
36 -</script> 27 +
37 <style type="text/css"> 28 <style type="text/css">
38 - input{  
39 - text-transform:uppercase;  
40 - }  
41 - thead{  
42 - background-color: #eee;  
43 - }  
44 - th,td{  
45 - border:1px solid #ddd;  
46 - } 29 +input {
  30 + text-transform: uppercase;
  31 +}
  32 +
  33 +thead {
  34 + background-color: #eee;
  35 +}
  36 +
  37 +th, td {
  38 + border: 1px solid #ddd;
  39 +}
  40 +.form-horizontal .input-large{
  41 + width:200px;
  42 +}
  43 +.ReadOnly{
  44 + disabled:ture !important;
  45 +}
47 </style> 46 </style>
48 </head> 47 </head>
49 <body> 48 <body>
50 <ul class="nav nav-tabs"> 49 <ul class="nav nav-tabs">
51 - <li><a href="${ctx}/land/landBusinesstypeList/">流转列表</a></li> 50 + <li><a href="${ctx}/land/landBusinesstypeList/">申请列表</a></li>
52 <li class="active"><a 51 <li class="active"><a
53 href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">流转<shiro:hasPermission 52 href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">流转<shiro:hasPermission
54 name="land:landBusinesstypeList:edit">${not empty landBusinesstypeList.id?'修改':'添加'}</shiro:hasPermission> 53 name="land:landBusinesstypeList:edit">${not empty landBusinesstypeList.id?'修改':'添加'}</shiro:hasPermission>
55 <shiro:lacksPermission name="land:landBusinesstypeList:edit">查看</shiro:lacksPermission></a></li> 54 <shiro:lacksPermission name="land:landBusinesstypeList:edit">查看</shiro:lacksPermission></a></li>
56 </ul> 55 </ul>
57 <br /> 56 <br />
  57 + <div class="alert alert-block error_div" style="display: none">
  58 + <button type="button" class="close" data-dismiss="alert">&times;</button>
  59 + <h4>Warning!</h4>
  60 + <p id="error_p"></p>
  61 + </div>
58 <div class="form-horizontal"> 62 <div class="form-horizontal">
59 <div class="control-group"> 63 <div class="control-group">
  64 + <h4>进出场业务申请</h4>
  65 + </div>
  66 + <div class="control-group">
60 <label class="control-label">主单号：</label> 67 <label class="control-label">主单号：</label>
61 <div class="controls"> 68 <div class="controls">
62 - <input type="text" name="coCode" placeholder="请输入主单号，例如172-12341234" autocomplete="off"  
63 - class="input-xlarge" id="putMaster">  
64 - <button class="btn btn-primary" id="select">查询</button> 69 + <input type="text" name="coCode" placeholder="请输入主单号，例如172-12341234"
  70 + autocomplete="off" class="input-xxlarge" id="putMaster">
  71 + <button class="btn btn-primary" id="select">查询</button>
  72 + <span class="help-inline"><font color="red">查询单号前请先选定业务类型</font>
65 </div> 73 </div>
66 <br> 74 <br>
67 <div class="controls"> 75 <div class="controls">
68 - <table>  
69 - <thead>  
70 - <tr background-color="#eee">  
71 - <th width='180px'>操作</th>  
72 - <th width='120px'>航班号</th>  
73 - <th width='120px'>航班日期</th>  
74 - <th width='120px'>航段</th>  
75 - <th width='180px'>主单号</th>  
76 - <th width='60px'>件数</th>  
77 - <th width='80px'>重量</th>  
78 - <th width='80px'>关区</th>  
79 - <th width='150px'>时间</th>  
80 - <th width='80px'>状态</th>  
81 - <th width='80px'>海关状态</th>  
82 - <th width='400px'>回执内容</th>  
83 - </tr>  
84 - </thead>  
85 - <tbody id="tableInfo"></tbody>  
86 - </table> 76 + <table>
  77 + <thead>
  78 + <tr background-color="#eee">
  79 + <th width='180px'>操作</th>
  80 + <th width='120px'>航班号</th>
  81 + <th width='120px'>航班日期</th>
  82 + <th width='120px'>航段</th>
  83 + <th width='180px'>主单号</th>
  84 + <th width='60px'>件数</th>
  85 + <th width='80px'>重量</th>
  86 + <th width='80px'>关区</th>
  87 + <th width='150px'>时间</th>
  88 + <th width='400px'>回执内容</th>
  89 + </tr>
  90 + </thead>
  91 + <tbody id="tableInfo"></tbody>
  92 + </table>
87 </div> 93 </div>
88 </div> 94 </div>
89 </div> 95 </div>
@@ -92,37 +98,23 @@ @@ -92,37 +98,23 @@
92 class="form-horizontal"> 98 class="form-horizontal">
93 <form:hidden path="id" /> 99 <form:hidden path="id" />
94 <sys:message content="${message}" /> 100 <sys:message content="${message}" />
95 -  
96 <div class="control-group"> 101 <div class="control-group">
97 <label class="control-label">车牌号：</label> 102 <label class="control-label">车牌号：</label>
98 <div class="controls"> 103 <div class="controls">
99 - <form:input path="trailerFrameNo" htmlEscape="false" maxlength="32"  
100 - class="input-xlarge required" />  
101 - <span class="help-inline"><font color="red">*</font></span>  
102 - </div>  
103 - </div>  
104 - <div class="control-group">  
105 - <label class="control-label">车架号：</label>  
106 - <div class="controls">  
107 - <form:input path="trailerLicenseNo" htmlEscape="false"  
108 - maxlength="64" class="input-xxlarge required" />  
109 - <span class="help-inline"><font color="red">*</font></span> 104 + <form:select path="trailerFrameNo" htmlEscape="false" maxlength="64" class="input-xlarge required" id="frameNo" >
  105 + <form:option value="" label="--请选择--" />
  106 + <form:options items="${veList}" itemLabel="domesticLisenceNo" itemValue="domesticLisenceNo" htmlEscape="false" />
  107 + </form:select>
  108 + <span class="help-inline"><font color="red">*</font></span>
  109 + <span class="help-inline" id="message" style="color: red"></span>
110 </div> 110 </div>
111 </div> 111 </div>
112 - <div class="control-group">  
113 112
114 - <br>  
115 - <label class="control-label">主单列表：</label>  
116 - <div class="controls">  
117 - <form:textarea path="masterList" rows="5" maxlength="1000"  
118 - class="input-xxlarge textarea" />  
119 - </div>  
120 - </div>  
121 <div class="control-group"> 113 <div class="control-group">
122 <label class="control-label">申请时间：</label> 114 <label class="control-label">申请时间：</label>
123 <div class="controls"> 115 <div class="controls">
124 <input name="prodectTime" type="text" readonly="readonly" 116 <input name="prodectTime" type="text" readonly="readonly"
125 - maxlength="20" class="input-medium Wdate " 117 + maxlength="20" class="input-xlarge Wdate "
126 value="<fmt:formatDate value="${landBusinesstypeList.prodectTime}" pattern="yyyy-MM-dd HH:mm:ss"/>" 118 value="<fmt:formatDate value="${landBusinesstypeList.prodectTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
127 onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" /> 119 onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
128 </div> 120 </div>
@@ -131,166 +123,321 @@ @@ -131,166 +123,321 @@
131 <label class="control-label">所在企业代码：</label> 123 <label class="control-label">所在企业代码：</label>
132 <div class="controls"> 124 <div class="controls">
133 <form:input path="cocode" htmlEscape="false" maxlength="32" 125 <form:input path="cocode" htmlEscape="false" maxlength="32"
134 - class="input-xlarge " /> 126 + class="input-xlarge " id="cocode" />
  127 + <span class="help-inline"><font color="red">*</font></span>
135 </div> 128 </div>
136 </div> 129 </div>
137 <div class="control-group"> 130 <div class="control-group">
138 - <label class="control-label">货代代码：</label>  
139 - <label class="control-label">  
140 - <form:input path="agentno" htmlEscape="false" maxlength="32" class="input-large required" />  
141 - </label>  
142 - <label class="control-label">货代名称：</label>  
143 - <label class="control-label">  
144 - <form:input path="agentname" htmlEscape="false" maxlength="255" class="input-large " />  
145 - </label> 131 + <div class="row-fluid">
  132 + <div class="span12">
  133 + <div class="span6">
  134 + <label class="control-label">货代代码：</label>
  135 + <div class="controls">
  136 + <form:input path="agentno" htmlEscape="false" maxlength="32"
  137 + class="input-xlarge" id="agentno" style="disabled:true"/>
  138 + </div>
  139 + </div>
  140 + <div class="span6">
  141 + <label class="control-label">货代名称：</label>
  142 + <div class="controls">
  143 + <form:input path="agentname" htmlEscape="false" maxlength="255"
  144 + class="input-xlarge" id="agentName" />
  145 + </div>
  146 + </div>
  147 + </div>
  148 + </div>
146 </div> 149 </div>
147 <div class="control-group"> 150 <div class="control-group">
148 - <label class="control-label">驾驶员ID：</label>  
149 - <label class="control-label">  
150 - <form:input path="driverid" htmlEscape="false" maxlength="32" class="input-large required" />  
151 - </label>  
152 - <label class="control-label">驾驶员姓名：</label>  
153 - <label class="control-label">  
154 - <form:input path="drivername" htmlEscape="false" maxlength="32" class="input-large " />  
155 - </label> 151 + <div class="row-fluid">
  152 + <div class="span12">
  153 + <div class="span6">
  154 + <label class="control-label">驾驶员ID：</label>
  155 + <div class="controls">
  156 + <form:input path="driverid" htmlEscape="false" maxlength="32"
  157 + class="input-xlarge" id="driverid" />
  158 + </div>
  159 + </div>
  160 + <div class="span6">
  161 + <label class="control-label">驾驶员姓名：</label>
  162 + <div class="controls">
  163 + <form:input path="drivername" htmlEscape="false" maxlength="32"
  164 + class="input-xlarge " id="drivername" />
  165 + </div>
  166 + </div>
  167 + </div>
  168 + </div>
156 </div> 169 </div>
157 <div class="control-group"> 170 <div class="control-group">
158 - <label class="control-label">起始海关代码：</label>  
159 - <label class="control-label">  
160 - <form:select path="startport" class="input-large ">  
161 - <form:option value="" label="" />  
162 - <form:option value="4604" label="4604" />  
163 - <form:option value="4613" label="4613" />  
164 - <form:option value="4620" label="4620" />  
165 -  
166 - </form:select>  
167 - </label>  
168 - <label class="control-label">目的关区代码：</label>  
169 - <label class="control-label">  
170 - <form:select path="endport" class="input-large ">  
171 - <form:option value="" label="" />  
172 - <form:option value="4604" label="4604" />  
173 - <form:option value="4613" label="4613" />  
174 - <form:option value="4620" label="4620" />  
175 - </form:select>  
176 - </label> 171 + <div class="row-fluid">
  172 + <div class="span12">
  173 + <div class="span6">
  174 + <label class="control-label">起始海关代码：</label>
  175 + <div class="controls">
  176 + <form:select path="startport" class="input-xlarge ">
  177 + <form:option value="" label="--请选择--" />
  178 + <form:option value="4604" label="4604" />
  179 + <form:option value="4613" label="4613" />
  180 + <form:option value="4620" label="4620" />
  181 + </form:select>
  182 + <span class="help-inline"><font color="red">流转业务填写，其他业务可不填写</font></span>
  183 + </div>
  184 + </div>
  185 + <div class="span6">
  186 + <label class="control-label">目的关区代码：</label>
  187 + <div class="controls">
  188 + <form:select path="endport" class="input-xlarge ">
  189 + <form:option value="" label="--请选择--" />
  190 + <form:option value="4604" label="4604" />
  191 + <form:option value="4613" label="4613" />
  192 + <form:option value="4620" label="4620" />
  193 + </form:select>
  194 + </div>
  195 + </div>
  196 + </div>
  197 + </div>
177 </div> 198 </div>
  199 +
178 <div class="control-group"> 200 <div class="control-group">
179 - <label class="control-label">起始场站：</label>  
180 - <label class="control-label">  
181 - <form:select path="startsatation" class="input-large ">  
182 - <form:option value="" label="" />  
183 - <form:options items="${yardList}" itemLabel="name" itemValue="name"  
184 - htmlEscape="false" />  
185 - </form:select>  
186 - </label>  
187 - <label class="control-label">目的场站：</label>  
188 - <label class="control-label">  
189 - <form:select path="endstation" class="input-large ">  
190 - <form:option value="" label="" />  
191 - <form:options items="${yardList}" itemLabel="name" itemValue="name"  
192 - htmlEscape="false" />  
193 - </form:select>  
194 - </label> 201 + <div class="row-fluid">
  202 + <div class="span12">
  203 + <div class="span6">
  204 + <label class="control-label">起始场站：</label>
  205 + <div class="controls">
  206 + <form:select path="startsatation" class="input-xlarge"
  207 + id="st_select">
  208 + <form:option value="" label="--请选择--" />
  209 + <form:options items="${yardList}" itemLabel="name"
  210 + itemValue="stationid" htmlEscape="false" />
  211 + </form:select>
  212 + <span class="help-inline"><font color="red">流转业务填写，其他业务可不填写</font></span>
  213 + </div>
  214 + </div>
  215 + <div class="span6">
  216 + </label> <label class="control-label">目的场站：</label>
  217 + <div class="controls">
  218 + <form:select path="endstation" class="input-xlarge" id="en_select">
  219 + <form:option value="" label="--请选择--" />
  220 + <form:options items="${yardList}" itemLabel="name"
  221 + itemValue="stationid" htmlEscape="false" />
  222 + </form:select>
  223 + </div>
  224 + </div>
  225 + </div>
  226 + </div>
195 </div> 227 </div>
196 <div class="control-group"> 228 <div class="control-group">
197 - <label class="control-label">通道/卡口：</label>  
198 - <label class="control-label">  
199 - <form:select path="aisle" class="input-large ">  
200 - <form:option value="" label="" />  
201 - <form:options items="${bayonets}" itemLabel="name" itemValue="name"  
202 - htmlEscape="false" />  
203 - </form:select>  
204 - </label>  
205 - <label class="control-label">业务类型：</label>  
206 - <label class="control-label">  
207 - <form:select path="businesstype" class="input-large ">  
208 - <form:option value="" label="" />  
209 - <form:option value="进口提货" label="进口提货" />  
210 - <form:option value="出口拉货" label="出口拉货" />  
211 - <form:option value="货物流转" label="货物流转" />  
212 - <form:option value="分拨分流" label="分拨分流" />  
213 - </form:select>  
214 - </label> 229 + <div class="row-fluid">
  230 + <div class="span12">
  231 + <div class="span6">
  232 + <label class="control-label">目的场站通道/卡口：</label>
  233 + <div class="controls">
  234 + <form:select path="aisle" class="input-xlarge" id="aisle">
  235 + <form:option value="" label="--请选择--" />
  236 + <form:options items="${bayonets}" itemLabel="name"
  237 + itemValue="channel" htmlEscape="false" />
  238 + </form:select>
  239 + </div>
  240 + </div>
  241 + <div class="span6">
  242 + <label class="control-label">业务类型：</label>
  243 + <div class="controls">
  244 + <form:select path="businesstype" class="input-xlarge" id="ieType">
  245 + <form:option value="" label="--请选择--" />
  246 + <form:option value="进口提货" label="进口提货" />
  247 + <form:option value="出口送货" label="出口送货" />
  248 + <form:option value="进口流转" label="进口流转" />
  249 + <form:option value="出口流转" label="出口流转" />
  250 + </form:select>
  251 + </div>
  252 + </div>
  253 + </div>
  254 + </div>
215 </div> 255 </div>
216 <div class="control-group"> 256 <div class="control-group">
217 <label class="control-label">进出场：</label> 257 <label class="control-label">进出场：</label>
218 - <label class="control-label">  
219 - <form:select path="turnoverflag" class="input-xlarge ">  
220 - <form:option value="" label="" />  
221 - <form:option value="进场站" label="进场站" />  
222 - <form:option value="进场站" label="出场站" /> 258 + <div class="controls">
  259 + <form:select path="turnoverflag" class="input-xlarge">
  260 + <form:option value="" label="--请选择--" />
  261 + <form:option value="I" label="进场站" selected = "selected"/>
  262 + <form:option value="E" label="出场站"/>
223 </form:select> 263 </form:select>
224 - </label> 264 + <span class="help-inline"><font color="red">无需改动</font></span>
  265 + </div>
  266 + </div>
  267 + <div class="control-group">
  268 + <label class="control-label">主单列表：</label>
  269 + <div class="controls">
  270 + <form:textarea path="masterList" rows="5" maxlength="1000"
  271 + placeholder="请输入主单号，例如172-12341234，多个单号以“,”（英文）分割"
  272 + class="input-xxlarge textarea" />
  273 + </div>
225 </div> 274 </div>
226 - <span class="help-inline"><font color="red" >注：页面内容请全部填写(主单列表可空)</font></span>  
227 <div class="form-actions"> 275 <div class="form-actions">
228 <shiro:hasPermission name="land:landBusinesstypeList:edit"> 276 <shiro:hasPermission name="land:landBusinesstypeList:edit">
229 <input id="btnSubmit" class="btn btn-primary" type="submit" 277 <input id="btnSubmit" class="btn btn-primary" type="submit"
230 - value="保 存" />&nbsp;</shiro:hasPermission> 278 + value="保 存" />&nbsp;
  279 + </shiro:hasPermission>
231 <input id="btnCancel" class="btn" type="button" value="返 回" 280 <input id="btnCancel" class="btn" type="button" value="返 回"
232 onclick="history.go(-1)" /> 281 onclick="history.go(-1)" />
233 </div> 282 </div>
234 </form:form> 283 </form:form>
  284 + <style>
  285 + </style>
  286 + <script type="text/javascript">
  287 + $(function(){
  288 + $('input').blur(function(){
  289 + this.value=this.value.toUpperCase();
  290 + });
  291 + $(".input-xlarge").each(function(){
  292 + if($(this).val()!==null){
  293 + // $(this).attr("disabled","true");
  294 + }
  295 + });
  296 + })
  297 + $("#frameNo").change(function(){
  298 + var frameNo = $("#frameNo").val();
  299 + if(frameNo !=null && frameNo !="" ){
  300 + $.ajax({
  301 + type:"post",
  302 + url:"${ctx}/land/landBusinesstypeList/check",
  303 + data:{frameNo:frameNo},
  304 + dataType:"json",
  305 + success:function(data){
  306 + var index = data.html.lastIndexOf(">");
  307 + var str = data.html.substring(index + 1, data.html.length);
  308 + if(data.list !=undefined){
  309 + $("#agentName").val(data.list[0].agentname)
  310 + $("#agentno").val(data.list[0].agentno)
  311 + $("#driverid").val(data.list[0].driverid)
  312 + $("#drivername").val(data.list[0].drivername)
  313 + $("#cocode").val(data.list[0].coCode)
  314 + }
  315 + if(data.list ==undefined){
  316 + $("#agentName").val("");
  317 + $("#agentno").val("");
  318 + $("#driverid").val("");
  319 + $("#drivername").val("");
  320 + $("#cocode").val("");
  321 + }
  322 + $("#message").html(str);
  323 + },
  324 + error:function(data){
  325 + $(".error_div").css("display","block");
  326 + $("#error_p").html(data.message);
  327 + }
  328 + })
  329 + }
  330 +
  331 + })
  332 + $("#en_select").change(function(){
  333 + var st_select = $("#en_select").val();
  334 + $.ajax({
  335 + type:"post",
  336 + url:"${ctx}/land/landBusinesstypeList/option",
  337 + data:{st_select,st_select},
  338 + dataType:"json",
  339 + success:function(data){
  340 + $("#aisle").val("");
  341 + $("#aisle").empty();
  342 + for(var i=0;i<data.list.length;i++){
  343 + var option = document.createElement("option");
  344 + $(option).val(data.list[i].channel);
  345 + $(option).text(data.list[i].name);
  346 + $("#aisle").append(option);
  347 + }
  348 + },
  349 + error:function(data){
  350 + $(".error_div").css("display","block");
  351 + $("#error_p").html(data);
  352 + }
  353 + })
  354 + })
  355 +
  356 + </script>
235 <script type="text/javascript"> 357 <script type="text/javascript">
236 $("#putMaster").blur(function(){ 358 $("#putMaster").blur(function(){
237 var master = $("#putMaster").val(); 359 var master = $("#putMaster").val();
238 var str = parseInt(master.substring(4,11)); 360 var str = parseInt(master.substring(4,11));
239 var endStr = parseInt(master.substring(11)); 361 var endStr = parseInt(master.substring(11));
240 if(str%7 != endStr){ 362 if(str%7 != endStr){
241 - alert("输入主单号不符合模七校验"); 363 + $(".error_div").css("display","block");
  364 + $("#error_p").html("输入主单号不符合模七校验");
  365 + $("#putMaster").val(" ");
242 } 366 }
243 }) 367 })
244 -  
245 $("#select").click(function(){ 368 $("#select").click(function(){
246 var masterNum = $("#putMaster").val(); 369 var masterNum = $("#putMaster").val();
247 - console.log(masterNum)  
248 - $.ajax({  
249 - url:'',  
250 - type:'POST',  
251 - data:JSON.stringify(masterNum.field),  
252 - contentType:"application/json",  
253 - dataType:'json',  
254 - cache:false,  
255 - success:function(data){  
256 - $("#tableInfo").find('tr').remove()  
257 - $each(result,function(index,val){  
258 - var tr = $([  
259 - '<tr >',  
260 - '<td><button class="layui-btn layui-btn-mini layui-btn" onclick="addData(this)">添加</button></td>',  
261 - '<td>b</td>',  
262 - '<td>等待上传</td>',  
263 - '<td>bb</td>',  
264 - '<td id="master">172-32021230</td>',  
265 - '<td>bb</td>',  
266 - '<td>bb</td>',  
267 - '<td>bb</td>',  
268 - '<td>bb</td>',  
269 - '<td>bb</td>',  
270 - '<td>bb</td>',  
271 - '<td>bb</td>',  
272 - '<td></td>',  
273 - '</tr>']  
274 - .join(''));  
275 - $("#tableInfo").append(tr);  
276 - })  
277 -  
278 - },  
279 - error:function(data){  
280 - alert("查询失败");  
281 - }  
282 - })  
283 - 370 + var ieType=$("#ieType").val();
  371 +
  372 + if(ieType=="进口提货" | ieType=="进口流转" ){
  373 + ieType="I";
  374 + }else if(ieType=="出口送货" | ieType=="出口流转"){
  375 + ieType="E";
  376 + }
  377 + var url = 'http://tjfx.15miaoo.com:8003/tj/orig/orig';
  378 + var xhr = new XMLHttpRequest();
  379 + // 访问nginx中的代理服务器
  380 + xhr.open('get', url+'?waybill='+masterNum+'&imp='+ieType, true);
  381 + xhr.send();
  382 + xhr.onreadystatechange = function(){
  383 + if(xhr.readyState == 4){
  384 + if(xhr.status ==200){
  385 + var flightNo = "";
  386 + var flightDate = "";
  387 + var data = JSON.parse(xhr.responseText);
  388 + if(ieType=="I"){
  389 + flightNo = data[0].flightno;
  390 + flightDate = timeFormat(data[0].flightDate).substring(0,10);
  391 + }else{
  392 + flightNo = data[0].carrier+data[0].flightno
  393 + flightDate = timeFormat(data[0].flightdate).substring(0,10)
  394 + }
  395 + $("#tableInfo").children("tr").remove();
  396 + var str = '<tr>'+
  397 + '<td><button class="btn btn-primary" onclick="addData(this);">添加</button></td>'+
  398 + '<td>'+flightNo+'</td>'+
  399 + '<td>'+flightDate+'</td>'+
  400 + '<td>'+data[0].originatingstation+"-"+data[0].destinationstation+'</td>'+
  401 + '<td>'+data[0].waybillnomaster+'</td>'+
  402 + '<td>'+data[0].totalpiece +'</td>'+
  403 + '<td>'+data[0].totalweight +'</td>'+
  404 + '<td>'+data[0].customscode+'</td>'+
  405 + '<td>'+timeFormat(data[0].createdate) +'</td>'+
  406 + '<td>'+data[0].receiptinformation +'</td>'+
  407 + '</tr>';
  408 + $("#tableInfo").append(str);
  409 + }
  410 + }
  411 + }
  412 +
284 }) 413 })
285 - function addData(){  
286 - var master = $("#master").html();  
287 - var data = $(".textarea").val();  
288 - if(data.length==0){  
289 - $(".textarea").val(data+master);  
290 - }else{  
291 - $(".textarea").val(data+','+master);  
292 - } 414 +
  415 + function addData(btn){
  416 + var tr = btn.parentNode.parentNode;
  417 + var master = (tr.getElementsByTagName("td")[4]).innerText;
  418 + var data = $(".textarea").val();
  419 + if(data.length==0){
  420 + $(".textarea").val(data+master);
  421 + }else{
  422 + $(".textarea").val(data+','+master);
293 } 423 }
  424 + }
  425 + function timeFormat(d) {
  426 + var date = new Date(d);
  427 + var y = date.getFullYear();
  428 + var m = date.getMonth() + 1;
  429 + m = m < 10 ? '0' + m : m;
  430 + var d = date.getDate();
  431 + d = d < 10 ? ("0" + d) : d;
  432 + var hours = date.getHours();
  433 + hours = hours < 10 ? '0' + hours : hours;
  434 + var minutes = date.getMinutes();
  435 + minutes = minutes < 10 ? '0' + minutes : minutes;
  436 + var second = date.getSeconds();
  437 + second = second < 10 ? '0' + second : second;
  438 + return y + "-" + m + "-" + d + " " + hours + ":" + minutes + ":" + second;
  439 + }
  440 +
294 </script> 441 </script>
295 </body> 442 </body>
296 </html> 443 </html>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <%@ include file="/WEB-INF/views/include/taglib.jsp"%> 2 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
3 <html> 3 <html>
4 <head> 4 <head>
5 - <title>流转管理</title> 5 + <title>进出场业务管理</title>
6 <meta name="decorator" content="default"/> 6 <meta name="decorator" content="default"/>
7 <script type="text/javascript"> 7 <script type="text/javascript">
8 $(document).ready(function() { 8 $(document).ready(function() {
@@ -18,9 +18,9 @@ @@ -18,9 +18,9 @@
18 </head> 18 </head>
19 <body> 19 <body>
20 <ul class="nav nav-tabs"> 20 <ul class="nav nav-tabs">
21 - <li class="active"><a href="${ctx}/land/landBusinesstypeList/">流转列表</a></li> 21 + <li class="active"><a href="${ctx}/land/landBusinesstypeList/">申请列表</a></li>
22 <shiro:hasPermission name="land:landBusinesstypeList:edit"> 22 <shiro:hasPermission name="land:landBusinesstypeList:edit">
23 - <li><a href="${ctx}/land/landBusinesstypeList/form">流转添加</a></li></shiro:hasPermission> 23 + <li><a href="${ctx}/land/landBusinesstypeList/form">申请添加</a></li></shiro:hasPermission>
24 </ul> 24 </ul>
25 <form:form id="searchForm" modelAttribute="landBusinesstypeList" action="${ctx}/land/landBusinesstypeList/" method="post" class="breadcrumb form-search"> 25 <form:form id="searchForm" modelAttribute="landBusinesstypeList" action="${ctx}/land/landBusinesstypeList/" method="post" class="breadcrumb form-search">
26 <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/> 26 <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -40,14 +40,15 @@ @@ -40,14 +40,15 @@
40 <tr> 40 <tr>
41 <th>车牌号</th> 41 <th>车牌号</th>
42 <th>货代名称</th> 42 <th>货代名称</th>
43 - <th>起始海关</th>  
44 - <th>目的海关</th> 43 + <th>起始海关代码</th>
45 <th>起始关区</th> 44 <th>起始关区</th>
  45 + <th>目的海关代码</th>
46 <th>目的关区</th> 46 <th>目的关区</th>
47 <th>卡口</th> 47 <th>卡口</th>
48 <th>业务类型</th> 48 <th>业务类型</th>
49 <th>进出场站</th> 49 <th>进出场站</th>
50 - <th>更新时间</th> 50 + <th>已进已出</th>
  51 + <th>创建时间</th>
51 <shiro:hasPermission name="land:landBusinesstypeList:edit"><th>操作</th></shiro:hasPermission> 52 <shiro:hasPermission name="land:landBusinesstypeList:edit"><th>操作</th></shiro:hasPermission>
52 </tr> 53 </tr>
53 </thead> 54 </thead>
@@ -61,18 +62,42 @@ @@ -61,18 +62,42 @@
61 </td> 62 </td>
62 <td>${landBusinesstypeList.agentname}</td> 63 <td>${landBusinesstypeList.agentname}</td>
63 <td>${landBusinesstypeList.startport}</td> 64 <td>${landBusinesstypeList.startport}</td>
  65 + <td>
  66 + <c:if test='${landBusinesstypeList.startsatation =="4604000000"}'>西货站</c:if>
  67 + <c:if test='${landBusinesstypeList.startsatation =="4604499001"}'>军投货站</c:if>
  68 + <c:if test='${landBusinesstypeList.startsatation =="4604511001"}'>快邮站</c:if>
  69 + </td>
  70 +
64 <td>${landBusinesstypeList.endport}</td> 71 <td>${landBusinesstypeList.endport}</td>
65 - <td>${landBusinesstypeList.startsatation}</td>  
66 - <td>${landBusinesstypeList.endstation}</td>  
67 - <td>${landBusinesstypeList.aisle}</td> 72 + <td>
  73 + <c:if test='${landBusinesstypeList.endstation =="4604000000"}'>西货站</c:if>
  74 + <c:if test='${landBusinesstypeList.endstation =="4604499001"}'>军投货站</c:if>
  75 + <c:if test='${landBusinesstypeList.endstation =="4604511001"}'>快邮站</c:if>
  76 + </td>
  77 + <td>
  78 + <c:if test="${landBusinesstypeList.aisle =='4604333311'}">1号卡口-进</c:if>
  79 + <c:if test="${landBusinesstypeList.aisle =='4604111111'}">1号卡口-进</c:if>
  80 + <c:if test="${landBusinesstypeList.aisle =='4604444411'}">1号卡口-进</c:if>
  81 + <c:if test="${landBusinesstypeList.aisle =='4604333321'}">2号卡口-进</c:if>
  82 + <c:if test="${landBusinesstypeList.aisle =='4604333312'}">1号卡口-出</c:if>
  83 + <c:if test="${landBusinesstypeList.aisle =='4604444412'}">1号卡口-出</c:if>
  84 + <c:if test="${landBusinesstypeList.aisle =='4604110112'}">1号卡口-出</c:if>
  85 + <c:if test="${landBusinesstypeList.aisle =='4604333322'}">2号卡口-出</c:if>
  86 + </td>
68 <td>${landBusinesstypeList.businesstype}</td> 87 <td>${landBusinesstypeList.businesstype}</td>
69 - <td>${landBusinesstypeList.turnoverflag}</td>  
70 - <td><a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">  
71 - <fmt:formatDate value="${landBusinesstypeList.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>  
72 - </a></td> 88 + <td>
  89 + <c:if test="${landBusinesstypeList.turnoverflag =='E'}">出场站</c:if>
  90 + <c:if test="${landBusinesstypeList.turnoverflag =='I'}">进场站</c:if>
  91 + </td>
  92 + <td>${landBusinesstypeList.contrastflag}</td>
  93 + <td>
  94 + <fmt:formatDate value="${landBusinesstypeList.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
  95 + </td>
73 <shiro:hasPermission name="land:landBusinesstypeList:edit"><td> 96 <shiro:hasPermission name="land:landBusinesstypeList:edit"><td>
74 - <a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">修改</a>  
75 - <a href="${ctx}/land/landBusinesstypeList/delete?id=${landBusinesstypeList.id}" onclick="return confirmx('确认要删除该流转吗？', this.href)">删除</a> 97 + <c:if test="${landBusinesstypeList.contrastflag==null ||landBusinesstypeList.contrastflag==''}">
  98 + <a href="${ctx}/land/landBusinesstypeList/form?id=${landBusinesstypeList.id}">修改</a>
  99 + <a href="${ctx}/land/landBusinesstypeList/delete?id=${landBusinesstypeList.id}" onclick="return confirmx('确认要删除该流转吗？', this.href)">删除</a>
  100 + </c:if>
76 </td></shiro:hasPermission> 101 </td></shiro:hasPermission>
77 </tr> 102 </tr>
78 </c:forEach> 103 </c:forEach>
1 -<%@ page contentType="text/html;charset=UTF-8" %> 1 +<%@ page contentType="text/html;charset=UTF-8"%>
2 <%@ include file="/WEB-INF/views/include/taglib.jsp"%> 2 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
3 <html> 3 <html>
4 <head> 4 <head>
5 - <title>备案管理</title>  
6 - <meta name="decorator" content="default"/>  
7 - <script type="text/javascript">  
8 - $(document).ready(function() {  
9 - //$("#name").focus();  
10 - $("#inputForm").validate({  
11 - submitHandler: function(form){  
12 - loading('正在提交，请稍等...');  
13 - form.submit();  
14 - },  
15 - errorContainer: "#messageBox",  
16 - errorPlacement: function(error, element) {  
17 - $("#messageBox").text("输入有误，请先更正。");  
18 - if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){  
19 - error.appendTo(element.parent().parent());  
20 - } else {  
21 - error.insertAfter(element);  
22 - }  
23 - } 5 +<title>备案管理</title>
  6 +<meta name="decorator" content="default" />
  7 +<script type="text/javascript">
  8 + $(document).ready(
  9 + function() {
  10 + //$("#name").focus();
  11 + $("#inputForm")
  12 + .validate(
  13 + {
  14 + submitHandler : function(form) {
  15 + loading('正在提交，请稍等...');
  16 + form.submit();
  17 + },
  18 + errorContainer : "#messageBox",
  19 + errorPlacement : function(error, element) {
  20 + $("#messageBox").text("输入有误，请先更正。");
  21 + if (element.is(":checkbox")
  22 + || element.is(":radio")
  23 + || element.parent().is(
  24 + ".input-append")) {
  25 + error.appendTo(element.parent()
  26 + .parent());
  27 + } else {
  28 + error.insertAfter(element);
  29 + }
  30 + }
  31 + });
24 }); 32 });
  33 + $(function() {
  34 + $('input').blur(function() {
  35 + this.value = this.value.toUpperCase();
25 }); 36 });
26 - $(function(){  
27 - $('input').blur(function(){  
28 - this.value=this.value.toUpperCase();  
29 - });  
30 - })  
31 - </script> 37 + })
  38 +</script>
32 <script type="text/javascript"> 39 <script type="text/javascript">
33 - $(function(){  
34 - $('input').blur(function(){  
35 - this.value=this.value.toUpperCase(); 40 + $(function() {
  41 + $('input').blur(function() {
  42 + this.value = this.value.toUpperCase();
36 }); 43 });
37 }) 44 })
38 </script> 45 </script>
39 <style type="text/css"> 46 <style type="text/css">
40 - input{  
41 - text-transform:uppercase;  
42 - } 47 +input {
  48 + text-transform: uppercase;
  49 +}
  50 +</style>
  51 +<style type="text/css">
  52 +.row-lable {
  53 + width: 180px;
  54 + text-align: right;
  55 +}
  56 +
  57 +.row-controls {
  58 + display: inline;
  59 + width: 280px;
  60 +}
43 </style> 61 </style>
44 - <style type="text/css">  
45 - .row-lable{  
46 - margin-left:30px;  
47 - width:180px;  
48 - text-align:right;  
49 - }  
50 - .row-controls{  
51 - margin-left:20px;  
52 - display: inline;  
53 - width:300px;  
54 - }  
55 - </style>  
56 </head> 62 </head>
57 <body> 63 <body>
58 <ul class="nav nav-tabs"> 64 <ul class="nav nav-tabs">
59 <li><a href="${ctx}/land/landCorporationInfo/">备案列表</a></li> 65 <li><a href="${ctx}/land/landCorporationInfo/">备案列表</a></li>
60 - <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>  
61 - </ul><br/>  
62 - <form:form id="inputForm" modelAttribute="landCorporationInfo" action="${ctx}/land/landCorporationInfo/save" method="post" class="form-horizontal">  
63 - <form:hidden path="id"/>  
64 - <sys:message content="${message}"/> 66 + <li class="active"><a
  67 + href="${ctx}/land/landCorporationInfo/form?id=${landCorporationInfo.id}">备案<shiro:hasPermission
  68 + name="land:landCorporationInfo:edit">${not empty landCorporationInfo.id?'修改':'添加'}</shiro:hasPermission>
  69 + <shiro:lacksPermission name="land:landCorporationInfo:edit">查看</shiro:lacksPermission></a></li>
  70 + </ul>
  71 + <br />
  72 + <form:form id="inputForm" modelAttribute="landCorporationInfo"
  73 + action="${ctx}/land/landCorporationInfo/save" method="post"
  74 + class="form-horizontal">
  75 + <form:hidden path="id" />
  76 + <sys:message content="${message}" />
  77 + <div class="control-group">
  78 + <h4>企业信息</h4>
  79 + </div>
65 <div class="control-group"> 80 <div class="control-group">
66 <label class="row-lable">企业代码：</label> 81 <label class="row-lable">企业代码：</label>
67 <div class="row-controls"> 82 <div class="row-controls">
68 - <form:input path="coCode" htmlEscape="false" maxlength="20" class="input-large required"/> 83 + <form:input path="coCode" htmlEscape="false" maxlength="20"
  84 + class="input-large required" />
69 </div> 85 </div>
70 <label class="row-lable">主管海关代码：</label> 86 <label class="row-lable">主管海关代码：</label>
71 <div class="row-controls"> 87 <div class="row-controls">
72 - <form:input path="mainPort" htmlEscape="false" maxlength="4" class="input-large required" id="mainPort"/> 88 + <form:input path="mainPort" htmlEscape="false" maxlength="4"
  89 + class="input-large required" id="mainPort" />
73 </div> 90 </div>
  91 +
  92 + </div>
  93 + <div class="control-group">
74 <label class="row-lable">企业注册地：</label> 94 <label class="row-lable">企业注册地：</label>
75 <div class="row-controls"> 95 <div class="row-controls">
76 - <form:input path="coRegAddr" htmlEscape="false" maxlength="12" class="input-large required"/> 96 + <form:input path="coRegAddr" htmlEscape="false" maxlength="12"
  97 + class="input-large required" />
77 </div> 98 </div>
78 - </div>  
79 - <div class="control-group">  
80 <label class="row-lable">批准海关：</label> 99 <label class="row-lable">批准海关：</label>
81 <div class="row-controls"> 100 <div class="row-controls">
82 - <form:input path="apprDep" htmlEscape="false" maxlength="64" class="input-large required"/> 101 + <form:input path="apprDep" htmlEscape="false" maxlength="64"
  102 + class="input-large required" />
83 </div> 103 </div>
  104 + </div>
  105 + <div class="control-group">
84 <label class="row-lable">批准/许可批文号：</label> 106 <label class="row-lable">批准/许可批文号：</label>
85 <div class="row-controls"> 107 <div class="row-controls">
86 - <form:input path="apprNo" htmlEscape="false" maxlength="64" class="input-large required"/> 108 + <form:input path="apprNo" htmlEscape="false" maxlength="64"
  109 + class="input-large required" />
87 </div> 110 </div>
88 <label class="row-lable">批准/许可批文有效期：</label> 111 <label class="row-lable">批准/许可批文有效期：</label>
89 <div class="row-controls"> 112 <div class="row-controls">
90 - <input name="apprValidTime" type="text" readonly="readonly" maxlength="20" class="input-large Wdate required" 113 + <input name="apprValidTime" type="text" readonly="readonly"
  114 + maxlength="20" class="input-large Wdate required"
91 value="<fmt:formatDate value="${landCorporationInfo.apprValidTime}" pattern="yyyy-MM-dd"/>" 115 value="<fmt:formatDate value="${landCorporationInfo.apprValidTime}" pattern="yyyy-MM-dd"/>"
92 - onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> 116 + onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
93 </div> 117 </div>
94 </div> 118 </div>
95 <div class="control-group"> 119 <div class="control-group">
96 - <label class="row-lable">批准行驶口岸：</label> 120 + <label class="row-lable">批准行驶口岸：</label>
97 <div class="row-controls"> 121 <div class="row-controls">
98 - <form:input path="apprPorts" htmlEscape="false" maxlength="255" class="input-large required"/> 122 + <form:input path="apprPorts" htmlEscape="false" maxlength="255"
  123 + class="input-large required" />
99 </div> 124 </div>
100 <label class="row-lable">企业中文名称：</label> 125 <label class="row-lable">企业中文名称：</label>
101 <div class="row-controls"> 126 <div class="row-controls">
102 - <form:input path="coNameCn" htmlEscape="false" maxlength="255" class="input-large "/> 127 + <form:input path="coNameCn" htmlEscape="false" maxlength="255"
  128 + class="input-large " />
103 </div> 129 </div>
  130 + </div>
  131 + <div class="control-group">
104 <label class="row-lable">企业外文名称：</label> 132 <label class="row-lable">企业外文名称：</label>
105 <div class="row-controls"> 133 <div class="row-controls">
106 - <form:input path="coNameEn" htmlEscape="false" maxlength="255" class="input-large required"/> 134 + <form:input path="coNameEn" htmlEscape="false" maxlength="255"
  135 + class="input-large required" />
107 </div> 136 </div>
108 - </div>  
109 - <div class="control-group">  
110 <label class="row-lable">企业地址：</label> 137 <label class="row-lable">企业地址：</label>
111 <div class="row-controls"> 138 <div class="row-controls">
112 - <form:input path="coAddr" htmlEscape="false" maxlength="255" class="input-large required"/> 139 + <form:input path="coAddr" htmlEscape="false" maxlength="255"
  140 + class="input-large required" />
113 </div> 141 </div>
  142 + </div>
  143 + <div class="control-group">
114 <label class="row-lable">境内联系电话：</label> 144 <label class="row-lable">境内联系电话：</label>
115 <div class="row-controls"> 145 <div class="row-controls">
116 - <form:input path="insidePhone" htmlEscape="false" maxlength="64" class="input-large phone"/> 146 + <form:input path="insidePhone" htmlEscape="false" maxlength="64"
  147 + class="input-large phone" />
117 </div> 148 </div>
118 <label class="row-lable">企业经营类型：</label> 149 <label class="row-lable">企业经营类型：</label>
119 <div class="row-controls"> 150 <div class="row-controls">
120 <form:select path="coDealType" class="input-large required"> 151 <form:select path="coDealType" class="input-large required">
121 - <form:option value="" label=""/>  
122 - <form:option value="" label=""/>  
123 - <form:option value="1" label="货运企业"/>  
124 - <form:option value="2" label="客运企业"/>  
125 - <form:option value="3" label="转关运输企业"/>  
126 - <form:option value="4" label="其他"/>  
127 - 152 + <form:option value="" label="" />
  153 + <form:option value="" label="" />
  154 + <form:option value="1" label="货运企业" />
  155 + <form:option value="2" label="客运企业" />
  156 + <form:option value="3" label="转关运输企业" />
  157 + <form:option value="4" label="其他" />
  158 +
128 </form:select> 159 </form:select>
129 </div> 160 </div>
130 -  
131 </div> 161 </div>
132 <div class="control-group"> 162 <div class="control-group">
133 <label class="row-lable">企业负责人：</label> 163 <label class="row-lable">企业负责人：</label>
134 <div class="row-controls"> 164 <div class="row-controls">
135 - <form:input path="coRep" htmlEscape="false" maxlength="64" class="input-large required"/> 165 + <form:input path="coRep" htmlEscape="false" maxlength="64"
  166 + class="input-large required" />
136 </div> 167 </div>
137 <label class="row-lable">企业负责人联系电话：</label> 168 <label class="row-lable">企业负责人联系电话：</label>
138 <div class="row-controls"> 169 <div class="row-controls">
139 - <form:input path="coRepPhon" htmlEscape="false" maxlength="64" class="input-large required phone"/> 170 + <form:input path="coRepPhon" htmlEscape="false" maxlength="64"
  171 + class="input-large required phone" />
140 </div> 172 </div>
  173 + </div>
  174 + <div class="control-group">
141 <label class="row-lable">境内联系地址：</label> 175 <label class="row-lable">境内联系地址：</label>
142 <div class="row-controls"> 176 <div class="row-controls">
143 - <form:input path="insideAddr" htmlEscape="false" maxlength="255" class="input-large "/> 177 + <form:input path="insideAddr" htmlEscape="false" maxlength="255"
  178 + class="input-large " />
144 </div> 179 </div>
145 - </div>  
146 - <div class="control-group">  
147 <label class="row-lable">企业经营资格：</label> 180 <label class="row-lable">企业经营资格：</label>
148 <div class="row-controls"> 181 <div class="row-controls">
149 - <form:input path="coDealQua" htmlEscape="false" maxlength="64" class="input-large "/> 182 + <form:input path="coDealQua" htmlEscape="false" maxlength="64"
  183 + class="input-large " />
150 </div> 184 </div>
  185 + </div>
  186 + <div class="control-group">
151 <label class="row-lable">企业备案类别：</label> 187 <label class="row-lable">企业备案类别：</label>
152 <div class="row-controls"> 188 <div class="row-controls">
153 <form:select path="coRecType" class="input-large required"> 189 <form:select path="coRecType" class="input-large required">
154 - <form:option value="" label=""/>  
155 - <form:option value="1" label="经营性进出境公路运输企业"/>  
156 - <form:option value="2" label="非经营性进出境公路交通工具负责人"/>  
157 - <form:option value="3" label="进出境公路运输工具代理企业"/>  
158 - <form:option value="4" label="经营性来往港澳公路运输企业"/>  
159 - <form:option value="5" label="非经营性来往港澳公路交通工具负责人"/>  
160 - <form:option value="6" label="来往港澳公路运输工具代理企业"/> 190 + <form:option value="" label="" />
  191 + <form:option value="1" label="经营性进出境公路运输企业" />
  192 + <form:option value="2" label="非经营性进出境公路交通工具负责人" />
  193 + <form:option value="3" label="进出境公路运输工具代理企业" />
  194 + <form:option value="4" label="经营性来往港澳公路运输企业" />
  195 + <form:option value="5" label="非经营性来往港澳公路交通工具负责人" />
  196 + <form:option value="6" label="来往港澳公路运输工具代理企业" />
161 </form:select> 197 </form:select>
162 </div> 198 </div>
163 <label class="row-lable">最新更新申请业务类型：</label> 199 <label class="row-lable">最新更新申请业务类型：</label>
164 <div class="row-controls"> 200 <div class="row-controls">
165 <form:select path="currApplyBussine" class="input-large "> 201 <form:select path="currApplyBussine" class="input-large ">
166 - <form:option value="" label=""/>  
167 - <form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/> 202 + <form:option value="" label="" />
  203 + <form:options items="${fns:getDictList('')}" itemLabel="label"
  204 + itemValue="value" htmlEscape="false" />
168 </form:select> 205 </form:select>
169 </div> 206 </div>
170 </div> 207 </div>
171 <div class="control-group"> 208 <div class="control-group">
  209 + <h4>运输服务企业信息</h4>
  210 + </div>
  211 + <div class="control-group">
172 <label class="row-lable">运输工具服务企业名称：</label> 212 <label class="row-lable">运输工具服务企业名称：</label>
173 <div class="row-controls"> 213 <div class="row-controls">
174 - <form:input path="coServiceName" htmlEscape="false" maxlength="255" class="input-large required"/> 214 + <form:input path="coServiceName" htmlEscape="false" maxlength="255"
  215 + class="input-large required" />
175 </div> 216 </div>
176 <label class="row-lable">运输工具服务企业地址：</label> 217 <label class="row-lable">运输工具服务企业地址：</label>
177 <div class="row-controls"> 218 <div class="row-controls">
178 - <form:input path="coServiceAddp" htmlEscape="false" maxlength="255" class="input-large "/> 219 + <form:input path="coServiceAddp" htmlEscape="false" maxlength="255"
  220 + class="input-large " />
179 </div> 221 </div>
  222 +
  223 + </div>
  224 + <div class="control-group">
180 <label class="row-lable">运输工具服务企业电话：</label> 225 <label class="row-lable">运输工具服务企业电话：</label>
181 <div class="row-controls"> 226 <div class="row-controls">
182 - <form:input path="coServicePhone" htmlEscape="false" maxlength="64" class="input-large required phone"/> 227 + <form:input path="coServicePhone" htmlEscape="false" maxlength="64"
  228 + class="input-large required phone" />
183 </div> 229 </div>
184 </div> 230 </div>
185 <div class="control-group"> 231 <div class="control-group">
186 <label class="row-lable">批准货运车辆指标数：</label> 232 <label class="row-lable">批准货运车辆指标数：</label>
187 <div class="row-controls"> 233 <div class="row-controls">
188 - <form:input path="apprGoodsVeCount" htmlEscape="false" maxlength="10" class="input-large "/> 234 + <form:input path="apprGoodsVeCount" htmlEscape="false"
  235 + maxlength="10" class="input-large " />
189 </div> 236 </div>
190 <label class="row-lable">批准客运车辆指标数：</label> 237 <label class="row-lable">批准客运车辆指标数：</label>
191 <div class="row-controls"> 238 <div class="row-controls">
192 - <form:input path="apprPassengersVeCount" htmlEscape="false" maxlength="10" class="input-large "/> 239 + <form:input path="apprPassengersVeCount" htmlEscape="false"
  240 + maxlength="10" class="input-large " />
193 </div> 241 </div>
194 </div> 242 </div>
195 <div class="control-group"> 243 <div class="control-group">
  244 + <h4>担保企业信息</h4>
  245 + </div>
  246 + <div class="control-group">
196 <label class="row-lable">担保函编号（唯一）：</label> 247 <label class="row-lable">担保函编号（唯一）：</label>
197 <div class="row-controls"> 248 <div class="row-controls">
198 - <form:input path="assureLetterNo" htmlEscape="false" maxlength="32" class="input-large required"/> 249 + <form:input path="assureLetterNo" htmlEscape="false" maxlength="32"
  250 + class="input-large required" />
199 </div> 251 </div>
200 <label class="row-lable">担保函金额：</label> 252 <label class="row-lable">担保函金额：</label>
201 <div class="row-controls"> 253 <div class="row-controls">
202 - <form:input path="assureMoney" htmlEscape="false" maxlength="12" class="input-large "/> 254 + <form:input path="assureMoney" htmlEscape="false" maxlength="12"
  255 + class="input-large " />
203 </div> 256 </div>
  257 +
  258 + </div>
  259 + <div class="control-group">
204 <label class="row-lable">担保方式：</label> 260 <label class="row-lable">担保方式：</label>
205 <div class="row-controls"> 261 <div class="row-controls">
206 <form:select path="assureType" class="input-large "> 262 <form:select path="assureType" class="input-large ">
207 - <form:option value="" label=""/>  
208 - <form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/> 263 + <form:option value="" label="" />
  264 + <form:options items="${fns:getDictList('')}" itemLabel="label"
  265 + itemValue="value" htmlEscape="false" />
209 </form:select> 266 </form:select>
210 </div> 267 </div>
211 - </div>  
212 - <div class="control-group">  
213 <label class="row-lable">担保企业组织机构代码：</label> 268 <label class="row-lable">担保企业组织机构代码：</label>
214 <div class="row-controls"> 269 <div class="row-controls">
215 - <form:input path="assureCoOrgCode" htmlEscape="false" maxlength="255" class="input-large required"/> 270 + <form:input path="assureCoOrgCode" htmlEscape="false"
  271 + maxlength="255" class="input-large required" />
216 </div> 272 </div>
  273 + </div>
  274 + <div class="control-group">
217 <label class="row-lable">担保企业名称（人/单位）：</label> 275 <label class="row-lable">担保企业名称（人/单位）：</label>
218 <div class="row-controls"> 276 <div class="row-controls">
219 - <form:input path="assureCoName" htmlEscape="false" maxlength="32" class="input-large "/> 277 + <form:input path="assureCoName" htmlEscape="false" maxlength="32"
  278 + class="input-large " />
220 </div> 279 </div>
221 <label class="row-lable">担保期限：</label> 280 <label class="row-lable">担保期限：</label>
222 <div class="row-controls"> 281 <div class="row-controls">
223 - <input name="assureTerm" type="text" readonly="readonly" maxlength="20" class="input-large Wdate " 282 + <input name="assureTerm" type="text" readonly="readonly"
  283 + maxlength="20" class="input-large Wdate "
224 value="<fmt:formatDate value="${landCorporationInfo.assureTerm}" pattern="yyyy-MM-dd"/>" 284 value="<fmt:formatDate value="${landCorporationInfo.assureTerm}" pattern="yyyy-MM-dd"/>"
225 - onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> 285 + onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});" />
226 </div> 286 </div>
227 </div> 287 </div>
228 <div class="control-group"> 288 <div class="control-group">
229 <label class="row-lable">担保企业法人代表：</label> 289 <label class="row-lable">担保企业法人代表：</label>
230 <div class="row-controls"> 290 <div class="row-controls">
231 - <form:input path="assureCoRep" htmlEscape="false" maxlength="32" class="input-large required"/> 291 + <form:input path="assureCoRep" htmlEscape="false" maxlength="32"
  292 + class="input-large required" />
232 </div> 293 </div>
233 <label class="row-lable">担保企业电话：</label> 294 <label class="row-lable">担保企业电话：</label>
234 <div class="row-controls"> 295 <div class="row-controls">
235 - <form:input path="assureCoPhone" htmlEscape="false" maxlength="32" class="input-large required phone"/> 296 + <form:input path="assureCoPhone" htmlEscape="false" maxlength="32"
  297 + class="input-large required phone" />
236 </div> 298 </div>
  299 +
  300 + </div>
  301 + <div class="control-group">
237 <label class="row-lable">担保企业地址：</label> 302 <label class="row-lable">担保企业地址：</label>
238 <div class="row-controls"> 303 <div class="row-controls">
239 - <form:input path="assureOAddr" htmlEscape="false" maxlength="255" class="input-large "/> 304 + <form:input path="assureOAddr" htmlEscape="false" maxlength="255"
  305 + class="input-large " />
240 </div> 306 </div>
241 - </div>  
242 - <div class="control-group">  
243 <label class="row-lable">担保企业联系人：</label> 307 <label class="row-lable">担保企业联系人：</label>
244 <div class="row-controls"> 308 <div class="row-controls">
245 - <form:input path="assureContact" htmlEscape="false" maxlength="32" class="input-large required"/> 309 + <form:input path="assureContact" htmlEscape="false" maxlength="32"
  310 + class="input-large required" />
246 </div> 311 </div>
  312 + </div>
  313 + <div class="control-group">
  314 +
247 <label class="row-lable">担保企业联系人电话：</label> 315 <label class="row-lable">担保企业联系人电话：</label>
248 <div class="row-controls"> 316 <div class="row-controls">
249 - <form:input path="assureCoConPhone" htmlEscape="false" maxlength="32" class="input-large required"/> 317 + <form:input path="assureCoConPhone" htmlEscape="false"
  318 + maxlength="32" class="input-large required" />
250 </div> 319 </div>
251 -  
252 - </div>  
253 - <div class="control-group">  
254 <label class="row-lable">申请人：</label> 320 <label class="row-lable">申请人：</label>
255 <div class="row-controls"> 321 <div class="row-controls">
256 - <form:input path="proposer" htmlEscape="false" maxlength="32" class="input-large required"/> 322 + <form:input path="proposer" htmlEscape="false" maxlength="32"
  323 + class="input-large required" />
257 </div> 324 </div>
  325 + </div>
  326 + <div class="control-group">
258 <label class="row-lable">申请时间：</label> 327 <label class="row-lable">申请时间：</label>
259 <div class="row-controls"> 328 <div class="row-controls">
260 - <input name="proposeTime" type="text" readonly="readonly" maxlength="20" class="input-large Wdate " 329 + <input name="proposeTime" type="text" readonly="readonly"
  330 + maxlength="20" class="input-large Wdate "
261 value="<fmt:formatDate value="${landCorporationInfo.proposeTime}" pattern="yyyy-MM-dd HH:mm:ss"/>" 331 value="<fmt:formatDate value="${landCorporationInfo.proposeTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
262 - onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/> 332 + onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
263 </div> 333 </div>
264 <label class="row-lable">数据操作类型：</label> 334 <label class="row-lable">数据操作类型：</label>
265 <div class="row-controls"> 335 <div class="row-controls">
266 <form:select path="operationType" class="input-large "> 336 <form:select path="operationType" class="input-large ">
267 - <form:option value="" label=""/>  
268 - <form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/> 337 + <form:option value="" label="" />
  338 + <form:options items="${fns:getDictList('')}" itemLabel="label"
  339 + itemValue="value" htmlEscape="false" />
269 </form:select> 340 </form:select>
270 </div> 341 </div>
271 </div> 342 </div>
272 <div class="control-group"> 343 <div class="control-group">
273 <label class="control-label">批文扫描图：</label> 344 <label class="control-label">批文扫描图：</label>
274 <div class="controls"> 345 <div class="controls">
275 - <form:hidden id="approNoPic" path="approNoPic" htmlEscape="false" maxlength="255" class="input-large "/>  
276 - <sys:ckfinder input="approNoPic" uploadPath="/photo" type="images" selectMultiple="false" maxWidth="100" maxHeight="100"/> 346 + <form:hidden id="approNoPic" path="approNoPic" htmlEscape="false"
  347 + maxlength="255" class="input-large " />
  348 + <sys:ckfinder input="approNoPic" uploadPath="/photo" type="images"
  349 + selectMultiple="false" maxWidth="100" maxHeight="100" />
277 </div> 350 </div>
278 </div> 351 </div>
279 <div class="control-group"> 352 <div class="control-group">
  353 + <h4>境外商号信息</h4>
  354 + </div>
  355 + <div class="control-group">
280 <label class="row-lable">境外商号海关关键字：</label> 356 <label class="row-lable">境外商号海关关键字：</label>
281 <div class="row-controls"> 357 <div class="row-controls">
282 - <form:input path="abroadId" htmlEscape="false" maxlength="32" class="input-large required"/> 358 + <form:input path="abroadId" htmlEscape="false" maxlength="32"
  359 + class="input-large required" />
283 </div> 360 </div>
284 <label class="row-lable">境外商号注册人：</label> 361 <label class="row-lable">境外商号注册人：</label>
285 <div class="row-controls"> 362 <div class="row-controls">
286 - <form:input path="abroadRegister" htmlEscape="false" maxlength="255" class="input-large required"/> 363 + <form:input path="abroadRegister" htmlEscape="false" maxlength="255"
  364 + class="input-large required" />
287 </div> 365 </div>
  366 +
  367 + </div>
  368 + <div class="control-group">
288 <label class="row-lable">境外商号地址：</label> 369 <label class="row-lable">境外商号地址：</label>
289 <div class="row-controls"> 370 <div class="row-controls">
290 - <form:input path="abroadAddr" htmlEscape="false" maxlength="255" class="input-large "/> 371 + <form:input path="abroadAddr" htmlEscape="false" maxlength="255"
  372 + class="input-large " />
291 </div> 373 </div>
292 </div> 374 </div>
293 <div class="control-group"> 375 <div class="control-group">
294 <label class="row-lable">境外商号电话：</label> 376 <label class="row-lable">境外商号电话：</label>
295 <div class="row-controls"> 377 <div class="row-controls">
296 - <form:input path="abroadPhone" htmlEscape="false" maxlength="32" class="input-large required"/> 378 + <form:input path="abroadPhone" htmlEscape="false" maxlength="32"
  379 + class="input-large required" />
297 </div> 380 </div>
298 <label class="row-lable">数据操作类型：</label> 381 <label class="row-lable">数据操作类型：</label>
299 <div class="row-controls"> 382 <div class="row-controls">
300 <form:select path="operationTypeAbroad" class="input-large "> 383 <form:select path="operationTypeAbroad" class="input-large ">
301 - <form:option value="" label=""/>  
302 - <form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/> 384 + <form:option value="" label="" />
  385 + <form:options items="${fns:getDictList('')}" itemLabel="label"
  386 + itemValue="value" htmlEscape="false" />
303 </form:select> 387 </form:select>
304 </div> 388 </div>
305 </div> 389 </div>
306 <div class="control-group"> 390 <div class="control-group">
  391 + <h4>内承单位信息</h4>
  392 + </div>
  393 + <div class="control-group">
307 <label class="row-lable">内承单位海关关键字：</label> 394 <label class="row-lable">内承单位海关关键字：</label>
308 <div class="row-controls"> 395 <div class="row-controls">
309 - <form:input path="assumeId" htmlEscape="false" maxlength="36" class="input-large required"/> 396 + <form:input path="assumeId" htmlEscape="false" maxlength="36"
  397 + class="input-large required" />
310 </div> 398 </div>
311 <label class="row-lable">内承单位名称：</label> 399 <label class="row-lable">内承单位名称：</label>
312 <div class="row-controls"> 400 <div class="row-controls">
313 - <form:input path="assumeName" htmlEscape="false" maxlength="255" class="input-large required"/> 401 + <form:input path="assumeName" htmlEscape="false" maxlength="255"
  402 + class="input-large required" />
314 </div> 403 </div>
  404 +
  405 + </div>
  406 + <div class="control-group">
315 <label class="row-lable">内承单位法人代表：</label> 407 <label class="row-lable">内承单位法人代表：</label>
316 <div class="row-controls"> 408 <div class="row-controls">
317 - <form:input path="assumeRep" htmlEscape="false" maxlength="32" class="input-large required"/> 409 + <form:input path="assumeRep" htmlEscape="false" maxlength="32"
  410 + class="input-large required" />
318 </div> 411 </div>
319 - </div>  
320 - <div class="control-group">  
321 <label class="row-lable">内承单位法人代表电话：</label> 412 <label class="row-lable">内承单位法人代表电话：</label>
322 <div class="row-controls"> 413 <div class="row-controls">
323 - <form:input path="assumeRepPhone" htmlEscape="false" maxlength="32" class="input-large required"/> 414 + <form:input path="assumeRepPhone" htmlEscape="false" maxlength="32"
  415 + class="input-large required" />
324 </div> 416 </div>
  417 + </div>
  418 + <div class="control-group">
325 <label class="row-lable">内承单位联系地址：</label> 419 <label class="row-lable">内承单位联系地址：</label>
326 <div class="row-controls"> 420 <div class="row-controls">
327 - <form:input path="assumeAddr" htmlEscape="false" maxlength="255" class="input-large "/> 421 + <form:input path="assumeAddr" htmlEscape="false" maxlength="255"
  422 + class="input-large " />
328 </div> 423 </div>
329 - <label class="row-lable">内承单位联系电话：</label> 424 + <label class="row-lable">内承单位联系电话：</label>
330 <div class="row-controls"> 425 <div class="row-controls">
331 - <form:input path="assumePhone" htmlEscape="false" maxlength="32" class="input-large "/> 426 + <form:input path="assumePhone" htmlEscape="false" maxlength="32"
  427 + class="input-large " />
332 </div> 428 </div>
333 </div> 429 </div>
334 <div class="control-group"> 430 <div class="control-group">
335 <label class="row-lable">数据操作类型：</label> 431 <label class="row-lable">数据操作类型：</label>
336 <div class="row-controls"> 432 <div class="row-controls">
337 - <form:input path="operationTypeAssume" htmlEscape="false" maxlength="2" class="input-large "/> 433 + <form:input path="operationTypeAssume" htmlEscape="false"
  434 + maxlength="2" class="input-large " />
338 </div> 435 </div>
339 </div> 436 </div>
340 <div class="control-group"> 437 <div class="control-group">
341 - <label class="row-lable">企业所属分支机构海关关键字：</label> 438 + <h4>所属分支机构信息</h4>
  439 + </div>
  440 + <div class="control-group">
  441 + <label class="row-lable">所属分支机构海关关键字：</label>
342 <div class="row-controls"> 442 <div class="row-controls">
343 - <form:input path="partOrgId" htmlEscape="false" maxlength="36" class="input-large "/> 443 + <form:input path="partOrgId" htmlEscape="false" maxlength="36"
  444 + class="input-large " />
344 </div> 445 </div>
345 <label class="row-lable">所属分支机构名称：</label> 446 <label class="row-lable">所属分支机构名称：</label>
346 <div class="row-controls"> 447 <div class="row-controls">
347 - <form:input path="belongOrgName" htmlEscape="false" maxlength="32" class="input-large required"/> 448 + <form:input path="belongOrgName" htmlEscape="false" maxlength="32"
  449 + class="input-large required" />
348 </div> 450 </div>
  451 + </div>
  452 + <div class="control-group">
349 <label class="row-lable">所属分支机构地址：</label> 453 <label class="row-lable">所属分支机构地址：</label>
350 <div class="row-controls"> 454 <div class="row-controls">
351 - <form:input path="belongOrgAddress" htmlEscape="false" maxlength="255" class="input-large "/> 455 + <form:input path="belongOrgAddress" htmlEscape="false"
  456 + maxlength="255" class="input-large " />
352 </div> 457 </div>
353 - </div>  
354 - <div class="control-group">  
355 <label class="row-lable">所属分支机构负责人：</label> 458 <label class="row-lable">所属分支机构负责人：</label>
356 <div class="row-controls"> 459 <div class="row-controls">
357 - <form:input path="belongOrgPrincinal" htmlEscape="false" maxlength="32" class="input-large required"/> 460 + <form:input path="belongOrgPrincinal" htmlEscape="false"
  461 + maxlength="32" class="input-large required" />
358 </div> 462 </div>
  463 + </div>
  464 + <div class="control-group">
359 <label class="row-lable">所属分支机构联系电话：</label> 465 <label class="row-lable">所属分支机构联系电话：</label>
360 <div class="row-controls"> 466 <div class="row-controls">
361 - <form:input path="belongOrgPhone" htmlEscape="false" maxlength="32" class="input-large required"/> 467 + <form:input path="belongOrgPhone" htmlEscape="false" maxlength="32"
  468 + class="input-large required" />
362 </div> 469 </div>
363 <label class="row-lable">数据操作类型：</label> 470 <label class="row-lable">数据操作类型：</label>
364 <div class="row-controls"> 471 <div class="row-controls">
365 <form:select path="operayionTypeBelong" class="input-large "> 472 <form:select path="operayionTypeBelong" class="input-large ">
366 - <form:option value="" label=""/>  
367 - <form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/> 473 + <form:option value="" label="" />
  474 + <form:options items="${fns:getDictList('')}" itemLabel="label"
  475 + itemValue="value" htmlEscape="false" />
368 </form:select> 476 </form:select>
369 </div> 477 </div>
370 </div> 478 </div>
371 - <div class="control-group"> 479 + <div class="control-group">
372 <label class="row-lable">备注：</label> 480 <label class="row-lable">备注：</label>
373 <div class="row-controls"> 481 <div class="row-controls">
374 - <form:textarea path="memo" rows="3" htmlEscape="false" maxlength="255" class="input-xxlarge "/> 482 + <form:textarea path="memo" rows="3" htmlEscape="false"
  483 + maxlength="255" class="input-xxlarge " />
375 </div> 484 </div>
376 </div> 485 </div>
377 - <span class="help-inline"><font color="red" >注：页面内容请全部填写</font></span> 486 + <span class="help-inline"><font color="red">注：页面内容请全部填写</font></span>
378 <div class="form-actions"> 487 <div class="form-actions">
379 - <shiro:hasPermission name="land:landCorporationInfo:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>  
380 - <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/> 488 + <shiro:hasPermission name="land:landCorporationInfo:edit">
  489 + <input id="btnSubmit" class="btn btn-primary" type="submit"
  490 + value="保 存" />&nbsp;</shiro:hasPermission>
  491 + <input id="btnCancel" class="btn" type="button" value="返 回"
  492 + onclick="history.go(-1)" />
381 </div> 493 </div>
382 </form:form> 494 </form:form>
383 </body> 495 </body>
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 <td>${landCorporationInfo.assureCoName }</td> 68 <td>${landCorporationInfo.assureCoName }</td>
69 <td>${landCorporationInfo.assumeName }</td> 69 <td>${landCorporationInfo.assumeName }</td>
70 <td>${landCorporationInfo.belongOrgName }</td> 70 <td>${landCorporationInfo.belongOrgName }</td>
71 - <td><a href="${ctx}/land/landCorporationInfo/form?id=${landCorporationInfo.id}"> 71 + <td>
72 <fmt:formatDate value="${landCorporationInfo.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/> 72 <fmt:formatDate value="${landCorporationInfo.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
73 </a></td> 73 </a></td>
74 <shiro:hasPermission name="land:landCorporationInfo:edit"><td> 74 <shiro:hasPermission name="land:landCorporationInfo:edit"><td>
@@ -51,6 +51,9 @@ @@ -51,6 +51,9 @@
51 <form:hidden path="id"/> 51 <form:hidden path="id"/>
52 <sys:message content="${message}"/> 52 <sys:message content="${message}"/>
53 <div class="control-group"> 53 <div class="control-group">
  54 + <h4>驾驶员信息</h4>
  55 + </div>
  56 + <div class="control-group">
54 <label class="control-label">主管海关代码：</label> 57 <label class="control-label">主管海关代码：</label>
55 <div class="controls"> 58 <div class="controls">
56 <form:input path="mainPort" htmlEscape="false" maxlength="4" class="input-xlarge " id="mainPort"/> 59 <form:input path="mainPort" htmlEscape="false" maxlength="4" class="input-xlarge " id="mainPort"/>
@@ -49,7 +49,10 @@ @@ -49,7 +49,10 @@
49 </ul><br/> 49 </ul><br/>
50 <form:form id="inputForm" modelAttribute="landRoadTrailerRecord" action="${ctx}/land/landRoadTrailerRecord/save" method="post" class="form-horizontal"> 50 <form:form id="inputForm" modelAttribute="landRoadTrailerRecord" action="${ctx}/land/landRoadTrailerRecord/save" method="post" class="form-horizontal">
51 <form:hidden path="id"/> 51 <form:hidden path="id"/>
52 - <sys:message content="${message}"/> 52 + <sys:message content="${message}"/>
  53 + <div class="control-group">
  54 + <h4>挂车信息</h4>
  55 + </div>
53 <div class="control-group"> 56 <div class="control-group">
54 <label class="control-label">主管海关代码：</label> 57 <label class="control-label">主管海关代码：</label>
55 <div class="controls"> 58 <div class="controls">
1 -<%@ page contentType="text/html;charset=UTF-8" %> 1 +<%@ page contentType="text/html;charset=UTF-8"%>
2 <%@ include file="/WEB-INF/views/include/taglib.jsp"%> 2 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
3 <html> 3 <html>
4 <head> 4 <head>
5 - <title>备案管理</title>  
6 - <meta name="decorator" content="default"/>  
7 - <script type="text/javascript">  
8 - $(document).ready(function() {  
9 - //$("#name").focus();  
10 - $("#inputForm").validate({  
11 - submitHandler: function(form){  
12 - loading('正在提交，请稍等...');  
13 - form.submit();  
14 - },  
15 - errorContainer: "#messageBox",  
16 - errorPlacement: function(error, element) {  
17 - $("#messageBox").text("输入有误，请先更正。");  
18 - if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){  
19 - error.appendTo(element.parent().parent());  
20 - } else {  
21 - error.insertAfter(element);  
22 - }  
23 - } 5 +<title>备案管理</title>
  6 +<meta name="decorator" content="default" />
  7 +<script type="text/javascript">
  8 + $(document).ready(
  9 + function() {
  10 + //$("#name").focus();
  11 + $("#inputForm")
  12 + .validate(
  13 + {
  14 + submitHandler : function(form) {
  15 + loading('正在提交，请稍等...');
  16 + form.submit();
  17 + },
  18 + errorContainer : "#messageBox",
  19 + errorPlacement : function(error, element) {
  20 + $("#messageBox").text("输入有误，请先更正。");
  21 + if (element.is(":checkbox")
  22 + || element.is(":radio")
  23 + || element.parent().is(
  24 + ".input-append")) {
  25 + error.appendTo(element.parent()
  26 + .parent());
  27 + } else {
  28 + error.insertAfter(element);
  29 + }
  30 + }
  31 + });
24 }); 32 });
  33 + $(function() {
  34 + $('input').blur(function() {
  35 + this.value = this.value.toUpperCase();
25 }); 36 });
26 - $(function(){  
27 - $('input').blur(function(){  
28 - this.value=this.value.toUpperCase();  
29 - });  
30 - })  
31 - </script> 37 + })
  38 +</script>
32 <script type="text/javascript"> 39 <script type="text/javascript">
33 - $(function(){  
34 - $('input').blur(function(){  
35 - this.value=this.value.toUpperCase(); 40 + $(function() {
  41 + $('input').blur(function() {
  42 + this.value = this.value.toUpperCase();
36 }); 43 });
37 }) 44 })
38 </script> 45 </script>
39 <style type="text/css"> 46 <style type="text/css">
40 - input{  
41 - text-transform:uppercase;  
42 - } 47 +input {
  48 + text-transform: uppercase;
  49 +}
  50 +</style>
  51 +<style type="text/css">
  52 +.row-lable {
  53 + width: 180px;
  54 + text-align: right;
  55 +}
  56 +
  57 +.row-controls {
  58 + display: inline;
  59 + width: 260px;
  60 +}
43 </style> 61 </style>
44 - <style type="text/css">  
45 - .row-lable{  
46 - margin-left:30px;  
47 - width:180px;  
48 - text-align:right;  
49 - }  
50 - .row-controls{  
51 - margin-left:20px;  
52 - display: inline;  
53 - width:300px;  
54 - }  
55 - </style>  
56 </head> 62 </head>
57 <body> 63 <body>
58 <ul class="nav nav-tabs"> 64 <ul class="nav nav-tabs">
59 <li><a href="${ctx}/land/landRoadVeRecord/">备案列表</a></li> 65 <li><a href="${ctx}/land/landRoadVeRecord/">备案列表</a></li>
60 - <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>  
61 - </ul><br/>  
62 - <form:form id="inputForm" modelAttribute="landRoadVeRecord" action="${ctx}/land/landRoadVeRecord/save" method="post" class="form-horizontal">  
63 - <form:hidden path="id"/>  
64 - <sys:message content="${message}"/>  
65 - <div class="control-group">  
66 - <label class="row-lable">主管海关代码：</label>  
67 - <div class="row-controls">  
68 - <form:input path="mainPort" htmlEscape="false" maxlength="4" class="input-large required" id="mainPort"/>  
69 - <span class="help-inline"><font color="red">*</font></span>  
70 - </div>  
71 - <label class="row-lable">企业代码：</label>  
72 - <div class="row-controls">  
73 - <form:input path="coCode" htmlEscape="false" maxlength="20" class="input-large required"/>  
74 - <span class="help-inline"><font color="red">*</font></span>  
75 - </div>  
76 - </div>  
77 - <div class="control-group">  
78 -  
79 - <label class="row-lable">车牌指标编码：</label>  
80 - <span class="row-controls">  
81 - <form:input path="veTargetNo" htmlEscape="false" maxlength="20" class="input-large required"/>  
82 - <span class="help-inline"><font color="red">*</font></span>  
83 - </span>  
84 - <label class="row-lable">国内车牌：</label>  
85 - <span class="row-controls">  
86 - <form:input path="domesticLisenceNo" htmlEscape="false" maxlength="32" class="input-large required"/>  
87 - <span class="help-inline"><font color="red">*</font></span>  
88 - </span>  
89 - <label class="row-lable">国籍：</label>  
90 - <span class="row-controls">  
91 - <form:input path="nationality" htmlEscape="false" maxlength="4" class="input-large "/>  
92 - </span>  
93 - </div>  
94 - </div>  
95 - <div class="control-group">  
96 - <label class="row-lable">注册地址：</label>  
97 - <span class="row-controls">  
98 - <form:input path="veRegPlace" htmlEscape="false" maxlength="4" class="input-large required"/>  
99 - <span class="help-inline"><font color="red">*</font></span>  
100 - </span>  
101 - <label class="row-lable">车牌颜色：</label>  
102 - <span class="row-controls">  
103 - <form:input path="domesticLicenseColor" htmlEscape="false" maxlength="4" class="input-large "/>  
104 - </span>  
105 - <label class="row-lable">外籍车牌：</label>  
106 - <span class="row-controls">  
107 - <form:input path="foreignLicense" htmlEscape="false" maxlength="32" class="input-large "/>  
108 - </span>  
109 - </div>  
110 - <div class="control-group">  
111 - <label class="row-lable">使用性质：</label>  
112 - <span class="row-controls">  
113 - <form:input path="veProperty" htmlEscape="false" maxlength="4" class="input-large required"/>  
114 - <span class="help-inline"><font color="red">*</font></span>  
115 - </span>  
116 - <label class="row-lable">车辆分类：</label>  
117 - <span class="row-controls">  
118 - <form:select path="veClassFlag" class="input-large required">  
119 - <form:option value="" label=""/>  
120 - <form:option value="进出境公路运输工具" label="进出境公路运输工具"/>  
121 - <form:option value="来往港澳公路运输工具" label="来往港澳公路运输工具"/>  
122 - <form:option value="进出境公/私用公路交通工具" label="进出境公/私用公路交通工具"/>  
123 - <form:option value="来往港澳公/私用公路交通工具 " label="来往港澳公/私用公路交通工具"/>  
124 - </form:select> 66 + <li class="active"><a
  67 + href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">备案<shiro:hasPermission
  68 + name="land:landRoadVeRecord:edit">${not empty landRoadVeRecord.id?'修改':'添加'}</shiro:hasPermission>
  69 + <shiro:lacksPermission name="land:landRoadVeRecord:edit">查看</shiro:lacksPermission></a></li>
  70 + </ul>
  71 + <br />
  72 + <form:form id="inputForm" modelAttribute="landRoadVeRecord"
  73 + action="${ctx}/land/landRoadVeRecord/save" method="post"
  74 + class="form-horizontal">
  75 + <form:hidden path="id" />
  76 + <sys:message content="${message}" />
  77 + <div class="control-group">
  78 + <h4>车辆信息</h4>
  79 + </div>
  80 + <div class="control-group">
  81 + <label class="row-lable">主管海关代码：</label>
  82 + <div class="row-controls">
  83 + <form:input path="mainPort" htmlEscape="false" maxlength="4"
  84 + class="input-large required" id="mainPort" />
125 <span class="help-inline"><font color="red">*</font></span> 85 <span class="help-inline"><font color="red">*</font></span>
126 - </span>  
127 - <label class="row-lable">车辆运输资格：</label>  
128 - <span class="row-controls">  
129 - <form:input path="veConveyQua" htmlEscape="false" maxlength="4" class="input-large required"/> 86 + </div>
  87 + <label class="row-lable">企业代码：</label>
  88 + <div class="row-controls">
  89 + <form:input path="coCode" htmlEscape="false" maxlength="20"
  90 + class="input-large required" />
130 <span class="help-inline"><font color="red">*</font></span> 91 <span class="help-inline"><font color="red">*</font></span>
131 - </span> 92 + </div>
132 </div> 93 </div>
133 <div class="control-group"> 94 <div class="control-group">
134 -  
135 - <label class="row-lable">车辆行驶证编号：</label> 95 + <label class="row-lable">国内车牌：</label>
136 <span class="row-controls"> 96 <span class="row-controls">
137 - <form:input path="veCardNo" htmlEscape="false" maxlength="32" class="input-large required"/>  
138 - <span class="help-inline"><font color="red">*</font></span>  
139 - </span>  
140 - <label class="row-lable">车辆登记车主名称：</label>  
141 - <span class="row-controls">  
142 - <form:input path="veOwnerName" htmlEscape="false" maxlength="255" class="input-large required"/>  
143 - <span class="help-inline"><font color="red">*</font></span> 97 + <form:input path="domesticLisenceNo" htmlEscape="false"
  98 + maxlength="32" class="input-large required" /> <span
  99 + class="help-inline"><font color="red">*</font></span>
144 </span> 100 </span>
145 - <label class="row-lable">车辆登记车主证件号码：</label>  
146 - <span class="row-controls">  
147 - <form:input path="veOwnerNo" htmlEscape="false" maxlength="32" class="input-large required"/> 101 + <label class="row-lable">车主姓名：</label>
  102 + <span class="row-controls">
  103 + <form:input path="veOwnerName"
  104 + htmlEscape="false" maxlength="255" class="input-large required" />
148 <span class="help-inline"><font color="red">*</font></span> 105 <span class="help-inline"><font color="red">*</font></span>
149 </span> 106 </span>
150 </div> 107 </div>
151 <div class="control-group"> 108 <div class="control-group">
152 - <label class="row-lable">车主境内联系电话：</label>  
153 - <span class="row-controls">  
154 - <form:input path="ownerInsideTel" htmlEscape="false" maxlength="32" class="input-large required phone"/> 109 + <label class="row-lable">车主证件号码：</label> <span
  110 + class="row-controls"> <form:input path="veOwnerNo"
  111 + htmlEscape="false" maxlength="32" class="input-large required" />
155 <span class="help-inline"><font color="red">*</font></span> 112 <span class="help-inline"><font color="red">*</font></span>
156 - </span>  
157 - <label class="row-lable">车主境内联系地址：</label>  
158 - <span class="row-controls">  
159 - <form:input path="ownerInsideAddr" htmlEscape="false" maxlength="255" class="input-large "/>  
160 - </span>  
161 - <label class="row-lable">车辆类型(型样)：</label>  
162 - <span class="row-controls">  
163 - <form:input path="veType" htmlEscape="false" maxlength="5" class="input-large "/> 113 + </span> <label class="row-lable">车主联系电话：</label> <span
  114 + class="row-controls"> <form:input path="ownerInsideTel"
  115 + htmlEscape="false" maxlength="32"
  116 + class="input-large required phone" /> <span class="help-inline"><font
  117 + color="red">*</font></span>
164 </span> 118 </span>
165 </div> 119 </div>
166 <div class="control-group"> 120 <div class="control-group">
167 - <label class="row-lable">厂牌：</label>  
168 - <span class="row-controls">  
169 - <form:input path="brand" htmlEscape="false" maxlength="20" class="input-large "/>  
170 - </span>  
171 - <label class="row-lable">车型：</label>  
172 - <span class="row-controls">  
173 - <form:input path="model" htmlEscape="false" maxlength="9" class="input-large "/>  
174 - </span>  
175 - <label class="row-lable">排气量(L)：</label>  
176 - <span class="row-controls">  
177 - <form:input path="exhaustCapacity" htmlEscape="false" maxlength="20" class="input-large numberCheck"/>  
178 - </span>  
179 - </div>  
180 - <div class="control-group">  
181 - <label class="row-lable">车架号（车辆识别代号）：</label>  
182 - <span class="row-controls">  
183 - <form:input path="veFrameNo" htmlEscape="false" maxlength="30" class="input-large required"/> 121 + <label class="row-lable">核定载货重量：</label> <span
  122 + class="row-controls">
  123 + <form:input path="veTon" htmlEscape="false" maxlength="10"
  124 + class="input-large required numberCheck" placeholder="货车核载单位为：kg" />
184 <span class="help-inline"><font color="red">*</font></span> 125 <span class="help-inline"><font color="red">*</font></span>
185 - </span>  
186 - <label class="row-lable">车辆出厂日期：</label>  
187 - <span class="row-controls">  
188 - <input name="veFactoryDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "  
189 - value="<fmt:formatDate value="${landRoadVeRecord.veFactoryDate}" pattern="yyyy-MM-dd"/>"  
190 - onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>  
191 - </span>  
192 - <label class="row-lable">发动机号：</label>  
193 - <span class="row-controls">  
194 - <form:input path="veMotorNo" htmlEscape="false" maxlength="30" class="input-large "/>  
195 - </span>  
196 - </div>  
197 - <div class="control-group">  
198 - <label class="row-lable">核定载客/核定载质量：</label>  
199 - <span class="row-controls">  
200 - <form:input path="veTon" htmlEscape="false" maxlength="10" class="input-large required numberCheck"  
201 - placeholder="客车核载单位为：人,货车核载单位为：kg。"/>  
202 - <span class="help-inline"><font color="red">*</font></span>  
203 - </span>  
204 - <label class="row-lable">自重（整备质量）：</label>  
205 - <span class="row-controls">  
206 - <form:input path="selfWt" htmlEscape="false" maxlength="10" class="input-large required numberCheck"/>  
207 - <span class="help-inline"><font color="red">*</font></span>  
208 - </span>  
209 - <label class="row-lable">准牵引总质量：</label>  
210 - <span class="row-controls">  
211 - <form:input path="allowTowTotalWt" htmlEscape="false" maxlength="10" class="input-large required numberCheck"/>  
212 - <span class="help-inline"><font color="red">*</font></span>  
213 - </span>  
214 - </div>  
215 - <div class="control-group">  
216 - <label class="row-lable">货箱内部长度（M）：</label>  
217 - <span class="row-controls">  
218 - <form:input path="containerInnerLength" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>  
219 - </span>  
220 - <label class="row-lable">货箱内部宽度（M）：</label>  
221 - <span class="row-controls">  
222 - <form:input path="containerInnerWidth" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>  
223 - </span>  
224 - <label class="row-lable">货箱内部高度（M）：</label>  
225 - <span class="row-controls">  
226 - <form:input path="containerInnerHeight" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>  
227 - </span>  
228 - </div>  
229 - <div class="control-group">  
230 - <label class="row-lable">外廓长度（M）：</label>  
231 - <span class="row-controls">  
232 - <form:input path="outerLength" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>  
233 - </span>  
234 - <label class="row-lable">外廓宽度（M）：</label>  
235 - <span class="row-controls">  
236 - <form:input path="outerWidth" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>  
237 - </span>  
238 - <label class="row-lable">外廓高度（M）：</label>  
239 - <span class="row-controls">  
240 - <form:input path="outerHeight" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>  
241 - </span>  
242 - </div>  
243 - <div class="control-group">  
244 - <label class="row-lable">车身颜色：</label>  
245 - <span class="row-controls">  
246 - <form:input path="veBodyColor" htmlEscape="false" maxlength="10" class="input-large "/>  
247 - </span>  
248 - <label class="row-lable">油箱容量（升）：</label>  
249 - <span class="row-controls">  
250 - <form:input path="oilBoxCapcity" htmlEscape="false" maxlength="10" class="input-large numberCheck"/>  
251 - </span>  
252 - <label class="row-lable">最新更新申请业务类型：</label>  
253 - <span class="row-controls">  
254 - <form:select path="currApplyBussiness" class="input-large ">  
255 - <form:option value="" label=""/>  
256 - <form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>  
257 - </form:select> 126 + </span>
  127 + <label class="row-lable">自重（空车重量）：</label>
  128 + <span class="row-controls">
  129 + <form:input path="selfWt" htmlEscape="false" maxlength="10" placeholder="单位：kg"
  130 + class="input-large required numberCheck" />
  131 + <span class="help-inline"><font color="red">*</font></span>
258 </span> 132 </span>
259 </div> 133 </div>
260 <div class="control-group"> 134 <div class="control-group">
261 - <label class="row-lable">批准车辆进出口岸：</label>  
262 - <span class="row-controls">  
263 - <form:input path="allowVeIePort" htmlEscape="false" maxlength="255" class="input-large required"/>  
264 - <span class="help-inline"><font color="red">*</font></span>  
265 - </span>  
266 - <label class="row-lable">批文/许可证编号：</label>  
267 - <span class="row-controls">  
268 - <form:input path="apprNo" htmlEscape="false" maxlength="5" class="input-large required"/>  
269 - <span class="help-inline"><font color="red">*</font></span>  
270 - </span>  
271 - <label class="row-lable">批文/许可证有效期：</label> 135 + <label class="row-lable">申请人：</label>
272 <span class="row-controls"> 136 <span class="row-controls">
273 - <input name="apprPeriod" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate required"  
274 - value="<fmt:formatDate value="${landRoadVeRecord.apprPeriod}" pattern="yyyy-MM-dd"/>"  
275 - onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> 137 + <form:input path="proposer" htmlEscape="false" maxlength="32"
  138 + class="input-large required" />
276 <span class="help-inline"><font color="red">*</font></span> 139 <span class="help-inline"><font color="red">*</font></span>
277 - </span>  
278 - </div>  
279 - <div class="control-group">  
280 - <label class="control-label">车前45度照片:</label>  
281 - <div class="controls">  
282 - <form:hidden id="front45cPic" path="front45cPic" htmlEscape="false" maxlength="255" class="input-large"/>  
283 - <sys:ckfinder input="front45cPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>  
284 - </div>  
285 - </div>  
286 - <div class="control-group">  
287 - <label class="control-label">车后45度照片：</label>  
288 - <div class="controls">  
289 - <form:hidden id="back45cPic" path="back45cPic" htmlEscape="false" maxlength="255" class="input-large "/>  
290 - <sys:ckfinder input="back45cPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>  
291 - </div>  
292 - </div>  
293 - <div class="control-group">  
294 - <label class="control-label">油箱照片：</label>  
295 - <div class="controls">  
296 - <form:hidden id="oilBoxPic" path="oilBoxPic" htmlEscape="false" maxlength="255" class="input-large "/>  
297 - <sys:ckfinder input="oilBoxPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>  
298 - </div>  
299 - </div>  
300 - <div class="control-group">  
301 - <label class="control-label">车底照片：</label>  
302 - <div class="controls">  
303 - <form:hidden id="veBottomPic" path="veBottomPic" htmlEscape="false" maxlength="255" class="input-large "/>  
304 - <sys:ckfinder input="veBottomPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>  
305 - </div>  
306 - </div>  
307 -  
308 - <div class="control-group">  
309 - <label class="row-lable">申请人：</label> 140 + </span>
  141 + <label class="row-lable">申请时间：</label>
310 <span class="row-controls"> 142 <span class="row-controls">
311 - <form:input path="proposer" htmlEscape="false" maxlength="32" class="input-large required"/> 143 + <input name="proposeTime" type="text" readonly="readonly"
  144 + maxlength="20" class="input-medium Wdate required"
  145 + value="<fmt:formatDate value="${landRoadVeRecord.proposeTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
  146 + onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
312 <span class="help-inline"><font color="red">*</font></span> 147 <span class="help-inline"><font color="red">*</font></span>
313 - </span>  
314 - <label class="row-lable">申请时间：</label>  
315 - <span class="row-controls">  
316 - <input name="proposeTime" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "  
317 - value="<fmt:formatDate value="${landRoadVeRecord.proposeTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"  
318 - onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});"/>  
319 - </span>  
320 - <label class="row-lable">数据操作类型：</label>  
321 - <span class="row-controls">  
322 - <form:select path="operationType" class="input-large ">  
323 - <form:option value="" label=""/>  
324 - <form:options items="${fns:getDictList('')}" itemLabel="label" itemValue="value" htmlEscape="false"/>  
325 - </form:select>  
326 - </span> 148 + </span>
327 </div> 149 </div>
328 <div class="control-group"> 150 <div class="control-group">
329 - <label class="row-lable">挂车牌号：</label> 151 + <label class="row-lable">挂车牌号：</label>
330 <span class="row-controls"> 152 <span class="row-controls">
331 - <form:input path="trailerLicenseNo" htmlEscape="false" maxlength="32" class="input-large required"/>  
332 - <span class="help-inline"><font color="red">*</font></span> 153 + <form:input path="trailerLicenseNo" htmlEscape="false"
  154 + maxlength="32" class="input-large" />
333 </span> 155 </span>
334 - <label class="row-lable">挂车车架号：</label> 156 + <label class="row-lable">挂车车架号：</label>
335 <span class="row-controls"> 157 <span class="row-controls">
336 - <form:input path="trailerFrameNo" htmlEscape="false" maxlength="32" class="input-large required"/>  
337 - <span class="help-inline"><font color="red">*</font></span> 158 + <form:input path="trailerFrameNo" htmlEscape="false" maxlength="32"
  159 + class="input-large" />
338 </span> 160 </span>
339 - 161 +
340 </div> 162 </div>
341 <div class="control-group"> 163 <div class="control-group">
342 - <label class="control-label">批文扫描图：</label>  
343 - <div class="controls">  
344 - <form:hidden id="approNoPic" path="approNoPic" htmlEscape="false" maxlength="255" class="input-large "/>  
345 - <sys:ckfinder input="approNoPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>  
346 - </div>  
347 - </div>  
348 - <div class="control-group">  
349 - <label class="control-label">车架号扫描图：</label>  
350 - <div class="controls">  
351 - <form:hidden id="veFrameNoPic" path="veFrameNoPic" htmlEscape="false" maxlength="255" class="input-large "/>  
352 - <sys:ckfinder input="veFrameNoPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>  
353 - </div>  
354 - </div>  
355 - <div class="control-group">  
356 - <label class="control-label">发动机拓印件：</label>  
357 - <div class="controls">  
358 - <form:hidden id="motorNoPic" path="motorNoPic" htmlEscape="false" maxlength="255" class="input-large "/>  
359 - <sys:ckfinder input="motorNoPic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>  
360 - </div>  
361 - </div>  
362 - <div class="control-group">  
363 - <label class="control-label">外籍车牌照片：</label>  
364 - <div class="controls">  
365 - <form:hidden id="foreignLicensePic" path="foreignLicensePic" htmlEscape="false" maxlength="255" class="input-large "/>  
366 - <sys:ckfinder input="foreignLicensePic" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>  
367 - </div>  
368 - </div>  
369 - <div class="control-group">  
370 - <label class="row-lable">备注：</label>  
371 - <span class="row-controls">  
372 - <form:textarea path="memo" rows="3" htmlEscape="false" maxlength="512" class="input-xxlarge required"/> 164 + <label class="row-lable">备注：</label> <span class="row-controls">
  165 + <form:textarea path="memo" rows="3" htmlEscape="false"
  166 + maxlength="512" class="input-xxlarge" />
373 </span> 167 </span>
374 </div> 168 </div>
375 - <span class="help-inline"><font color="red" >注：页面内容请全部填写</font></span>  
376 <div class="form-actions"> 169 <div class="form-actions">
377 - <shiro:hasPermission name="land:landRoadVeRecord:edit"><input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;</shiro:hasPermission>  
378 - <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/> 170 + <shiro:hasPermission name="land:landRoadVeRecord:edit">
  171 + <input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存" />&nbsp;
  172 + </shiro:hasPermission>
  173 + <input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)" />
379 </div> 174 </div>
380 </form:form> 175 </form:form>
381 </body> 176 </body>
@@ -62,6 +62,7 @@ @@ -62,6 +62,7 @@
62 <td>${landRoadVeRecord.selfWt }</td> 62 <td>${landRoadVeRecord.selfWt }</td>
63 <td>${landRoadVeRecord.allowTowTotalWt }</td> 63 <td>${landRoadVeRecord.allowTowTotalWt }</td>
64 <td>${landRoadVeRecord.veClassFlag }</td> 64 <td>${landRoadVeRecord.veClassFlag }</td>
  65 + <td>${landRoadVeRecord.returnmessage }</td>
65 <td><a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}"> 66 <td><a href="${ctx}/land/landRoadVeRecord/form?id=${landRoadVeRecord.id}">
66 <fmt:formatDate value="${landRoadVeRecord.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/> 67 <fmt:formatDate value="${landRoadVeRecord.updateDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
67 </a></td> 68 </a></td>
@@ -222,7 +222,7 @@ @@ -222,7 +222,7 @@
222 </div> 222 </div>
223 </div> 223 </div>
224 <div id="footer" class="row-fluid"> 224 <div id="footer" class="row-fluid">
225 - Copyright &copy; 2012-${fns:getConfig('copyrightYear')} ${fns:getConfig('productName')} - Powered By <a href="#" target="_blank">ShangYou</a> ${fns:getConfig('version')} 225 + Copyright &copy; 2012-${fns:getConfig('copyrightYear')} ${fns:getConfig('productName')} - Powered By <a href="#" target="_blank"></a> ${fns:getConfig('version')}
226 </div> 226 </div>
227 </div> 227 </div>
228 </div> 228 </div>
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 </div> 68 </div>
69 </form> 69 </form>
70 <div class="footer"> 70 <div class="footer">
71 - 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')} 71 + 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')}
72 </div> 72 </div>
73 <script src="${ctxStatic}/flash/zoom.min.js" type="text/javascript"></script> 73 <script src="${ctxStatic}/flash/zoom.min.js" type="text/javascript"></script>
74 </body> 74 </body>
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <%-- <form:input path="yardId" htmlEscape="false" maxlength="64" class="input-xlarge "/> --%> 39 <%-- <form:input path="yardId" htmlEscape="false" maxlength="64" class="input-xlarge "/> --%>
40 <form:select path="yardId" class="input-medium required"> 40 <form:select path="yardId" class="input-medium required">
41 <form:option value="" label="" /> 41 <form:option value="" label="" />
42 - <form:options items="${yardList}" itemLabel="name" itemValue="id" htmlEscape="false"/> 42 + <form:options items="${yardList}" itemLabel="name" itemValue="stationid" htmlEscape="false"/>
43 </form:select> 43 </form:select>
44 <span class="help-inline"><font color="red">*</font> </span> 44 <span class="help-inline"><font color="red">*</font> </span>
45 </div> 45 </div>
@@ -41,6 +41,18 @@ @@ -41,6 +41,18 @@
41 </div> 41 </div>
42 </div> 42 </div>
43 <div class="control-group"> 43 <div class="control-group">
  44 + <label class="control-label">区域代码：</label>
  45 + <div class="controls">
  46 + <form:input path="areaCode" htmlEscape="false" maxlength="5" class="input-xlarge "/>
  47 + </div>
  48 + </div>
  49 + <div class="control-group">
  50 + <label class="control-label">场站ID：</label>
  51 + <div class="controls">
  52 + <form:input path="stationid" htmlEscape="false" maxlength="10" class="input-xlarge "/>
  53 + </div>
  54 + </div>
  55 + <div class="control-group">
44 <label class="control-label">关区代码：</label> 56 <label class="control-label">关区代码：</label>
45 <div class="controls"> 57 <div class="controls">
46 <%-- <form:input path="customsCode" htmlEscape="false" maxlength="10" class="input-xlarge required"/> 58 <%-- <form:input path="customsCode" htmlEscape="false" maxlength="10" class="input-xlarge required"/>
@@ -40,6 +40,8 @@ @@ -40,6 +40,8 @@
40 <thead> 40 <thead>
41 <tr> 41 <tr>
42 <th>场站名称</th> 42 <th>场站名称</th>
  43 + <th>区域代码</th>
  44 + <th>场站ID</th>
43 <th>关区代码</th> 45 <th>关区代码</th>
44 <th>备注信息</th> 46 <th>备注信息</th>
45 <shiro:hasPermission name="yard:yard:edit"><th>操作</th></shiro:hasPermission> 47 <shiro:hasPermission name="yard:yard:edit"><th>操作</th></shiro:hasPermission>
@@ -52,6 +54,12 @@ @@ -52,6 +54,12 @@
52 ${yard.name} 54 ${yard.name}
53 </a></td> 55 </a></td>
54 <td> 56 <td>
  57 + ${yard.areaCode}
  58 + </td>
  59 + <td>
  60 + ${yard.stationid}
  61 + </td>
  62 + <td>
55 ${yard.customsCode} 63 ${yard.customsCode}
56 </td> 64 </td>
57 <td> 65 <td>
1 $(function(){ 1 $(function(){
2 $("input").blur(function(){ 2 $("input").blur(function(){
3 - if(new RegExp("[`~!@#$^&*()=|{}';'\\[\\].<>/?~！@#￥……&*（）——|{}【】‘；”“'。，、？%+_]").test(this.value)){ 3 + if(new RegExp("[`~!@#$^&*()=|{}';'.<>?~！@#￥……&*（）——|{}【】‘；”“'。，、？%+_]").test(this.value)){
4 this.value= this.value.replace(/[^\u4e00-\u9fa5\w]/g,''); 4 this.value= this.value.replace(/[^\u4e00-\u9fa5\w]/g,'');
5 } 5 }
6 }) 6 })