Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
wei.zhou
546cb79d 1 parent 38b29a83

提交代码

Inline Side-by-side
Showing 4 changed files with 18 additions and 783 deletions
...@@ -110,8 +110,9 @@ public class CustomsDataInterface { ...@@ -110,8 +110,9 @@ public class CustomsDataInterface {
110 //4、保存运单到iclear中 110 //4、保存运单到iclear中
111 sw.start("processChmConsignment"); 111 sw.start("processChmConsignment");
112 //if(result.getSuccess()){ 112 //if(result.getSuccess()){
113 + //TODO 等待校验逻辑完善后，由result.getSuccess() 判断
113 if(true){ 114 if(true){
114 - chmConsignmentService.processChmConsignment(mawb, timeStamp); 115 + chmConsignmentService.processChmConsignment(mawb, timeStamp,appId);
115 } 116 }
116 sw.stop(); 117 sw.stop();
117 118
......
...@@ -14,6 +14,7 @@ import java.util.List; ...@@ -14,6 +14,7 @@ import java.util.List;
14 /** 14 /**
15 * 运单表 15 * 运单表
16 * Created by Erry 2019/5/30. 16 * Created by Erry 2019/5/30.
17 + *
17 * @author Administrator 18 * @author Administrator
18 */ 19 */
19 @Entity 20 @Entity
...@@ -31,29 +32,18 @@ public class ChmConsignment implements Serializable { ...@@ -31,29 +32,18 @@ public class ChmConsignment implements Serializable {
31 @Column(name = "ID") 32 @Column(name = "ID")
32 private Long id; 33 private Long id;
33 34
34 - /**
35 - * 报关单类型ID
36 - */
37 - @JsonIgnore
38 - @ManyToOne(targetEntity = DictionaryEntries.class)
39 - @JoinColumn(name = "DECLARED_DOC_TYPE_ID")
40 - private DictionaryEntries declaredDocTypeDic;
41 -
42 35
43 /** 36 /**
44 - * 乐观锁 37 + * 运单号
45 */ 38 */
46 -// @Version 39 + @Column(name = "CONSIGNMENT_CODE")
47 -// @Column(name = "VERSION", columnDefinition = "INTEGER", length = 8) 40 + private String consignmentCode;
48 -// private Integer version;
49 41
50 /** 42 /**
51 - * 报关单类型 43 + * 总运单号
52 */ 44 */
53 - @Column(name = "DECLARED_DOC_TYPE") 45 + @Column(name = "CONSIGNMENT_HEAD_CODE")
54 - private String declaredDocType; 46 + private String consignmentHeadCode;
55 -
56 -
57 47
58 /** 48 /**
59 * 申报单位 49 * 申报单位
...@@ -69,7 +59,6 @@ public class ChmConsignment implements Serializable { ...@@ -69,7 +59,6 @@ public class ChmConsignment implements Serializable {
69 private String contractCode; 59 private String contractCode;
70 60
71 61
72 -
73 /** 62 /**
74 * 征免性质ID 63 * 征免性质ID
75 */ 64 */
...@@ -84,8 +73,6 @@ public class ChmConsignment implements Serializable { ...@@ -84,8 +73,6 @@ public class ChmConsignment implements Serializable {
84 private String taxNature; 73 private String taxNature;
85 74
86 75
87 -
88 -
89 /** 76 /**
90 * 指运港ID 77 * 指运港ID
91 */ 78 */
...@@ -153,7 +140,6 @@ public class ChmConsignment implements Serializable { ...@@ -153,7 +140,6 @@ public class ChmConsignment implements Serializable {
153 private String recordCode; 140 private String recordCode;
154 141
155 142
156 -
157 /** 143 /**
158 * 净重（公斤） 144 * 净重（公斤）
159 */ 145 */
...@@ -195,12 +181,9 @@ public class ChmConsignment implements Serializable { ...@@ -195,12 +181,9 @@ public class ChmConsignment implements Serializable {
195 private String enteringNo; 181 private String enteringNo;
196 182
197 183
198 -
199 -
200 /** 184 /**
201 * 监管方式ID 185 * 监管方式ID
202 */ 186 */
203 -// @JsonIgnore
204 @ManyToOne(targetEntity = DictionaryEntries.class) 187 @ManyToOne(targetEntity = DictionaryEntries.class)
205 @JoinColumn(name = "TRADE_MODE_ID") 188 @JoinColumn(name = "TRADE_MODE_ID")
206 private DictionaryEntries tradeModeDic; 189 private DictionaryEntries tradeModeDic;
...@@ -212,18 +195,12 @@ public class ChmConsignment implements Serializable { ...@@ -212,18 +195,12 @@ public class ChmConsignment implements Serializable {
212 private String tradeMode; 195 private String tradeMode;
213 196
214 197
215 -
216 /** 198 /**
217 * 境内发货人编码 199 * 境内发货人编码
218 */ 200 */
219 @Column(name = "TRADE_CO_SCC") 201 @Column(name = "TRADE_CO_SCC")
220 private String tradeCoSCC; 202 private String tradeCoSCC;
221 203
222 - /**
223 - * 境内发货人（经营单位编码）
224 - */
225 - @Column(name = "OPERATE_UNIT_CODE")
226 - private String operateUnitCode;
227 204
228 /** 205 /**
229 * 境内发货人（经营单位名称） 206 * 境内发货人（经营单位名称）
...@@ -247,7 +224,6 @@ public class ChmConsignment implements Serializable { ...@@ -247,7 +224,6 @@ public class ChmConsignment implements Serializable {
247 /** 224 /**
248 * 成交方式ID 225 * 成交方式ID
249 */ 226 */
250 -// @JsonIgnore
251 @ManyToOne(targetEntity = DictionaryEntries.class) 227 @ManyToOne(targetEntity = DictionaryEntries.class)
252 @JoinColumn(name = "DEAL_MODE_ID") 228 @JoinColumn(name = "DEAL_MODE_ID")
253 private DictionaryEntries dealModeDic; 229 private DictionaryEntries dealModeDic;
...@@ -272,30 +248,6 @@ public class ChmConsignment implements Serializable { ...@@ -272,30 +248,6 @@ public class ChmConsignment implements Serializable {
272 @Column(name = "PACKAGE_TYPE") 248 @Column(name = "PACKAGE_TYPE")
273 private String packageType; 249 private String packageType;
274 250
275 -
276 -
277 -
278 - /**
279 - * 报关形式类型ID
280 - */
281 - @JsonIgnore
282 - @ManyToOne(targetEntity = DictionaryEntries.class)
283 - @JoinColumn(name = "DECLARED_FORM_TYPE_ID")
284 - private DictionaryEntries declaredFromTypeDic;
285 -
286 - /**
287 - * 报关形式类型
288 - */
289 - @Column(name = "DECLARED_FORM_TYPE")
290 - private String declaredFromType;
291 -
292 -
293 - /**
294 - * 生产核销单位编码
295 - */
296 - @Column(name = "OWNER_CODE_SCC")
297 - private String ownerCodeScc;
298 -
299 /** 251 /**
300 * 贸易国（地区）ID 252 * 贸易国（地区）ID
301 */ 253 */
...@@ -309,155 +261,15 @@ public class ChmConsignment implements Serializable { ...@@ -309,155 +261,15 @@ public class ChmConsignment implements Serializable {
309 @Column(name = "TRADE_AREA_CODE") 261 @Column(name = "TRADE_AREA_CODE")
310 private String tradeAreaCode; 262 private String tradeAreaCode;
311 263
312 -
313 -
314 -
315 -
316 -
317 -
318 -
319 -
320 -
321 -
322 -
323 -
324 -
325 -
326 -
327 -
328 -
329 -
330 -
331 -
332 -//------------------------------------------------------------------------------------
333 -
334 -
335 -
336 - /**
337 - * 出境口岸ID
338 - */
339 -// @JsonIgnore
340 - @ManyToOne(targetEntity = DictionaryEntries.class)
341 - @JoinColumn(name = "EXIT_PORT_ID")
342 - private DictionaryEntries exitPortDic;
343 -
344 - //author : wy on 2021/01/12 新增“fedEx账户”
345 - @Column(name = "FEDEXACCOUNT")
346 - private String fedExAccount;
347 - /**
348 - * 出境口岸
349 - */
350 -// @Pattern(regexp = "[A-Z][a-z][0-9]")
351 -// private String passWord;
352 - @Column(name = "EXIT_PORT")
353 - private String exitPort;
354 -
355 - /**
356 - * 出境关别代码
357 - */
358 - @Column(name = "EXIT_CUS_CODE")
359 - private String exitCusCode;
360 -
361 - /**
362 - * 出境关别ID
363 - */
364 -// @JsonIgnore
365 - @ManyToOne(targetEntity = DictionaryEntries.class)
366 - @JoinColumn(name = "EXIT_CUS_ID")
367 - private DictionaryEntries exitCusDic;
368 -
369 - /**
370 - * 出境关别
371 - */
372 - @Column(name = "EXIT_CUS")
373 - private String exitCus;
374 -
375 -
376 -
377 /** 264 /**
378 * 海关编号 265 * 海关编号
379 */ 266 */
380 @Column(name = "CUSTOMS_NO") 267 @Column(name = "CUSTOMS_NO")
381 private String customsNo; 268 private String customsNo;
382 269
383 -
384 -
385 - /**
386 - * 出口日期
387 - */
388 - @Column(name = "IMPORT_DATE")
389 - private Date importDate;
390 -
391 - /**
392 - * 申报日期
393 - */
394 - @Column(name = "CUSTOMS_DATE")
395 - private Date customsDate;
396 -
397 -
398 -
399 - /**
400 - * 生产核销位海关编码
401 - */
402 - @Column(name = "OWNER_CODE")
403 - private String ownerCode;
404 -
405 - /**
406 - * 生产核销单位
407 - */
408 - @Column(name = "OWNER_NAME")
409 - private String ownerName;
410 -
411 -
412 -
413 - /**
414 - * 运单号
415 - */
416 - @Column(name = "CONSIGNMENT_CODE")
417 - private String consignmentCode;
418 -
419 - /**
420 - * 总运单号
421 - */
422 - @Column(name = "CONSIGNMENT_HEAD_CODE")
423 - private String consignmentHeadCode;
424 -
425 -
426 -
427 -
428 -
429 -
430 -
431 -
432 -
433 -
434 -
435 - /**
436 - * 报关转关类型ID
437 - */
438 - @JsonIgnore
439 - @ManyToOne(targetEntity = DictionaryEntries.class)
440 - @JoinColumn(name = "DECLARED_TYPE_ID")
441 - private DictionaryEntries declaredTypeDic;
442 -
443 - /**
444 - * 报关转关类型
445 - */
446 - @Column(name = "DECLARED_TYPE")
447 - private String declaredType;
448 -
449 -
450 -
451 - /**
452 - * 许可证号
453 - */
454 - @Column(name = "LICENSE_CODE")
455 - private String licenseCode;
456 -
457 /** 270 /**
458 * 抵运国（地区）ID 271 * 抵运国（地区）ID
459 */ 272 */
460 -// @JsonIgnore
461 @ManyToOne(targetEntity = DictionaryEntries.class) 273 @ManyToOne(targetEntity = DictionaryEntries.class)
462 @JoinColumn(name = "FROM_COUNTRY_ID") 274 @JoinColumn(name = "FROM_COUNTRY_ID")
463 private DictionaryEntries fromCountryDic; 275 private DictionaryEntries fromCountryDic;
...@@ -468,45 +280,6 @@ public class ChmConsignment implements Serializable { ...@@ -468,45 +280,6 @@ public class ChmConsignment implements Serializable {
468 @Column(name = "FROM_COUNTRY") 280 @Column(name = "FROM_COUNTRY")
469 private String fromCountry; 281 private String fromCountry;
470 282
471 -
472 -
473 -
474 -
475 -
476 -
477 -
478 -
479 -
480 -
481 -
482 -
483 - /**
484 - * 随附单据及编号
485 - */
486 - @Column(name = "SLIP")
487 - private String slip;
488 -
489 - /**
490 - * 特殊关系确认
491 - */
492 - @Column(name = "PROMISE_ITMES1")
493 - private String promiseItmes1;
494 - ;
495 -
496 - /**
497 - * 价格影响确认
498 - */
499 - @Column(name = "PROMISE_ITMES2")
500 - private String promiseItmes2;
501 -
502 - /**
503 - * 支付特许权使用费确认
504 - */
505 - @Column(name = "PROMISE_ITMES3")
506 - private String promiseItmes3;
507 -
508 -
509 -
510 /** 283 /**
511 * 境外收货人 284 * 境外收货人
512 */ 285 */
...@@ -519,11 +292,6 @@ public class ChmConsignment implements Serializable { ...@@ -519,11 +292,6 @@ public class ChmConsignment implements Serializable {
519 @Column(name = "OVERSEAS_CONSIGNOR_CODE") 292 @Column(name = "OVERSEAS_CONSIGNOR_CODE")
520 private String overseasConsignorCode; 293 private String overseasConsignorCode;
521 294
522 - /**
523 - * 运输工具名称及航次号
524 - */
525 - @Column(name = "FLIGHT_CLASS_NO")
526 - private String flightClassNo;
527 295
528 /** 296 /**
529 * 标记唛码及备注 （标记唛码） 297 * 标记唛码及备注 （标记唛码）
...@@ -532,179 +300,11 @@ public class ChmConsignment implements Serializable { ...@@ -532,179 +300,11 @@ public class ChmConsignment implements Serializable {
532 private String declaredRemark; 300 private String declaredRemark;
533 301
534 /** 302 /**
535 - * 标记唛码及备注 （备注）
536 - */
537 - @Column(name = "REMARK_MARK")
538 - private String remarkMark;
539 -
540 - /**
541 - * 报关员证号
542 - */
543 - @Column(name = "DECLARED_CODE")
544 - private String declaredCode;
545 -
546 -
547 -
548 - /**
549 - * 电话
550 - */
551 - @Column(name = "TELEPHONE")
552 - private String telephone;
553 -
554 - /**
555 - * 运单类型ID
556 - */
557 -// @JsonIgnore
558 - @ManyToOne(targetEntity = DictionaryEntries.class)
559 - @JoinColumn(name = "CONS_TYPE_ID")
560 - private DictionaryEntries consTypeDic;
561 -
562 - /**
563 - * 运单类型
564 - */
565 - @Column(name = "CONS_TYPE")
566 - private String consType;
567 -
568 - /**
569 - * 发件人姓名
570 - */
571 - @Column(name = "SENDER")
572 - private String sender;
573 -
574 - /**
575 - * 企业代码
576 - */
577 - @Column(name = "ENTERPRISE_CODE")
578 - private String enterpriseCode;
579 -
580 - /**
581 - * 纳税单位
582 - */
583 - @Column(name = "TAX_UNIT")
584 - private String taxUnit;
585 -
586 - /**
587 - * 运单图片打印状态ID
588 - */
589 - @JsonIgnore
590 - @ManyToOne(targetEntity = DictionaryEntries.class)
591 - @JoinColumn(name = "PRINT_STATUS_ID")
592 - private DictionaryEntries printStatusDic;
593 -
594 - /**
595 - * 运单图片打印状态
596 - */
597 - @Column(name = "PRINT_STATUS")
598 - private String printStatus;
599 -
600 - /**
601 - * 委托书是否盖章ID
602 - */
603 - @JsonIgnore
604 - @ManyToOne(targetEntity = DictionaryEntries.class)
605 - @JoinColumn(name = "IS_STAMP_ID")
606 - private DictionaryEntries stampDic;
607 -
608 - /**
609 - * 委托书是否盖章
610 - */
611 - @Column(name = "IS_STAMP")
612 - private String stamp;
613 -
614 - /**
615 - * 上传文件状态ID
616 - */
617 - @JsonIgnore
618 - @ManyToOne(targetEntity = DictionaryEntries.class)
619 - @JoinColumn(name = "UP_FILE_STATUS_ID")
620 - private DictionaryEntries upFileStatusDic;
621 -
622 -
623 - /**
624 - * 上传文件状态
625 - */
626 - @Column(name = "UP_FILE_STATUS")
627 - private String upFileStatus;
628 -
629 - /**
630 - * 上传文件时间
631 - */
632 - @Column(name = "UP_FILE_TIME")
633 - private Date upFileTime;
634 -
635 - /**
636 - * 上传文件人员ID
637 - */
638 -// @JsonIgnore
639 -// @ManyToOne(targetEntity = SysUser.class)
640 -// @JoinColumn(name = "UP_FILE_USER_ID")
641 -// private SysUser upFileUserDic;
642 -
643 - /**
644 - * 上传文件人员
645 - */
646 - @Column(name = "UP_FILE_USER")
647 - private String upFileUser;
648 -
649 - /**
650 - * 图片任务状态ID
651 - */
652 - @JsonIgnore
653 - @ManyToOne(targetEntity = DictionaryEntries.class)
654 - @JoinColumn(name = "TASK_STATUS_ID")
655 - private DictionaryEntries taskStatusDic;
656 -
657 - /**
658 - * 图片任务状态
659 - */
660 - @Column(name = "TASK_STATUS")
661 - private String taskStatus;
662 -
663 - /**
664 - * 图片合成时间
665 - */
666 - @Column(name = "PDF_TIME")
667 - private Date pdfTime;
668 -
669 - /**
670 - * 海关帐号
671 - */
672 - @JsonIgnore
673 - @ManyToOne(targetEntity = DictionaryEntries.class)
674 - @JoinColumn(name = "PRINT_NO_ID")
675 - private DictionaryEntries printNoDic;
676 -
677 - /**
678 - * 海关帐号
679 - */
680 - @Column(name = "PRINT_NO")
681 - private String printNo;
682 -
683 - /**
684 - * 海关帐号 变更记录
685 - */
686 - @Column(name = "PRINT_NO_MSG")
687 - private String printNoMsg;
688 -
689 - /**
690 - * 最后一次打印时间
691 - */
692 - @Column(name = "PRINT_TIME")
693 - private Date printTime;
694 -
695 - /**
696 * 运单创建时间 303 * 运单创建时间
697 */ 304 */
698 @Column(name = "CREATE_TIME") 305 @Column(name = "CREATE_TIME")
699 private Date createTime; 306 private Date createTime;
700 307
701 - /**
702 - * 运单创建人ID
703 - */
704 -// @JsonIgnore
705 -// @ManyToOne(targetEntity = SysUser.class)
706 -// @JoinColumn(name = "CREATOR_ID")
707 -// private SysUser creatorId;
708 308
709 /** 309 /**
710 * 运单创建人 310 * 运单创建人
...@@ -718,19 +318,6 @@ public class ChmConsignment implements Serializable { ...@@ -718,19 +318,6 @@ public class ChmConsignment implements Serializable {
718 @Column(name = "UPDATE_TIME") 318 @Column(name = "UPDATE_TIME")
719 private Date updateTime; 319 private Date updateTime;
720 320
721 - /**
722 - * 运单更新人ID
723 - */
724 -// @JsonIgnore
725 -// @ManyToOne(targetEntity = SysUser.class)
726 -// @JoinColumn(name = "UPDATE_USER_ID")
727 -// private SysUser updateUser;
728 -
729 - /**
730 - * 运单更新人
731 - */
732 - @Column(name = "UPDATE_USER")
733 - private String updateUserName;
734 321
735 /** 322 /**
736 * 运单状态ID 323 * 运单状态ID
...@@ -746,244 +333,8 @@ public class ChmConsignment implements Serializable { ...@@ -746,244 +333,8 @@ public class ChmConsignment implements Serializable {
746 @Column(name = "CONS_STATUS") 333 @Column(name = "CONS_STATUS")
747 private String consStatus; 334 private String consStatus;
748 335
749 - /**
750 - * OSPR状态ID
751 - */
752 - @JsonIgnore
753 - @ManyToOne(targetEntity = DictionaryEntries.class)
754 - @JoinColumn(name = "OSPR_STATUS_ID")
755 - private DictionaryEntries osprStatusDic;
756 -
757 - /**
758 - * OSPR状态
759 - */
760 - @Column(name = "OSPR_STATUS")
761 - private String osprStatus;
762 -
763 - /**
764 - * 申报口岸
765 - */
766 - @Column(name = "DECLARED_PORT")
767 - private String declaredPort;
768 -
769 - /**
770 - * 站点
771 - */
772 -// @JsonIgnore
773 -// @ManyToOne(targetEntity = Organization.class)
774 -// @JoinColumn(name = "STATION_ID")
775 -// private Organization station;
776 -
777 - /**
778 - * 站点名称
779 - */
780 - @Column(name = "STATION_NAME")
781 - private String stationName;
782 -
783 - /**
784 - * 口岸
785 - */
786 - @JsonIgnore
787 - @ManyToOne(targetEntity = DictionaryEntries.class)
788 - @JoinColumn(name = "PORT_ID")
789 - private DictionaryEntries port;
790 -
791 - /**
792 - * 口岸名称
793 - */
794 - @Column(name = "PORT_NAME")
795 - private String portName;
796 -
797 - /**
798 - * 航班日期
799 - */
800 - @DateTimeFormat(pattern = "yyy-MM-dd")
801 - @Column(name = "FLIIGHT_DATE")
802 - private Date flightDate;
803 -
804 - /**
805 - * 航班号
806 - */
807 - @Column(name = "FLIIGHT_NO")
808 - private String flightNo;
809 -
810 - /**
811 - * 航线
812 - */
813 - @Column(name = "ROUTE")
814 - private String route;
815 -
816 - /**
817 - * 速递员
818 - */
819 - @Column(name = "COURIER")
820 - private String courier;
821 -
822 - /**
823 - * 备注
824 - */
825 - @Column(name = "REMARK")
826 - private String remark;
827 -
828 - /**
829 - * 是否启用报关单
830 - */
831 - @Column(name = "ENABLE_DECLARATION")
832 - private String enableDeclaration;
833 -
834 - /**
835 - * 图片是否已上传
836 - */
837 - @Column(name = "PIC_UPLOADED")
838 - private Boolean picUploaded;
839 -
840 - /**
841 - * 图片最后上传时间
842 - */
843 - @Column(name = "PIC_UPLOAD_TIME")
844 - private Date picUploadTime;
845 -
846 - /**
847 - * 图片最后上传人
848 - */
849 -// @JsonIgnore
850 -// @ManyToOne(targetEntity = SysUser.class)
851 -// @JoinColumn(name = "PIC_UPLOAD_USER_ID")
852 -// private SysUser picUploadUser;
853 -
854 - /**
855 - * 创建渠道
856 - */
857 - @Column(name = "CREATING_CHANNELS")
858 - private String creatingChannels;
859 -
860 - /**
861 - * 货品名称
862 - */
863 - @Column(name = "SKUNAME")
864 - private String skuName;
865 -
866 -
867 - /**
868 - * 是否导出
869 - */
870 - @Column(name = "IS_EXPORT")
871 - private String export;
872 -
873 - /**
874 - * 联系人
875 - */
876 - @Column(name = "CONTACTS")
877 - private String contacts;
878 -
879 - /**
880 - * 联系方式
881 - */
882 - @Column(name = "CONTACT_INFORMATION")
883 - private String contactInformation;
884 -
885 - /**
886 - * 取件城市
887 - * author: wy on 2021/01/26 新增字段
888 - */
889 - @ManyToOne(targetEntity = DictionaryEntries.class)
890 - @JoinColumn(name = "PICKUP_CITY")
891 - private DictionaryEntries pickUpCity;
892 -
893 - /**
894 - * 取件城市名称
895 - */
896 - @Column(name = "PICKUPCITY_NAME")
897 - private String pickUpCityName;
898 - /**
899 - * 反填标志（DM002是否反填，航班号，航班日期）
900 - * author: wy on 2021/02/03
901 - */
902 - @Column(name = "ISRETURNDATA")
903 - private Boolean isReturnData;
904 -
905 -
906 - /**
907 - * 审批备注（审批不通过）
908 - */
909 - @Column(name = "REJECT_REMARK")
910 - private String rejectRemark;
911 -
912 - /**
913 - * 是否需要站点协助 站点协助（审批不通过）
914 - */
915 - @JsonIgnore
916 - @ManyToOne(targetEntity = DictionaryEntries.class)
917 - @JoinColumn(name = "SITE_ASSISTANCE_ID")
918 - private DictionaryEntries siteAssistanceDic;
919 -
920 - /**
921 - * 取件日期
922 - */
923 - @Column(name = "PICK_UP_DATE")
924 - private Date pickUpDate;
925 -
926 - /**
927 - * 海关回执
928 - */
929 - @Column(name = "CUSTOMS_RECEIPT")
930 - private String customsReceipt;
931 -
932 - /**
933 - * 海关回执时间
934 - */
935 - @Column(name = "CUSTOMS_RECEIPT_TIME")
936 - private Date customsReceiptTime;
937 -
938 - /**
939 - * remark运单备注信息
940 - */
941 - @Column(name = "DM_REMARK")
942 - private String dmRemark;
943 -
944 - /**
945 - * 扫描代码ID
946 - */
947 - @JsonIgnore
948 - @ManyToOne(targetEntity = DictionaryEntries.class)
949 - @JoinColumn(name = "SCAN_CODE_ID")
950 - private DictionaryEntries scanCodeDic;
951 -
952 - /**
953 - * 扫描代码
954 - */
955 - @Column(name = "SCAN_CODE")
956 - private String scanCode;
957 -
958 - /**
959 - * 扫描状态日期
960 - */
961 - @Column(name = "SCAN_STATUS_TIME")
962 - private Date scanStatusTime;
963 -
964 - /**
965 - * 是否PPE
966 - */
967 - @Column(name = "IS_PPE")
968 - private String ppe;
969 -
970 -
971 - /**
972 - * 运单录入的类型
973 - */
974 - @Column(name = "CHMCONSIGMENT_TYPE")
975 - private String chmConsigmentType;
976 -
977 - /**
978 - * 是否是同一批批量导入的运单
979 - */
980 - @Column(name = "IS_BATCH_IMPORT")
981 - private String isBatchimport;
982 -
983 -
984 -
985 336
986 - @OneToMany(mappedBy = "chmConsignment",cascade = CascadeType.ALL) 337 + @OneToMany(mappedBy = "chmConsignment", cascade = CascadeType.ALL)
987 private List<ChmConsignmentDetail> chmConsignmentDetailList; 338 private List<ChmConsignmentDetail> chmConsignmentDetailList;
988 339
989 340
...@@ -991,20 +342,9 @@ public class ChmConsignment implements Serializable { ...@@ -991,20 +342,9 @@ public class ChmConsignment implements Serializable {
991 public String toString() { 342 public String toString() {
992 return "ChmConsignment{" + 343 return "ChmConsignment{" +
993 "id=" + id + 344 "id=" + id +
994 - //", version=" + version +
995 - ", exitPortDic=" + exitPortDic +
996 - ", exitPort='" + exitPort + '\'' +
997 - ", exitCusCode='" + exitCusCode + '\'' +
998 - ", exitCusDic=" + exitCusDic +
999 - ", exitCus='" + exitCus + '\'' +
1000 ", enteringNo='" + enteringNo + '\'' + 345 ", enteringNo='" + enteringNo + '\'' +
1001 ", customsNo='" + customsNo + '\'' + 346 ", customsNo='" + customsNo + '\'' +
1002 ", recordCode='" + recordCode + '\'' + 347 ", recordCode='" + recordCode + '\'' +
1003 - ", importDate=" + importDate +
1004 - ", customsDate=" + customsDate +
1005 - ", ownerCodeScc='" + ownerCodeScc + '\'' +
1006 - ", ownerCode='" + ownerCode + '\'' +
1007 - ", ownerName='" + ownerName + '\'' +
1008 ", vehicleWay=" + vehicleWay + 348 ", vehicleWay=" + vehicleWay +
1009 ", vehicleWayCode='" + vehicleWayCode + '\'' + 349 ", vehicleWayCode='" + vehicleWayCode + '\'' +
1010 ", consignmentCode='" + consignmentCode + '\'' + 350 ", consignmentCode='" + consignmentCode + '\'' +
...@@ -1017,13 +357,6 @@ public class ChmConsignment implements Serializable { ...@@ -1017,13 +357,6 @@ public class ChmConsignment implements Serializable {
1017 ", dealMode='" + dealMode + '\'' + 357 ", dealMode='" + dealMode + '\'' +
1018 ", packageTypeDic=" + packageTypeDic + 358 ", packageTypeDic=" + packageTypeDic +
1019 ", packageType='" + packageType + '\'' + 359 ", packageType='" + packageType + '\'' +
1020 - ", declaredDocTypeDic=" + declaredDocTypeDic +
1021 - ", declaredDocType='" + declaredDocType + '\'' +
1022 - ", declaredTypeDic=" + declaredTypeDic +
1023 - ", declaredType='" + declaredType + '\'' +
1024 - ", declaredFromTypeDic=" + declaredFromTypeDic +
1025 - ", declaredFromType='" + declaredFromType + '\'' +
1026 - ", licenseCode='" + licenseCode + '\'' +
1027 ", fromCountryDic=" + fromCountryDic + 360 ", fromCountryDic=" + fromCountryDic +
1028 ", fromCountry='" + fromCountry + '\'' + 361 ", fromCountry='" + fromCountry + '\'' +
1029 ", throughStopPortDic=" + throughStopPortDic + 362 ", throughStopPortDic=" + throughStopPortDic +
...@@ -1043,116 +376,17 @@ public class ChmConsignment implements Serializable { ...@@ -1043,116 +376,17 @@ public class ChmConsignment implements Serializable {
1043 ", counts=" + counts + 376 ", counts=" + counts +
1044 ", grossWeight=" + grossWeight + 377 ", grossWeight=" + grossWeight +
1045 ", netWeight=" + netWeight + 378 ", netWeight=" + netWeight +
1046 - ", slip='" + slip + '\'' +
1047 - ", promiseItmes1='" + promiseItmes1 + '\'' +
1048 - ", promiseItmes2='" + promiseItmes2 + '\'' +
1049 - ", promiseItmes3='" + promiseItmes3 + '\'' +
1050 ", tradeCoSCC='" + tradeCoSCC + '\'' + 379 ", tradeCoSCC='" + tradeCoSCC + '\'' +
1051 - ", operateUnitCode='" + operateUnitCode + '\'' +
1052 ", operateUnitName='" + operateUnitName + '\'' + 380 ", operateUnitName='" + operateUnitName + '\'' +
1053 ", overseasConsignorFnCname='" + overseasConsignorFnCname + '\'' + 381 ", overseasConsignorFnCname='" + overseasConsignorFnCname + '\'' +
1054 ", overseasConsignorCode='" + overseasConsignorCode + '\'' + 382 ", overseasConsignorCode='" + overseasConsignorCode + '\'' +
1055 - ", flightClassNo='" + flightClassNo + '\'' +
1056 ", declaredRemark='" + declaredRemark + '\'' + 383 ", declaredRemark='" + declaredRemark + '\'' +
1057 - ", remarkMark='" + remarkMark + '\'' +
1058 - ", declaredCode='" + declaredCode + '\'' +
1059 ", declaredUnitName='" + declaredUnitName + '\'' + 384 ", declaredUnitName='" + declaredUnitName + '\'' +
1060 - ", telephone='" + telephone + '\'' +
1061 - ", consTypeDic=" + consTypeDic +
1062 - ", consType='" + consType + '\'' +
1063 - ", sender='" + sender + '\'' +
1064 - ", enterpriseCode='" + enterpriseCode + '\'' +
1065 - ", taxUnit='" + taxUnit + '\'' +
1066 - ", printStatusDic=" + printStatusDic +
1067 - ", printStatus='" + printStatus + '\'' +
1068 - ", stampDic=" + stampDic +
1069 - ", stamp='" + stamp + '\'' +
1070 - ", upFileStatusDic=" + upFileStatusDic +
1071 - ", upFileStatus='" + upFileStatus + '\'' +
1072 - ", upFileTime=" + upFileTime +
1073 - //", upFileUserDic=" + upFileUserDic +
1074 - ", upFileUser='" + upFileUser + '\'' +
1075 - ", taskStatusDic=" + taskStatusDic +
1076 - ", taskStatus='" + taskStatus + '\'' +
1077 - ", pdfTime=" + pdfTime +
1078 - ", printNoDic=" + printNoDic +
1079 - ", printNo='" + printNo + '\'' +
1080 - ", printNoMsg='" + printNoMsg + '\'' +
1081 - ", printTime=" + printTime +
1082 ", createTime=" + createTime + 385 ", createTime=" + createTime +
1083 - //", creatorId=" + creatorId +
1084 ", creator='" + creator + '\'' + 386 ", creator='" + creator + '\'' +
1085 ", updateTime=" + updateTime + 387 ", updateTime=" + updateTime +
1086 - //", updateUser=" + updateUser +
1087 - ", updateUserName='" + updateUserName + '\'' +
1088 ", consStatusDic=" + consStatusDic + 388 ", consStatusDic=" + consStatusDic +
1089 ", consStatus='" + consStatus + '\'' + 389 ", consStatus='" + consStatus + '\'' +
1090 - ", osprStatusDic=" + osprStatusDic +
1091 - ", osprStatus='" + osprStatus + '\'' +
1092 - ", declaredPort='" + declaredPort + '\'' +
1093 - //", station=" + station +
1094 - ", stationName='" + stationName + '\'' +
1095 - ", flightDate=" + flightDate +
1096 - ", flightNo='" + flightNo + '\'' +
1097 - ", route='" + route + '\'' +
1098 - ", courier='" + courier + '\'' +
1099 - ", remark='" + remark + '\'' +
1100 - ", enableDeclaration='" + enableDeclaration + '\'' +
1101 - ", picUploaded=" + picUploaded +
1102 - ", picUploadTime=" + picUploadTime +
1103 - //", picUploadUser=" + picUploadUser +
1104 - ", creatingChannels='" + creatingChannels + '\'' +
1105 - ", skuName='" + skuName + '\'' +
1106 - ", export='" + export + '\'' +
1107 - ", contacts='" + contacts + '\'' +
1108 - ", contactInformation='" + contactInformation + '\'' +
1109 - ", rejectRemark='" + rejectRemark + '\'' +
1110 - ", siteAssistanceDic=" + siteAssistanceDic +
1111 - ", pickUpDate=" + pickUpDate +
1112 - ", customsReceipt='" + customsReceipt + '\'' +
1113 - ", customsReceiptTime=" + customsReceiptTime +
1114 - ", dmRemark='" + dmRemark + '\'' +
1115 - ", scanCodeDic=" + scanCodeDic +
1116 - ", scanCode='" + scanCode + '\'' +
1117 - ", scanStatusTime=" + scanStatusTime +
1118 - ", ppe='" + ppe + '\'' +
1119 - ", chmConsigmentType='" + chmConsigmentType + '\'' +
1120 - ", isBatchimport='" + isBatchimport + '\'' +
1121 -// ", exitPortDicId=" + exitPortDicId +
1122 -// ", exitPortDicName='" + exitPortDicName + '\'' +
1123 -// ", exitCusDicId=" + exitCusDicId +
1124 -// ", exitCusDicName='" + exitCusDicName + '\'' +
1125 -// ", vehicleWayId=" + vehicleWayId +
1126 -// ", vehicleWayName='" + vehicleWayName + '\'' +
1127 -// ", tradeModeDicId=" + tradeModeDicId +
1128 -// ", tradeModeDicName='" + tradeModeDicName + '\'' +
1129 -// ", taxNatureDicId=" + taxNatureDicId +
1130 -// ", taxNatureDicName='" + taxNatureDicName + '\'' +
1131 -// ", dealModeDicId=" + dealModeDicId +
1132 -// ", dealModeDicName='" + dealModeDicName + '\'' +
1133 -// ", packageTypeDicId=" + packageTypeDicId +
1134 -// ", packageTypeDicName='" + packageTypeDicName + '\'' +
1135 -// ", consTypeDicId=" + consTypeDicId +
1136 -// ", consTypeDicName='" + consTypeDicName + '\'' +
1137 -// ", fromCountryDicId=" + fromCountryDicId +
1138 -// ", fromCountryDicName='" + fromCountryDicName + '\'' +
1139 -// ", tradeAreaCodeDicId=" + tradeAreaCodeDicId +
1140 -// ", tradeAreaCodeDicName='" + tradeAreaCodeDicName + '\'' +
1141 -// ", transCurrencyDicId=" + transCurrencyDicId +
1142 -// ", transCurrencyDicName='" + transCurrencyDicName + '\'' +
1143 -// ", insuranceCostCurrencyDicId=" + insuranceCostCurrencyDicId +
1144 -// ", insuranceCostCurrencyDicName='" + insuranceCostCurrencyDicName + '\'' +
1145 -// ", otherCurrencyDicId=" + otherCurrencyDicId +
1146 -// ", otherCurrencyDicName='" + otherCurrencyDicName + '\'' +
1147 -// ", throughStopPortDicId=" + throughStopPortDicId +
1148 -// ", throughStopPortDicName='" + throughStopPortDicName + '\'' +
1149 -// ", consStatusDicCode='" + consStatusDicCode + '\'' +
1150 -// ", siteAssistanceDicName='" + siteAssistanceDicName + '\'' +
1151 -// ", stampDicCode='" + stampDicCode + '\'' +
1152 - ", pickUpCity='" + pickUpCity + '\'' +
1153 - ", pickUpCityName='" + pickUpCityName + '\'' +
1154 - ", isReturnData='" + isReturnData + '\'' +
1155 - ", fedExAccount='" + fedExAccount + '\'' +
1156 '}'; 390 '}';
1157 } 391 }
1158 } 392 }
......
...@@ -39,7 +39,7 @@ public class ChmConsignmentService { ...@@ -39,7 +39,7 @@ public class ChmConsignmentService {
39 * 转换主单 39 * 转换主单
40 * @return 40 * @return
41 */ 41 */
42 - public ChmConsignment convertToChmConsignment(Mawb mawb,Date pushTime){ 42 + public ChmConsignment convertToChmConsignment(Mawb mawb,Date pushTime,String creator){
43 ChmConsignment result = new ChmConsignment(); 43 ChmConsignment result = new ChmConsignment();
44 try{ 44 try{
45 //进出口标志:固定值 E 45 //进出口标志:固定值 E
...@@ -103,8 +103,8 @@ public class ChmConsignmentService { ...@@ -103,8 +103,8 @@ public class ChmConsignmentService {
103 result.setNetWeight(mawb.getNetWt()); 103 result.setNetWeight(mawb.getNetWt());
104 //杂费币制 104 //杂费币制
105 DictionaryEntries otherDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.CURRENCY_SYSTEM+mawb.getOtherCurr()); 105 DictionaryEntries otherDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.CURRENCY_SYSTEM+mawb.getOtherCurr());
106 - result.setInsuranceCostCurrencyDic(otherDictionaryEntries); 106 + result.setOtherCurrencyDic(otherDictionaryEntries);
107 - result.setInsuranceCostCurrency(otherDictionaryEntries.getChineseName()); 107 + result.setOtherCurrency(otherDictionaryEntries.getChineseName());
108 //杂费／率 108 //杂费／率
109 result.setOtherCost(mawb.getOtherRate()); 109 result.setOtherCost(mawb.getOtherRate());
110 //杂费标志 110 //杂费标志
...@@ -136,7 +136,7 @@ public class ChmConsignmentService { ...@@ -136,7 +136,7 @@ public class ChmConsignmentService {
136 136
137 //境内收发货人名称 137 //境内收发货人名称
138 result.setOperateUnitName(mawb.getTradeName()); 138 result.setOperateUnitName(mawb.getTradeName());
139 - //TODO 成交方式 139 + //成交方式
140 DictionaryEntries dealModeDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.CLINCH_TYPE+mawb.getTransMode()); 140 DictionaryEntries dealModeDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.CLINCH_TYPE+mawb.getTransMode());
141 result.setDealModeDic(dealModeDictionaryEntries); 141 result.setDealModeDic(dealModeDictionaryEntries);
142 result.setDealMode(dealModeDictionaryEntries.getChineseName()); 142 result.setDealMode(dealModeDictionaryEntries.getChineseName());
...@@ -177,7 +177,7 @@ public class ChmConsignmentService { ...@@ -177,7 +177,7 @@ public class ChmConsignmentService {
177 //推送时间作为创建时间，可以用来校验数据的有序性，如果新的推送时间小于已有的创建时间，就不更新数据 177 //推送时间作为创建时间，可以用来校验数据的有序性，如果新的推送时间小于已有的创建时间，就不更新数据
178 result.setCreateTime(new Date()); 178 result.setCreateTime(new Date());
179 result.setUpdateTime(pushTime); 179 result.setUpdateTime(pushTime);
180 - 180 + result.setCreator(creator);
181 181
182 }catch (Exception e){ 182 }catch (Exception e){
183 e.printStackTrace(); 183 e.printStackTrace();
...@@ -244,11 +244,11 @@ public class ChmConsignmentService { ...@@ -244,11 +244,11 @@ public class ChmConsignmentService {
244 * @param mawb 244 * @param mawb
245 * @param timeStamp 245 * @param timeStamp
246 */ 246 */
247 - public void processChmConsignment(Mawb mawb, String timeStamp) { 247 + public void processChmConsignment(Mawb mawb, String timeStamp,String creator) {
248 try { 248 try {
249 Date pushTime = DateUtils.timeStampToDate(Long.valueOf(timeStamp)); 249 Date pushTime = DateUtils.timeStampToDate(Long.valueOf(timeStamp));
250 250
251 - ChmConsignment chmConsignment=this.convertToChmConsignment(mawb,pushTime); 251 + ChmConsignment chmConsignment=this.convertToChmConsignment(mawb,pushTime,creator);
252 List<ChmConsignmentDetail> chmConsignmentDetailList = new ArrayList<>(); 252 List<ChmConsignmentDetail> chmConsignmentDetailList = new ArrayList<>();
253 mawb.getMawbDetailList().forEach(detail ->{ 253 mawb.getMawbDetailList().forEach(detail ->{
254 chmConsignmentDetailList.add(chmConsignmentDetailService.convertToChmConsignmentDetail(detail,chmConsignment)); 254 chmConsignmentDetailList.add(chmConsignmentDetailService.convertToChmConsignmentDetail(detail,chmConsignment));
......
...@@ -23,7 +23,7 @@ public class ChmConsignmentServiceTest extends IClearApiApplicationTests { ...@@ -23,7 +23,7 @@ public class ChmConsignmentServiceTest extends IClearApiApplicationTests {
23 try{ 23 try{
24 Mawb mawb = this.createNewMawb(); 24 Mawb mawb = this.createNewMawb();
25 String timeStamp = String.valueOf(new Date().getTime()); 25 String timeStamp = String.valueOf(new Date().getTime());
26 - chmConsignmentService.processChmConsignment(mawb,timeStamp); 26 + chmConsignmentService.processChmConsignment(mawb,timeStamp,"CTM");
27 27
28 }catch (Exception e){ 28 }catch (Exception e){
29 e.printStackTrace(); 29 e.printStackTrace();
......