erp / tax-agent · Commits

Commit c5286d59f2e964985927cc527d4310a9407934b9

Authored by zhangmeiyang
1 parent deb2a039
build: skipped

feat(kingdee): 调整字段映射顺序并更新文档配置值 

- 为 ReceiptMapping、ReceivableMapping 和 RefundMapping 类添加 JsonPropertyOrder 注解以指定序列化顺序
- 更新 ReceivableBill 中的业务卡号字段注释和转换目标字段名
- 修改生产字段配置文档中的 configValue 格式，从单一数字改为带后缀的形式（如 "0-1", "0-2"）
- 简化部分配置项中重复的 "-7" 后缀为通配符 "*" 表达方式
Inline Side-by-side
Showing 5 changed files with 268 additions and 93 deletions
doc/生产字段配置.md
  View file @c5286d5
... ... @@ -695,60 +695,116 @@ PLAT_WITHDRAW(7, "平台提现")
695 695 "settingFieldType": 1,
696 696 "dynamicValues": [
697 697 {
698   - "configValue": "0",
  698 + "configValue": "0-1",
699 699 "configMapValue": "101.02"
700 700 },
701 701 {
702   - "configValue": "1",
  702 + "configValue": "1-1",
703 703 "configMapValue": "101.02"
704 704 },
705 705 {
706   - "configValue": "2",
  706 + "configValue": "2-1",
707 707 "configMapValue": "101.02"
708 708 },
709 709 {
710   - "configValue": "3",
  710 + "configValue": "3-1",
711 711 "configMapValue": "101.02"
712 712 },
713 713 {
714   - "configValue": "4",
  714 + "configValue": "4-1",
715 715 "configMapValue": "101.02"
716 716 },
717 717 {
718   - "configValue": "5",
  718 + "configValue": "5-1",
719 719 "configMapValue": "101.02"
720 720 },
721 721 {
722   - "configValue": "6",
  722 + "configValue": "6-1",
723 723 "configMapValue": "101.02"
724 724 },
725 725 {
726   - "configValue": "7",
  726 + "configValue": "7-1",
727 727 "configMapValue": "101.02"
728 728 },
729 729 {
730   - "configValue": "8",
  730 + "configValue": "8-1",
731 731 "configMapValue": "101.02"
732 732 },
733 733 {
734   - "configValue": "9",
  734 + "configValue": "9-1",
735 735 "configMapValue": "101.02"
736 736 },
737 737 {
738   - "configValue": "10",
  738 + "configValue": "10-1",
739 739 "configMapValue": "101.02"
740 740 },
741 741 {
742   - "configValue": "11",
  742 + "configValue": "11-1",
743 743 "configMapValue": "101.02"
744 744 },
745 745 {
746   - "configValue": "12",
  746 + "configValue": "12-1",
747 747 "configMapValue": "101.02"
748 748 },
749 749 {
750   - "configValue": "20",
  750 + "configValue": "20-1",
751 751 "configMapValue": "101"
  752 + },
  753 + {
  754 + "configValue": "0-2",
  755 + "configMapValue": "101.02"
  756 + },
  757 + {
  758 + "configValue": "1-2",
  759 + "configMapValue": "101.02"
  760 + },
  761 + {
  762 + "configValue": "2-2",
  763 + "configMapValue": "101.02"
  764 + },
  765 + {
  766 + "configValue": "3-2",
  767 + "configMapValue": "101.02"
  768 + },
  769 + {
  770 + "configValue": "4-2",
  771 + "configMapValue": "101.02"
  772 + },
  773 + {
  774 + "configValue": "5-2",
  775 + "configMapValue": "101.02"
  776 + },
  777 + {
  778 + "configValue": "6-2",
  779 + "configMapValue": "101.02"
  780 + },
  781 + {
  782 + "configValue": "7-2",
  783 + "configMapValue": "101.02"
  784 + },
  785 + {
  786 + "configValue": "8-2",
  787 + "configMapValue": "101.02"
  788 + },
  789 + {
  790 + "configValue": "9-2",
  791 + "configMapValue": "101.02"
  792 + },
  793 + {
  794 + "configValue": "10-2",
  795 + "configMapValue": "101.02"
  796 + },
  797 + {
  798 + "configValue": "11-2",
  799 + "configMapValue": "101.02"
  800 + },
  801 + {
  802 + "configValue": "12-2",
  803 + "configMapValue": "101.02"
  804 + },
  805 + {
  806 + "configValue": "20-2",
  807 + "configMapValue": "101.02"
752 808 }
753 809 ]
754 810 }
... ... @@ -776,60 +832,116 @@ PLAT_WITHDRAW(7, "平台提现")
776 832 "settingFieldType": 1,
777 833 "dynamicValues": [
778 834 {
779   - "configValue": "0",
  835 + "configValue": "0-1",
780 836 "configMapValue": "101.02"
781 837 },
782 838 {
783   - "configValue": "1",
  839 + "configValue": "1-1",
784 840 "configMapValue": "101.02"
785 841 },
786 842 {
787   - "configValue": "2",
  843 + "configValue": "2-1",
788 844 "configMapValue": "101.02"
789 845 },
790 846 {
791   - "configValue": "3",
  847 + "configValue": "3-1",
792 848 "configMapValue": "101.02"
793 849 },
794 850 {
795   - "configValue": "4",
  851 + "configValue": "4-1",
796 852 "configMapValue": "101.02"
797 853 },
798 854 {
799   - "configValue": "5",
  855 + "configValue": "5-1",
800 856 "configMapValue": "101.02"
801 857 },
802 858 {
803   - "configValue": "6",
  859 + "configValue": "6-1",
804 860 "configMapValue": "101.02"
805 861 },
806 862 {
807   - "configValue": "7",
  863 + "configValue": "7-1",
808 864 "configMapValue": "101.02"
809 865 },
810 866 {
811   - "configValue": "8",
  867 + "configValue": "8-1",
812 868 "configMapValue": "101.02"
813 869 },
814 870 {
815   - "configValue": "9",
  871 + "configValue": "9-1",
816 872 "configMapValue": "101.02"
817 873 },
818 874 {
819   - "configValue": "10",
  875 + "configValue": "10-1",
820 876 "configMapValue": "101.02"
821 877 },
822 878 {
823   - "configValue": "11",
  879 + "configValue": "11-1",
824 880 "configMapValue": "101.02"
825 881 },
826 882 {
827   - "configValue": "12",
  883 + "configValue": "12-1",
828 884 "configMapValue": "101.02"
829 885 },
830 886 {
831   - "configValue": "20",
832   - "configMapValue": "101"
  887 + "configValue": "20-1",
  888 + "configMapValue": "101.02"
  889 + },
  890 + {
  891 + "configValue": "0-2",
  892 + "configMapValue": "101.02"
  893 + },
  894 + {
  895 + "configValue": "1-2",
  896 + "configMapValue": "101.02"
  897 + },
  898 + {
  899 + "configValue": "2-2",
  900 + "configMapValue": "101.02"
  901 + },
  902 + {
  903 + "configValue": "3-2",
  904 + "configMapValue": "101.02"
  905 + },
  906 + {
  907 + "configValue": "4-2",
  908 + "configMapValue": "101.02"
  909 + },
  910 + {
  911 + "configValue": "5-2",
  912 + "configMapValue": "101.02"
  913 + },
  914 + {
  915 + "configValue": "6-2",
  916 + "configMapValue": "101.02"
  917 + },
  918 + {
  919 + "configValue": "7-2",
  920 + "configMapValue": "101.02"
  921 + },
  922 + {
  923 + "configValue": "8-2",
  924 + "configMapValue": "101.02"
  925 + },
  926 + {
  927 + "configValue": "9-2",
  928 + "configMapValue": "101.02"
  929 + },
  930 + {
  931 + "configValue": "10-2",
  932 + "configMapValue": "101.02"
  933 + },
  934 + {
  935 + "configValue": "11-2",
  936 + "configMapValue": "101.02"
  937 + },
  938 + {
  939 + "configValue": "12-2",
  940 + "configMapValue": "101.02"
  941 + },
  942 + {
  943 + "configValue": "20-2",
  944 + "configMapValue": "101.02"
833 945 }
834 946 ]
835 947 }
... ... @@ -869,60 +981,116 @@ PLAT_WITHDRAW(7, "平台提现")
869 981 "settingFieldType": 1,
870 982 "dynamicValues": [
871 983 {
872   - "configValue": "0",
  984 + "configValue": "0-1",
873 985 "configMapValue": "101.02"
874 986 },
875 987 {
876   - "configValue": "1",
  988 + "configValue": "1-1",
877 989 "configMapValue": "101.02"
878 990 },
879 991 {
880   - "configValue": "2",
  992 + "configValue": "2-1",
881 993 "configMapValue": "101.02"
882 994 },
883 995 {
884   - "configValue": "3",
  996 + "configValue": "3-1",
885 997 "configMapValue": "101.02"
886 998 },
887 999 {
888   - "configValue": "4",
  1000 + "configValue": "4-1",
889 1001 "configMapValue": "101.02"
890 1002 },
891 1003 {
892   - "configValue": "5",
  1004 + "configValue": "5-1",
893 1005 "configMapValue": "101.02"
894 1006 },
895 1007 {
896   - "configValue": "6",
  1008 + "configValue": "6-1",
897 1009 "configMapValue": "101.02"
898 1010 },
899 1011 {
900   - "configValue": "7",
  1012 + "configValue": "7-1",
901 1013 "configMapValue": "101.02"
902 1014 },
903 1015 {
904   - "configValue": "8",
  1016 + "configValue": "8-1",
905 1017 "configMapValue": "101.02"
906 1018 },
907 1019 {
908   - "configValue": "9",
  1020 + "configValue": "9-1",
909 1021 "configMapValue": "101.02"
910 1022 },
911 1023 {
912   - "configValue": "10",
  1024 + "configValue": "10-1",
913 1025 "configMapValue": "101.02"
914 1026 },
915 1027 {
916   - "configValue": "11",
  1028 + "configValue": "11-1",
917 1029 "configMapValue": "101.02"
918 1030 },
919 1031 {
920   - "configValue": "12",
  1032 + "configValue": "12-1",
921 1033 "configMapValue": "101.02"
922 1034 },
923 1035 {
924   - "configValue": "20",
  1036 + "configValue": "20-1",
925 1037 "configMapValue": "101"
  1038 + },
  1039 + {
  1040 + "configValue": "0-2",
  1041 + "configMapValue": "101.02"
  1042 + },
  1043 + {
  1044 + "configValue": "1-2",
  1045 + "configMapValue": "101.02"
  1046 + },
  1047 + {
  1048 + "configValue": "2-2",
  1049 + "configMapValue": "101.02"
  1050 + },
  1051 + {
  1052 + "configValue": "3-2",
  1053 + "configMapValue": "101.02"
  1054 + },
  1055 + {
  1056 + "configValue": "4-2",
  1057 + "configMapValue": "101.02"
  1058 + },
  1059 + {
  1060 + "configValue": "5-2",
  1061 + "configMapValue": "101.02"
  1062 + },
  1063 + {
  1064 + "configValue": "6-2",
  1065 + "configMapValue": "101.02"
  1066 + },
  1067 + {
  1068 + "configValue": "7-2",
  1069 + "configMapValue": "101.02"
  1070 + },
  1071 + {
  1072 + "configValue": "8-2",
  1073 + "configMapValue": "101.02"
  1074 + },
  1075 + {
  1076 + "configValue": "9-2",
  1077 + "configMapValue": "101.02"
  1078 + },
  1079 + {
  1080 + "configValue": "10-2",
  1081 + "configMapValue": "101.02"
  1082 + },
  1083 + {
  1084 + "configValue": "11-2",
  1085 + "configMapValue": "101.02"
  1086 + },
  1087 + {
  1088 + "configValue": "12-2",
  1089 + "configMapValue": "101.02"
  1090 + },
  1091 + {
  1092 + "configValue": "20-2",
  1093 + "configMapValue": "101.02"
926 1094 }
927 1095 ]
928 1096 }
... ... @@ -1765,55 +1933,7 @@ PLAT_WITHDRAW(7, "平台提现")
1765 1933 "configMapValue": "CI185"
1766 1934 },
1767 1935 {
1768   - "configValue": "1-7",
1769   - "configMapValue": "CI185"
1770   - },
1771   - {
1772   - "configValue": "2-7",
1773   - "configMapValue": "CI185"
1774   - },
1775   - {
1776   - "configValue": "3-7",
1777   - "configMapValue": "CI185"
1778   - },
1779   - {
1780   - "configValue": "4-7",
1781   - "configMapValue": "CI185"
1782   - },
1783   - {
1784   - "configValue": "5-7",
1785   - "configMapValue": "CI185"
1786   - },
1787   - {
1788   - "configValue": "6-7",
1789   - "configMapValue": "CI185"
1790   - },
1791   - {
1792   - "configValue": "7-7",
1793   - "configMapValue": "CI185"
1794   - },
1795   - {
1796   - "configValue": "8-7",
1797   - "configMapValue": "CI185"
1798   - },
1799   - {
1800   - "configValue": "9-7",
1801   - "configMapValue": "CI185"
1802   - },
1803   - {
1804   - "configValue": "10-7",
1805   - "configMapValue": "CI185"
1806   - },
1807   - {
1808   - "configValue": "11-7",
1809   - "configMapValue": "CI185"
1810   - },
1811   - {
1812   - "configValue": "12-7",
1813   - "configMapValue": "CI185"
1814   - },
1815   - {
1816   - "configValue": "20-7",
  1936 + "configValue": "*-7",
1817 1937 "configMapValue": "CI185"
1818 1938 }
1819 1939 ]
... ...
tax-central/src/main/java/com/diligrp/tax/central/domain/document/kingdee/bill/ReceivableBill.java
  View file @c5286d5
... ... @@ -24,7 +24,7 @@ public class ReceivableBill extends BaseBill {
24 24 @Converter(value = ReceivableSettleMethodConverter.class, targetField = "FSettleTypeID")
25 25 private String settleMethod;
26 26 /**
27   - * 业务卡号(F_PZCW_Text)
  27 + * 业务卡号(F_ZDB_Text )
28 28 */
29 29 @Converter(value = StringConverter.class, targetField = "F_ZDB_Text")
30 30 private String businessCardNumber;
... ...
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/ReceiptMapping.java
  View file @c5286d5
... ... @@ -3,6 +3,7 @@ package com.diligrp.tax.central.domain.mapping.kingdee;
3 3 import com.diligrp.tax.central.domain.BaseMapping;
4 4 import com.diligrp.tax.central.domain.mapping.kingdee.base.*;
5 5 import com.fasterxml.jackson.annotation.JsonProperty;
  6 +import com.fasterxml.jackson.annotation.JsonPropertyOrder;
6 7  
7 8 import java.io.Serializable;
8 9 import java.util.List;
... ... @@ -12,6 +13,23 @@ import java.util.List;
12 13 * @CreateTime: 2025-11-04 15:20
13 14 * @Version: todo
14 15 */
  16 +@JsonPropertyOrder({
  17 + "FBillTypeID",
  18 + "FPAYORGID",
  19 + "FSETTLEORGID",
  20 + "FSALEORGID",
  21 + "FDATE",
  22 + "FCONTACTUNITTYPE",
  23 + "FCONTACTUNIT",
  24 + "FPAYUNITTYPE",
  25 + "FPAYUNIT",
  26 + "FCURRENCYID",
  27 + "FSALEDEPTID",
  28 + "FREMARK",
  29 + "F_ZDB_Text5",
  30 + "FSETTLEMAINBOOKID",
  31 + "FRECEIVEBILLENTRY",
  32 +})
15 33 public class ReceiptMapping extends BaseMapping implements Serializable {
16 34 private String FREMARK;
17 35 private String F_ZDB_Text5;
... ...
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/ReceivableMapping.java
  View file @c5286d5
... ... @@ -3,6 +3,7 @@ package com.diligrp.tax.central.domain.mapping.kingdee;
3 3 import com.diligrp.tax.central.domain.BaseMapping;
4 4 import com.diligrp.tax.central.domain.mapping.kingdee.base.*;
5 5 import com.fasterxml.jackson.annotation.JsonProperty;
  6 +import com.fasterxml.jackson.annotation.JsonPropertyOrder;
6 7  
7 8 import java.io.Serializable;
8 9 import java.util.List;
... ... @@ -12,6 +13,25 @@ import java.util.List;
12 13 * @CreateTime: 2024-10-22 18:34
13 14 * @Version: todo
14 15 */
  16 +@JsonPropertyOrder({
  17 + "FBillTypeID",
  18 + "FDATE",
  19 + "FCUSTOMERID",
  20 + "FCURRENCYID",
  21 + "FSETTLEORGID",
  22 + "FPAYORGID",
  23 + "FSALEORGID",
  24 + "FSALEDEPTID",
  25 + "FAR_Remark",
  26 + "F_ZDB_Text",
  27 + "F_ZDB_Text1",
  28 + "F_ZDB_Text5",
  29 + "F_ZDB_Text667",
  30 + "F_PZCW_Text",
  31 + "F_PZCW_Base_qtr",
  32 + "F_PZCW_Text1",
  33 + "FEntityDetail",
  34 +})
15 35 public class ReceivableMapping extends BaseMapping implements Serializable {
16 36 private String FAR_Remark;
17 37 private String FDATE;
... ...
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/RefundMapping.java
  View file @c5286d5
... ... @@ -3,6 +3,7 @@ package com.diligrp.tax.central.domain.mapping.kingdee;
3 3 import com.diligrp.tax.central.domain.BaseMapping;
4 4 import com.diligrp.tax.central.domain.mapping.kingdee.base.*;
5 5 import com.fasterxml.jackson.annotation.JsonProperty;
  6 +import com.fasterxml.jackson.annotation.JsonPropertyOrder;
6 7  
7 8 import java.io.Serializable;
8 9 import java.util.List;
... ... @@ -12,6 +13,22 @@ import java.util.List;
12 13 * @CreateTime: 2025-11-04 15:22
13 14 * @Version: todo
14 15 */
  16 +@JsonPropertyOrder({
  17 + "FBillTypeID",
  18 + "FDATE",
  19 + "FCONTACTUNITTYPE",
  20 + "FCONTACTUNIT",
  21 + "FRECTUNITTYPE",
  22 + "FRECTUNIT",
  23 + "FCURRENCYID",
  24 + "FSETTLEORGID",
  25 + "FSALEORGID",
  26 + "FSALEDEPTID",
  27 + "FPAYORGID",
  28 + "FREMARK",
  29 + "F_ZDB_Text5",
  30 + "FREFUNDBILLENTRY",
  31 +})
15 32 public class RefundMapping extends BaseMapping implements Serializable {
16 33 private String FDATE;
17 34 private String FREMARK;
... ...