作者 shenhailong

...

@@ -2565,7 +2565,7 @@ public class ManifestController extends BasicController { @@ -2565,7 +2565,7 @@ public class ManifestController extends BasicController {
2565 manifestEntity.setShpcusid(arr.get(13)); 2565 manifestEntity.setShpcusid(arr.get(13));
2566 // 发货人公司 2566 // 发货人公司
2567 manifestEntity.setCo_company(arr.get(14)); 2567 manifestEntity.setCo_company(arr.get(14));
2568 - manifestEntity.setSh_name(arr.get(14)); 2568 + manifestEntity.setCo_name(arr.get(14));
2569 // 发货人地址 2569 // 发货人地址
2570 manifestEntity.setCo_address(arr.get(15)); 2570 manifestEntity.setCo_address(arr.get(15));
2571 // 发货人国家代码 2571 // 发货人国家代码
@@ -2578,6 +2578,7 @@ public class ManifestController extends BasicController { @@ -2578,6 +2578,7 @@ public class ManifestController extends BasicController {
2578 manifestEntity.setCnecusid(arr.get(19)); 2578 manifestEntity.setCnecusid(arr.get(19));
2579 // 收货人公司 2579 // 收货人公司
2580 manifestEntity.setSh_company(arr.get(20)); 2580 manifestEntity.setSh_company(arr.get(20));
  2581 + manifestEntity.setSh_name(arr.get(20));
2581 // 收货人地址 2582 // 收货人地址
2582 manifestEntity.setSh_address(arr.get(21)); 2583 manifestEntity.setSh_address(arr.get(21));
2583 // 收货人城市 2584 // 收货人城市
@@ -2694,7 +2695,7 @@ public class ManifestController extends BasicController { @@ -2694,7 +2695,7 @@ public class ManifestController extends BasicController {
2694 seconday.setShpcusid(arr.get(13)); 2695 seconday.setShpcusid(arr.get(13));
2695 // 发货人公司 2696 // 发货人公司
2696 seconday.setCo_company(arr.get(14)); 2697 seconday.setCo_company(arr.get(14));
2697 - seconday.setSh_name(arr.get(14)); 2698 + seconday.setCo_name(arr.get(14));
2698 // 发货人地址 2699 // 发货人地址
2699 seconday.setCo_address(arr.get(15)); 2700 seconday.setCo_address(arr.get(15));
2700 // 发货人国家代码 2701 // 发货人国家代码
@@ -2707,6 +2708,7 @@ public class ManifestController extends BasicController { @@ -2707,6 +2708,7 @@ public class ManifestController extends BasicController {
2707 seconday.setCnecusid(arr.get(19)); 2708 seconday.setCnecusid(arr.get(19));
2708 // 收货人公司 2709 // 收货人公司
2709 seconday.setSh_company(arr.get(20)); 2710 seconday.setSh_company(arr.get(20));
  2711 + seconday.setSh_name(arr.get(20));
2710 // 收货人地址 2712 // 收货人地址
2711 seconday.setSh_address(arr.get(21)); 2713 seconday.setSh_address(arr.get(21));
2712 // 收货人城市 2714 // 收货人城市
@@ -107,6 +107,8 @@ public class SecurityDeclarationController { @@ -107,6 +107,8 @@ public class SecurityDeclarationController {
107 sdVo.setUser_id(sd.getUSERID()); 107 sdVo.setUser_id(sd.getUSERID());
108 if("1".equals(sd.getStatics())){ 108 if("1".equals(sd.getStatics())){
109 sdVo.setSd_static("已暂存"); 109 sdVo.setSd_static("已暂存");
  110 + }else {
  111 + sdVo.setSd_static("已发送");
110 } 112 }
111 sdVo.setOperation(sd.getOperation()); 113 sdVo.setOperation(sd.getOperation());
112 sdVo.setCustoms(sd.getCustoms()); 114 sdVo.setCustoms(sd.getCustoms());
@@ -216,7 +218,7 @@ public class SecurityDeclarationController { @@ -216,7 +218,7 @@ public class SecurityDeclarationController {
216 sd.setSd_iata_number(iataNumber); 218 sd.setSd_iata_number(iataNumber);
217 sd.setSd_transport_certificate(transportCertificate); 219 sd.setSd_transport_certificate(transportCertificate);
218 sd.setSd_transportation_prove(transportationProve); 220 sd.setSd_transportation_prove(transportationProve);
219 - sd.setSd_static("1"); 221 + sd.setSd_static("2");
220 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 222 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
221 String format = simpleDateFormat.format(new Date()); 223 String format = simpleDateFormat.format(new Date());
222 sd.setOperation_time(format); 224 sd.setOperation_time(format);
@@ -371,7 +373,7 @@ public class SecurityDeclarationController { @@ -371,7 +373,7 @@ public class SecurityDeclarationController {
371 sd.setSd_iata_number(iataNumber); 373 sd.setSd_iata_number(iataNumber);
372 sd.setSd_transport_certificate(transportCertificate); 374 sd.setSd_transport_certificate(transportCertificate);
373 sd.setSd_transportation_prove(transportationProve); 375 sd.setSd_transportation_prove(transportationProve);
374 - sd.setSd_static("1"); 376 + sd.setSd_static("2");
375 if (ue != null){ 377 if (ue != null){
376 if (ue.getId() != null ){ 378 if (ue.getId() != null ){
377 sd.setUSER_ID(ue.getId()); 379 sd.setUSER_ID(ue.getId());
@@ -652,7 +654,7 @@ public class SecurityDeclarationController { @@ -652,7 +654,7 @@ public class SecurityDeclarationController {
652 sd.setSd_iata_number(iataNumber); 654 sd.setSd_iata_number(iataNumber);
653 sd.setSd_transport_certificate(transportCertificate); 655 sd.setSd_transport_certificate(transportCertificate);
654 sd.setSd_transportation_prove(transportationProve); 656 sd.setSd_transportation_prove(transportationProve);
655 - sd.setSd_static("1"); 657 + sd.setSd_static("2");
656 sd.setUSER_ID(ue.getId()); 658 sd.setUSER_ID(ue.getId());
657 SimpleDateFormat simpleDateFormats = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 659 SimpleDateFormat simpleDateFormats = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
658 String format = simpleDateFormats.format(new Date()); 660 String format = simpleDateFormats.format(new Date());
@@ -18,10 +18,10 @@ public interface SecurityDeclarationRepository extends PagingAndSortingRepositor @@ -18,10 +18,10 @@ public interface SecurityDeclarationRepository extends PagingAndSortingRepositor
18 18
19 @Transactional 19 @Transactional
20 @Modifying 20 @Modifying
21 - @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) 21 + @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, SD_STATIC=?10 where id=?1", nativeQuery = true)
22 int update(Long id, String waybill, 22 int update(Long id, String waybill,
23 String cargoAgent, String cargoShipper, 23 String cargoAgent, String cargoShipper,
24 - String iata, String tranposrt, String prove, Long userId, String operation); 24 + String iata, String tranposrt, String prove, Long userId, String operation, String statics);
25 25
26 @Query(value = "select count(*) from SECURITY_DECLARATION where SD_WAYBILL = ?1", nativeQuery = true) 26 @Query(value = "select count(*) from SECURITY_DECLARATION where SD_WAYBILL = ?1", nativeQuery = true)
27 int findWaybill(String waybill); 27 int findWaybill(String waybill);
@@ -74,7 +74,7 @@ public class SecurityDeclarationService extends BasicService<SecurityManifestEnt @@ -74,7 +74,7 @@ public class SecurityDeclarationService extends BasicService<SecurityManifestEnt
74 return securityDeclarationRepository.update(sd.getId(), sd.getSd_waybill(), 74 return securityDeclarationRepository.update(sd.getId(), sd.getSd_waybill(),
75 sd.getSd_cargo_agent_name(), sd.getSd_cargo_shipper_name(), 75 sd.getSd_cargo_agent_name(), sd.getSd_cargo_shipper_name(),
76 sd.getSd_iata_number(), sd.getSd_transport_certificate(), 76 sd.getSd_iata_number(), sd.getSd_transport_certificate(),
77 - sd.getSd_transportation_prove(), sd.getUSER_ID(), sd.getOperation_time()); 77 + sd.getSd_transportation_prove(), sd.getUSER_ID(), sd.getOperation_time(), sd.getSd_static());
78 } 78 }
79 79
80 80