朱兆平 / agent · 提交

转到一个项目

作者 申海龙
提交 07b32dd31c98e150cd134cf0c7872e37bcc49183 1 个父辈 74620e5c

安检申报 货主 类型改为单选 列表展示海关关区 发布时间 海关关区搜索

内嵌 并排对比
正在显示 15 个修改的文件 包含 252 行增加 和 79 行删除
1 package com.agent.controller.agent; 1 package com.agent.controller.agent;
2 2
3 -import com.agent.entity.agent.ManifestEntity;  
4 -import com.agent.entity.agent.SDCargoNameEntity;  
5 -import com.agent.entity.agent.SDCargoTypeEntity;  
6 -import com.agent.entity.agent.SecurityDeclarationEntity; 3 +import com.agent.entity.agent.*;
7 import com.agent.entity.system.UserEntity; 4 import com.agent.entity.system.UserEntity;
8 import com.agent.service.agent.ManifestService; 5 import com.agent.service.agent.ManifestService;
9 import com.agent.service.system.SDCargoNameService; 6 import com.agent.service.system.SDCargoNameService;
@@ -78,7 +75,7 @@ public class SecurityDeclarationController { @@ -78,7 +75,7 @@ public class SecurityDeclarationController {
78 */ 75 */
79 @RequestMapping(value = "/grid.json") 76 @RequestMapping(value = "/grid.json")
80 @ResponseBody 77 @ResponseBody
81 - public DataGrid<SecurityDeclarationVo> grid(HttpServletRequest request, EasyPage<SecurityDeclarationEntity> pageForm) { 78 + public DataGrid<SecurityDeclarationVo> grid(HttpServletRequest request, EasyPage<SecurityManifestEntity> pageForm) {
82 79
83 Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_"); 80 Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
84 UserEntity ue = (UserEntity)SecurityUtils.getSubject().getSession().getAttribute("user"); 81 UserEntity ue = (UserEntity)SecurityUtils.getSubject().getSession().getAttribute("user");
@@ -94,24 +91,25 @@ public class SecurityDeclarationController { @@ -94,24 +91,25 @@ public class SecurityDeclarationController {
94 91
95 pageForm.parseData(securityDeclarationService.getPage(pageForm)); 92 pageForm.parseData(securityDeclarationService.getPage(pageForm));
96 93
97 - DataGrid<SecurityDeclarationEntity> securityDeclarationEntityDataGrid = pageForm.getData(); 94 + DataGrid<SecurityManifestEntity> securityDeclarationEntityDataGrid = pageForm.getData();
98 95
99 List<SecurityDeclarationVo>rows = new ArrayList<>(); 96 List<SecurityDeclarationVo>rows = new ArrayList<>();
100 97
101 if (CollectionUtils.isNotEmpty(securityDeclarationEntityDataGrid.getRows())){ 98 if (CollectionUtils.isNotEmpty(securityDeclarationEntityDataGrid.getRows())){
102 - for (SecurityDeclarationEntity sd: securityDeclarationEntityDataGrid.getRows()){ 99 + for (SecurityManifestEntity sd: securityDeclarationEntityDataGrid.getRows()){
103 SecurityDeclarationVo sdVo = new SecurityDeclarationVo(); 100 SecurityDeclarationVo sdVo = new SecurityDeclarationVo();
104 sdVo.setId(sd.getId()); 101 sdVo.setId(sd.getId());
105 - sdVo.setSd_waybill(sd.getSd_waybill());  
106 - sdVo.setSd_cargo_shipper_name(sd.getSd_cargo_shipper_name());  
107 - sdVo.setSd_cargo_agent_name(sd.getSd_cargo_agent_name());  
108 - sdVo.setSd_transport_certificate(sd.getSd_transport_certificate());  
109 - sdVo.setSd_transportation_prove(sd.getSd_transportation_prove());  
110 - sdVo.setSd_iata_number(sd.getSd_iata_number());  
111 - if("1".equals(sd.getSd_static())){ 102 + sdVo.setSd_waybill(sd.getWaybill());
  103 + sdVo.setSd_cargo_shipper_name(sd.getShippername());
  104 + sdVo.setSd_cargo_agent_name(sd.getAgentname());
  105 + sdVo.setSd_transport_certificate(sd.getCertificate());
  106 + sdVo.setSd_transportation_prove(sd.getProve());
  107 + sdVo.setSd_iata_number(sd.getIata());
  108 + if("1".equals(sd.getStatics())){
112 sdVo.setSd_static("已发送安检申报报文"); 109 sdVo.setSd_static("已发送安检申报报文");
113 } 110 }
114 - 111 + sdVo.setOperation(sd.getOperation());
  112 + sdVo.setCustoms(sd.getCustoms());
115 rows.add(sdVo); 113 rows.add(sdVo);
116 } 114 }
117 } 115 }
@@ -219,6 +217,9 @@ public class SecurityDeclarationController { @@ -219,6 +217,9 @@ public class SecurityDeclarationController {
219 sd.setSd_transport_certificate(transportCertificate); 217 sd.setSd_transport_certificate(transportCertificate);
220 sd.setSd_transportation_prove(transportationProve); 218 sd.setSd_transportation_prove(transportationProve);
221 sd.setSd_static("1"); 219 sd.setSd_static("1");
  220 + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  221 + String format = simpleDateFormat.format(new Date());
  222 + sd.setOperation_time(format);
222 if (ue != null){ 223 if (ue != null){
223 if (ue.getId() != null ){ 224 if (ue.getId() != null ){
224 sd.setUSER_ID(ue.getId()); 225 sd.setUSER_ID(ue.getId());
@@ -368,8 +369,8 @@ public class SecurityDeclarationController { @@ -368,8 +369,8 @@ public class SecurityDeclarationController {
368 String cName = cargoName.replaceAll("，", ","); 369 String cName = cargoName.replaceAll("，", ",");
369 String[] split = cName.split(","); 370 String[] split = cName.split(",");
370 for (int i=0; i<split.length; i++){ 371 for (int i=0; i<split.length; i++){
371 - if (!StringUtils.isBlank(split[i]) || !"".equals(split[i])){  
372 SDCargoNameEntity sdCargoNameEntity = new SDCargoNameEntity(); 372 SDCargoNameEntity sdCargoNameEntity = new SDCargoNameEntity();
  373 + if (!StringUtils.isBlank(split[i]) || !"".equals(split[i])){
373 sdCargoNameEntity.setSd_waybill(waybill); 374 sdCargoNameEntity.setSd_waybill(waybill);
374 sdCargoNameEntity.setSd_cargo_name(split[i]); 375 sdCargoNameEntity.setSd_cargo_name(split[i]);
375 sdCargoNameService.save(sdCargoNameEntity); 376 sdCargoNameService.save(sdCargoNameEntity);
@@ -395,6 +396,9 @@ public class SecurityDeclarationController { @@ -395,6 +396,9 @@ public class SecurityDeclarationController {
395 manifestEntity.setUSER_ID(ue.getId()); 396 manifestEntity.setUSER_ID(ue.getId());
396 } 397 }
397 } 398 }
  399 + SimpleDateFormat simpleDateFormats = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  400 + String format = simpleDateFormats.format(new Date());
  401 + sd.setOperation_time(format);
398 securityDeclarationService.save(sd); 402 securityDeclarationService.save(sd);
399 403
400 // 生成报文并且发送 404 // 生成报文并且发送
@@ -660,7 +664,9 @@ public class SecurityDeclarationController { @@ -660,7 +664,9 @@ public class SecurityDeclarationController {
660 sd.setSd_transportation_prove(transportationProve); 664 sd.setSd_transportation_prove(transportationProve);
661 sd.setSd_static("1"); 665 sd.setSd_static("1");
662 sd.setUSER_ID(ue.getId()); 666 sd.setUSER_ID(ue.getId());
663 - 667 + SimpleDateFormat simpleDateFormats = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  668 + String format = simpleDateFormats.format(new Date());
  669 + sd.setOperation_time(format);
664 if (securityDeclarationService.update(sd)>0){ 670 if (securityDeclarationService.update(sd)>0){
665 model.setStatus(200); 671 model.setStatus(200);
666 } 672 }
@@ -56,6 +56,19 @@ public class SecurityDeclarationEntity extends IdEntity implements Serializable @@ -56,6 +56,19 @@ public class SecurityDeclarationEntity extends IdEntity implements Serializable
56 */ 56 */
57 private String sd_static; 57 private String sd_static;
58 58
  59 + /**
  60 + * 操作时间
  61 + * @return
  62 + */
  63 + private String operation_time;
  64 +
  65 + public String getOperation_time() {
  66 + return operation_time;
  67 + }
  68 +
  69 + public void setOperation_time(String operation_time) {
  70 + this.operation_time = operation_time;
  71 + }
59 72
60 public Long getUSER_ID() { 73 public Long getUSER_ID() {
61 return USER_ID; 74 return USER_ID;
  1 +package com.agent.entity.agent;
  2 +
  3 +import com.agent.entity.IdEntity;
  4 +
  5 +import javax.persistence.Entity;
  6 +import javax.persistence.Table;
  7 +import java.io.Serializable;
  8 +
  9 +/**
  10 + * @Auther: shenhl
  11 + * @Date: 2019/7/23 16:47
  12 + */
  13 +@Entity
  14 +@Table(name = "SECURITY_MANIFEST")
  15 +public class SecurityManifestEntity extends IdEntity implements Serializable {
  16 +
  17 + private static final long serialVersionUID = 1L;
  18 +
  19 +// private Long id;
  20 +
  21 + private String waybill;
  22 +
  23 + private String shippername;
  24 +
  25 + private String agentname;
  26 +
  27 + private String iata;
  28 +
  29 + private String certificate;
  30 +
  31 + private String prove;
  32 +
  33 + private Long userid;
  34 +
  35 + private String operation;
  36 +
  37 + private String customs;
  38 +
  39 + private String statics;
  40 +
  41 + public String getStatics() {
  42 + return statics;
  43 + }
  44 +
  45 + public void setStatics(String statics) {
  46 + this.statics = statics;
  47 + }
  48 +
  49 +// @Override
  50 +// public Long getId() {
  51 +// return id;
  52 +// }
  53 +//
  54 +// @Override
  55 +// public void setId(Long id) {
  56 +// this.id = id;
  57 +// }
  58 +
  59 + public String getWaybill() {
  60 + return waybill;
  61 + }
  62 +
  63 + public void setWaybill(String waybill) {
  64 + this.waybill = waybill;
  65 + }
  66 +
  67 + public String getShippername() {
  68 + return shippername;
  69 + }
  70 +
  71 + public void setShippername(String shippername) {
  72 + this.shippername = shippername;
  73 + }
  74 +
  75 + public String getAgentname() {
  76 + return agentname;
  77 + }
  78 +
  79 + public void setAgentname(String agentname) {
  80 + this.agentname = agentname;
  81 + }
  82 +
  83 + public String getIata() {
  84 + return iata;
  85 + }
  86 +
  87 + public void setIata(String iata) {
  88 + this.iata = iata;
  89 + }
  90 +
  91 + public String getCertificate() {
  92 + return certificate;
  93 + }
  94 +
  95 + public void setCertificate(String certificate) {
  96 + this.certificate = certificate;
  97 + }
  98 +
  99 + public String getProve() {
  100 + return prove;
  101 + }
  102 +
  103 + public void setProve(String prove) {
  104 + this.prove = prove;
  105 + }
  106 +
  107 + public Long getUserid() {
  108 + return userid;
  109 + }
  110 +
  111 + public void setUserid(Long userid) {
  112 + this.userid = userid;
  113 + }
  114 +
  115 + public String getOperation() {
  116 + return operation;
  117 + }
  118 +
  119 + public void setOperation(String operation) {
  120 + this.operation = operation;
  121 + }
  122 +
  123 + public String getCustoms() {
  124 + return customs;
  125 + }
  126 +
  127 + public void setCustoms(String customs) {
  128 + this.customs = customs;
  129 + }
  130 +}
@@ -25,4 +25,9 @@ public interface SDCargoNameRepository extends PagingAndSortingRepository<SDCarg @@ -25,4 +25,9 @@ public interface SDCargoNameRepository extends PagingAndSortingRepository<SDCarg
25 @Query(value = "delete from SD_CARGO_NAME where id = ?1", nativeQuery = true) 25 @Query(value = "delete from SD_CARGO_NAME where id = ?1", nativeQuery = true)
26 int deleteAlls(Long waybill); 26 int deleteAlls(Long waybill);
27 27
  28 + @Transactional
  29 + @Modifying
  30 + @Query(value = "delete from SD_CARGO_NAME where sd_waybill = ?1", nativeQuery = true)
  31 + int deletes(String waybillnomaster);
  32 +
28 } 33 }
@@ -16,10 +16,10 @@ public interface SecurityDeclarationRepository extends PagingAndSortingRepositor @@ -16,10 +16,10 @@ public interface SecurityDeclarationRepository extends PagingAndSortingRepositor
16 16
17 @Transactional 17 @Transactional
18 @Modifying 18 @Modifying
19 - @Query(value = "update SECURITY_DECLARATION set SD_WAYBILL=?2, SD_CARGO_SHIPPER_NAME=?4, SD_CARGO_AGENT_NAME=?3, SD_IATA_NUMBER=?5, SD_TRANSPORT_CERTIFICATE=?6, SD_TRANSPORTATION_PROVE=?7, USER_ID=?8 where id=?1", nativeQuery = true) 19 + @Query(value = "update SECURITY_DECLARATION set SD_WAYBILL=?2, SD_CARGO_SHIPPER_NAME=?4, SD_CARGO_AGENT_NAME=?3, SD_IATA_NUMBER=?5, SD_TRANSPORT_CERTIFICATE=?6, SD_TRANSPORTATION_PROVE=?7, USER_ID=?8, OPERATION_TIME=?9 where id=?1", nativeQuery = true)
20 int update(Long id, String waybill, 20 int update(Long id, String waybill,
21 String cargoAgent, String cargoShipper, 21 String cargoAgent, String cargoShipper,
22 - String iata, String tranposrt, String prove, Long userId); 22 + String iata, String tranposrt, String prove, Long userId, String operation);
23 23
24 @Query(value = "select count(*) from SECURITY_DECLARATION where SD_WAYBILL = ?1", nativeQuery = true) 24 @Query(value = "select count(*) from SECURITY_DECLARATION where SD_WAYBILL = ?1", nativeQuery = true)
25 int findWaybill(String waybill); 25 int findWaybill(String waybill);
  1 +package com.agent.repository.system;
  2 +
  3 +import com.agent.entity.agent.SecurityDeclarationEntity;
  4 +import com.agent.entity.agent.SecurityManifestEntity;
  5 +import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  6 +import org.springframework.data.jpa.repository.Modifying;
  7 +import org.springframework.data.jpa.repository.Query;
  8 +import org.springframework.data.repository.PagingAndSortingRepository;
  9 +import org.springframework.transaction.annotation.Transactional;
  10 +
  11 +/**
  12 + * @Auther: shenhl
  13 + * @Date: 2019/4/24 16:38
  14 + */
  15 +public interface SecurityManifestRepository extends PagingAndSortingRepository<SecurityManifestEntity, Long>,
  16 + JpaSpecificationExecutor<SecurityManifestEntity> {
  17 +
  18 +}
@@ -9,6 +9,7 @@ import javax.annotation.Resource; @@ -9,6 +9,7 @@ import javax.annotation.Resource;
9 9
10 import com.agent.entity.agent.*; 10 import com.agent.entity.agent.*;
11 import com.agent.repository.system.HzWaybillRepository; 11 import com.agent.repository.system.HzWaybillRepository;
  12 +import com.agent.repository.system.SDCargoNameRepository;
12 import com.agent.repository.system.SecurityDeclarationRepository; 13 import com.agent.repository.system.SecurityDeclarationRepository;
13 import org.springframework.data.domain.Page; 14 import org.springframework.data.domain.Page;
14 import org.springframework.data.domain.PageRequest; 15 import org.springframework.data.domain.PageRequest;
@@ -128,6 +129,9 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -128,6 +129,9 @@ public class ManifestService extends BasicService<ManifestEntity> {
128 @Resource 129 @Resource
129 private SecurityDeclarationRepository securityDeclarationRepository; 130 private SecurityDeclarationRepository securityDeclarationRepository;
130 131
  132 + @Resource
  133 + private SDCargoNameRepository sdCargoNameRepository;
  134 +
131 /** 135 /**
132 * 分页查询 136 * 分页查询
133 * 137 *
@@ -221,6 +225,9 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -221,6 +225,9 @@ public class ManifestService extends BasicService<ManifestEntity> {
221 if (waybill1 != null){ 225 if (waybill1 != null){
222 securityDeclarationRepository.delete(waybill1.getId()); 226 securityDeclarationRepository.delete(waybill1.getId());
223 } 227 }
  228 +
  229 + sdCargoNameRepository.deletes(waybillnomaster);
  230 +
224 } 231 }
225 }catch (Exception e){ 232 }catch (Exception e){
226 e.printStackTrace(); 233 e.printStackTrace();
@@ -2,7 +2,9 @@ package com.agent.service.system; @@ -2,7 +2,9 @@ package com.agent.service.system;
2 2
3 import com.agent.entity.Constant; 3 import com.agent.entity.Constant;
4 import com.agent.entity.agent.SecurityDeclarationEntity; 4 import com.agent.entity.agent.SecurityDeclarationEntity;
  5 +import com.agent.entity.agent.SecurityManifestEntity;
5 import com.agent.repository.system.SecurityDeclarationRepository; 6 import com.agent.repository.system.SecurityDeclarationRepository;
  7 +import com.agent.repository.system.SecurityManifestRepository;
6 import com.agent.service.BasicService; 8 import com.agent.service.BasicService;
7 import com.agent.vo.agent.SDVo; 9 import com.agent.vo.agent.SDVo;
8 import com.agent.xml.common.XmlHead; 10 import com.agent.xml.common.XmlHead;
@@ -22,11 +24,13 @@ import java.util.Date; @@ -22,11 +24,13 @@ import java.util.Date;
22 * @Date: 2019/4/24 16:46 24 * @Date: 2019/4/24 16:46
23 */ 25 */
24 @Service 26 @Service
25 -public class SecurityDeclarationService extends BasicService<SecurityDeclarationEntity> { 27 +public class SecurityDeclarationService extends BasicService<SecurityManifestEntity> {
26 28
27 @Autowired 29 @Autowired
28 private SecurityDeclarationRepository securityDeclarationRepository; 30 private SecurityDeclarationRepository securityDeclarationRepository;
29 31
  32 + @Autowired
  33 + private SecurityManifestRepository securityManifestRepository;
30 34
31 /** 35 /**
32 * 分页查询 36 * 分页查询
@@ -34,11 +38,11 @@ public class SecurityDeclarationService extends BasicService<SecurityDeclaration @@ -34,11 +38,11 @@ public class SecurityDeclarationService extends BasicService<SecurityDeclaration
34 * @param pageForm 分页对象 38 * @param pageForm 分页对象
35 * @return 包含分页信息和数据的分页对象 39 * @return 包含分页信息和数据的分页对象
36 */ 40 */
37 - public Page<SecurityDeclarationEntity> getPage(EasyPage<SecurityDeclarationEntity> pageForm) { 41 + public Page<SecurityManifestEntity> getPage(EasyPage<SecurityManifestEntity> pageForm) {
38 PageRequest pageRequest = buildPageRequest(pageForm); 42 PageRequest pageRequest = buildPageRequest(pageForm);
39 - Specification<SecurityDeclarationEntity> spec = buildSpecification(pageForm); 43 + Specification<SecurityManifestEntity> spec = buildSpecification(pageForm);
40 44
41 - Page<SecurityDeclarationEntity> page = securityDeclarationRepository.findAll(spec, pageRequest); 45 + Page<SecurityManifestEntity> page = securityManifestRepository.findAll(spec, pageRequest);
42 return page; 46 return page;
43 } 47 }
44 48
@@ -61,7 +65,7 @@ public class SecurityDeclarationService extends BasicService<SecurityDeclaration @@ -61,7 +65,7 @@ public class SecurityDeclarationService extends BasicService<SecurityDeclaration
61 return securityDeclarationRepository.update(sd.getId(), sd.getSd_waybill(), 65 return securityDeclarationRepository.update(sd.getId(), sd.getSd_waybill(),
62 sd.getSd_cargo_agent_name(), sd.getSd_cargo_shipper_name(), 66 sd.getSd_cargo_agent_name(), sd.getSd_cargo_shipper_name(),
63 sd.getSd_iata_number(), sd.getSd_transport_certificate(), 67 sd.getSd_iata_number(), sd.getSd_transport_certificate(),
64 - sd.getSd_transportation_prove(), sd.getUSER_ID()); 68 + sd.getSd_transportation_prove(), sd.getUSER_ID(), sd.getOperation_time());
65 } 69 }
66 70
67 71
@@ -52,6 +52,26 @@ public class SecurityDeclarationVo { @@ -52,6 +52,26 @@ public class SecurityDeclarationVo {
52 */ 52 */
53 private String sd_static; 53 private String sd_static;
54 54
  55 + private String operation;
  56 +
  57 + private String customs;
  58 +
  59 + public String getOperation() {
  60 + return operation;
  61 + }
  62 +
  63 + public void setOperation(String operation) {
  64 + this.operation = operation;
  65 + }
  66 +
  67 + public String getCustoms() {
  68 + return customs;
  69 + }
  70 +
  71 + public void setCustoms(String customs) {
  72 + this.customs = customs;
  73 + }
  74 +
55 public Long getId() { 75 public Long getId() {
56 return id; 76 return id;
57 } 77 }
@@ -61,16 +61,16 @@ @@ -61,16 +61,16 @@
61 61
62 <td class="kv-content"> 62 <td class="kv-content">
63 <label> 63 <label>
64 - <input id="one" name="one" type="checkbox" ${fn:contains(type, 1)?"checked":""} value="1" >普通货物 64 + <input id="one" name="one" type="radio" ${fn:contains(type, 1)?"checked":""} value="1" >普通货物
65 </label> 65 </label>
66 <label> 66 <label>
67 - <input id="two" name="two" type="checkbox" ${fn:contains(type, 2)?"checked":""} value="2">特种货物 67 + <input id="two" name="one" type="radio" ${fn:contains(type, 2)?"checked":""} value="2">特种货物
68 </label> 68 </label>
69 <label> 69 <label>
70 - <input id="three" name="three" type="checkbox" ${fn:contains(type, 3)?"checked":""} value="3">危险品 70 + <input id="three" name="one" type="radio" ${fn:contains(type, 3)?"checked":""} value="3">危险品
71 </label> 71 </label>
72 <label> 72 <label>
73 - <input id="four" name="four" type="checkbox" ${fn:contains(type, 4)?"checked":""} value="4">航空快件 73 + <input id="four" name="one" type="radio" ${fn:contains(type, 4)?"checked":""} value="4">航空快件
74 </label> 74 </label>
75 </td> 75 </td>
76 </tr> 76 </tr>
@@ -61,16 +61,16 @@ @@ -61,16 +61,16 @@
61 61
62 <td class="kv-content"> 62 <td class="kv-content">
63 <label> 63 <label>
64 - <input id="one" name="one" type="checkbox" ${fn:contains(type, 1)?"checked":""} value="1" >普通货物 64 + <input id="one" name="one" type="radio" ${fn:contains(type, 1)?"checked":""} value="1" >普通货物
65 </label> 65 </label>
66 <label> 66 <label>
67 - <input id="two" name="two" type="checkbox" ${fn:contains(type, 2)?"checked":""} value="2">特种货物 67 + <input id="two" name="one" type="radio" ${fn:contains(type, 2)?"checked":""} value="2">特种货物
68 </label> 68 </label>
69 <label> 69 <label>
70 - <input id="three" name="three" type="checkbox" ${fn:contains(type, 3)?"checked":""} value="3">危险品 70 + <input id="three" name="one" type="radio" ${fn:contains(type, 3)?"checked":""} value="3">危险品
71 </label> 71 </label>
72 <label> 72 <label>
73 - <input id="four" name="four" type="checkbox" ${fn:contains(type, 4)?"checked":""} value="4">航空快件 73 + <input id="four" name="one" type="radio" ${fn:contains(type, 4)?"checked":""} value="4">航空快件
74 </label> 74 </label>
75 </td> 75 </td>
76 </tr> 76 </tr>
@@ -71,16 +71,16 @@ @@ -71,16 +71,16 @@
71 71
72 <td class="kv-content"> 72 <td class="kv-content">
73 <label> 73 <label>
74 - <input id="one" name="one" type="checkbox" value="1" >普通货物 74 + <input id="one" name="one" type="radio" value="1" checked>普通货物
75 </label> 75 </label>
76 <label> 76 <label>
77 - <input id="two" name="two" type="checkbox" value="2">特种货物 77 + <input id="two" name="one" type="radio" value="2">特种货物
78 </label> 78 </label>
79 <label> 79 <label>
80 - <input id="three" name="three" type="checkbox" value="3">危险品 80 + <input id="three" name="one" type="radio" value="3">危险品
81 </label> 81 </label>
82 <label> 82 <label>
83 - <input id="four" name="four" type="checkbox" value="4">航空快件 83 + <input id="four" name="one" type="radio" value="4">航空快件
84 </label> 84 </label>
85 </td> 85 </td>
86 </tr> 86 </tr>
@@ -219,40 +219,6 @@ @@ -219,40 +219,6 @@
219 layer = layui.layer; 219 layer = layui.layer;
220 }); 220 });
221 221
222 - var selectFals = false;  
223 - function submit(){  
224 - layerIndex = parent.layer.load(1, {  
225 - shade: [0.6,'#000000'] //0.1透明度  
226 - });  
227 - var chboxValue=[];  
228 - var checkBox = $("input[name=one],input[name=two],input[name=three],input[name=four]");  
229 - for (var i=0; i<checkBox.length; i++){  
230 - if (checkBox[i].checked){  
231 - selectFals = true;  
232 - }  
233 - }  
234 -  
235 -  
236 - if (selectFals == true){  
237 - var data = $("#form").serialize();  
238 - $.post("<%=basePath%>declaration/save",data,function (data) {  
239 - parent.layer.close(layerIndex);  
240 - if (data.status == 200) {  
241 - var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引  
242 - parent.layer.close(index);  
243 - window.location.href = "<%=basePath%>declaration/list";  
244 - } else {  
245 - layer.open({content:""+data.msg});  
246 - }  
247 - });  
248 - }else {  
249 - alert("货主类型至少选择一项");  
250 - return false;  
251 - }  
252 -  
253 - }  
254 -  
255 -  
256 function viewXml(){ 222 function viewXml(){
257 if($("#ids").val()==''){ 223 if($("#ids").val()==''){
258 layer.open({content:"<spring:message code='manifest.send.message.failed'/>"}); 224 layer.open({content:"<spring:message code='manifest.send.message.failed'/>"});
@@ -267,7 +233,7 @@ @@ -267,7 +233,7 @@
267 }) 233 })
268 } 234 }
269 } 235 }
270 - 236 + var selectFals = false;
271 //发送报文并且保存 237 //发送报文并且保存
272 function savesend(){ 238 function savesend(){
273 var isValid = $("#form").valid(); 239 var isValid = $("#form").valid();
@@ -44,6 +44,8 @@ @@ -44,6 +44,8 @@
44 <th field="sd_iata_number">航协编号</th> 44 <th field="sd_iata_number">航协编号</th>
45 <th field="sd_transport_certificate" formatter="certificate">运输条件鉴定书</th> 45 <th field="sd_transport_certificate" formatter="certificate">运输条件鉴定书</th>
46 <th field="sd_transportation_prove" formatter="prove">航空公司同意运输证明</th> 46 <th field="sd_transportation_prove" formatter="prove">航空公司同意运输证明</th>
  47 + <th field="operation">发布时间</th>
  48 + <th field="customs">海关关区</th>
47 <th field="sd_static"formatter="sdStatic" width="80">状态</th> 49 <th field="sd_static"formatter="sdStatic" width="80">状态</th>
48 <th field=".." formatter="operatorFormat" width="60">操作</th> 50 <th field=".." formatter="operatorFormat" width="60">操作</th>
49 </tr> 51 </tr>
@@ -53,6 +55,7 @@ @@ -53,6 +55,7 @@
53 <form id="searchForm"> 55 <form id="searchForm">
54 <table class="search_form_table"> 56 <table class="search_form_table">
55 <spring:message code="manifest.bill.number"/>:<input id="manifnum" type="text" name="search_LIKE_sd_waybill" style="width:166px;height:35px;line-height:35px;"> 57 <spring:message code="manifest.bill.number"/>:<input id="manifnum" type="text" name="search_LIKE_sd_waybill" style="width:166px;height:35px;line-height:35px;">
  58 + 海关关区:<input id="manifnum" type="text" name="search_EQ_customs" style="width:166px;height:35px;line-height:35px;">
56 <a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a> 59 <a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a>
57 <a href="javascript:doSaves()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add">添加</a> 60 <a href="javascript:doSaves()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add">添加</a>
58 <%--<a href="javascript:printAll()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red">批量打印</a>--%> 61 <%--<a href="javascript:printAll()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red">批量打印</a>--%>
@@ -63,16 +63,16 @@ @@ -63,16 +63,16 @@
63 63
64 <td class="kv-content"> 64 <td class="kv-content">
65 <label> 65 <label>
66 - <input id="one" name="one" type="checkbox" value="1" checked>普通货物 66 + <input id="one" name="one" type="radio" value="1" checked>普通货物
67 </label> 67 </label>
68 <label> 68 <label>
69 - <input id="two" name="two" type="checkbox" value="2">特种货物 69 + <input id="two" name="one" type="radio" value="2">特种货物
70 </label> 70 </label>
71 <label> 71 <label>
72 - <input id="three" name="three" type="checkbox" value="3">危险品 72 + <input id="three" name="one" type="radio" value="3">危险品
73 </label> 73 </label>
74 <label> 74 <label>
75 - <input id="four" name="four" type="checkbox" value="4">航空快件 75 + <input id="four" name="one" type="radio" value="4">航空快件
76 </label> 76 </label>
77 </td> 77 </td>
78 </tr> 78 </tr>
@@ -266,6 +266,7 @@ @@ -266,6 +266,7 @@
266 return false; 266 return false;
267 } 267 }
268 } 268 }
  269 +
269 } 270 }
270 //发送交运报文 271 //发送交运报文
271 function sendDelivery(){ 272 function sendDelivery(){
@@ -98,8 +98,8 @@ @@ -98,8 +98,8 @@
98 发货人<span class="required_span">*</span> 98 发货人<span class="required_span">*</span>
99 </td> 99 </td>
100 <td class="kv-content"> 100 <td class="kv-content">
101 - <select required id="for_short_shipper" name="for_short_shipper">  
102 - <option value="" selected>无</option> 101 + <select id="for_short_shipper" name="for_short_shipper">
  102 + <option value="">无</option>
103 <c:forEach items="${shipper}" var="shipper"> 103 <c:forEach items="${shipper}" var="shipper">
104 <option value="${shipper.id}" <c:forEach items="${hzId}" var = "hzId"> ${shipper.id eq hzId.hzinfor_id?"selected":""} </c:forEach>>${shipper.for_short}&nbsp;&nbsp;${shipper.full_name}</option> 104 <option value="${shipper.id}" <c:forEach items="${hzId}" var = "hzId"> ${shipper.id eq hzId.hzinfor_id?"selected":""} </c:forEach>>${shipper.for_short}&nbsp;&nbsp;${shipper.full_name}</option>
105 </c:forEach> 105 </c:forEach>
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 </td> 110 </td>
111 <td class="kv-content"> 111 <td class="kv-content">
112 <select id="for_short_booking" name="for_short_booking"> 112 <select id="for_short_booking" name="for_short_booking">
113 - <option value="" selected>无</option> 113 + <option value="">无</option>
114 <c:forEach items="${booking}" var="booking"> 114 <c:forEach items="${booking}" var="booking">
115 <option value="${booking.id}" <c:forEach items="${hzId}" var = "hzId"> ${booking.id eq hzId.hzinfor_id?"selected":""} </c:forEach>>${booking.for_short}&nbsp;&nbsp;${booking.full_name}</option> 115 <option value="${booking.id}" <c:forEach items="${hzId}" var = "hzId"> ${booking.id eq hzId.hzinfor_id?"selected":""} </c:forEach>>${booking.for_short}&nbsp;&nbsp;${booking.full_name}</option>
116 </c:forEach> 116 </c:forEach>
@@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
121 </td> 121 </td>
122 <td class="kv-content"> 122 <td class="kv-content">
123 <select id="for_short_operation" name="for_short_operation"> 123 <select id="for_short_operation" name="for_short_operation">
124 - <option value="" selected>无</option> 124 + <option value="">无</option>
125 <c:forEach items="${operation}" var="operation"> 125 <c:forEach items="${operation}" var="operation">
126 <option value="${operation.id}" <c:forEach items="${hzId}" var = "hzId"> ${operation.id eq hzId.hzinfor_id?"selected":""} </c:forEach> >${operation.for_short}&nbsp;&nbsp;${operation.full_name}</option> 126 <option value="${operation.id}" <c:forEach items="${hzId}" var = "hzId"> ${operation.id eq hzId.hzinfor_id?"selected":""} </c:forEach> >${operation.for_short}&nbsp;&nbsp;${operation.full_name}</option>
127 </c:forEach> 127 </c:forEach>