erp / tax-agent · Commits

Commit 3b7a4129e5380237dee65ab183228da0e8c4430a

Authored by zhangmeiyang
1 parent 50996f81
build: skipped

feat(kingdee): 新增收款部门字段映射与转换支持 

- 新增 F_PZCW_Base_qtr1 类用于收款部门编号验证
- 在 ReceivableBill 中添加 receiveDept 字段并配置转换器
- 扩展 ReceivableMapping 以支持 F_PZCW_Base_qtr1 映射
- 实现 ReceivableReceiveDeptConverter 进行字段值转换
- 更新生产字段配置文档中的动态值映射规则
- 添加收款部门字段的完整配置 JSON 示例说明
Inline Side-by-side
Showing 5 changed files with 284 additions and 84 deletions
doc/生产字段配置.md
  View file @3b7a412
... ... @@ -695,115 +695,115 @@ PLAT_WITHDRAW(7, "平台提现")
695 695 "settingFieldType": 1,
696 696 "dynamicValues": [
697 697 {
698   - "configValue": "0-1",
  698 + "configValue": "0-B",
699 699 "configMapValue": "101.02"
700 700 },
701 701 {
702   - "configValue": "1-1",
  702 + "configValue": "1-B",
703 703 "configMapValue": "101.02"
704 704 },
705 705 {
706   - "configValue": "2-1",
  706 + "configValue": "2-B",
707 707 "configMapValue": "101.02"
708 708 },
709 709 {
710   - "configValue": "3-1",
  710 + "configValue": "3-B",
711 711 "configMapValue": "101.02"
712 712 },
713 713 {
714   - "configValue": "4-1",
  714 + "configValue": "4-B",
715 715 "configMapValue": "101.02"
716 716 },
717 717 {
718   - "configValue": "5-1",
  718 + "configValue": "5-B",
719 719 "configMapValue": "101.02"
720 720 },
721 721 {
722   - "configValue": "6-1",
  722 + "configValue": "6-B",
723 723 "configMapValue": "101.02"
724 724 },
725 725 {
726   - "configValue": "7-1",
  726 + "configValue": "7-B",
727 727 "configMapValue": "101.02"
728 728 },
729 729 {
730   - "configValue": "8-1",
  730 + "configValue": "8-B",
731 731 "configMapValue": "101.02"
732 732 },
733 733 {
734   - "configValue": "9-1",
  734 + "configValue": "9-B",
735 735 "configMapValue": "101.02"
736 736 },
737 737 {
738   - "configValue": "10-1",
  738 + "configValue": "10-B",
739 739 "configMapValue": "101.02"
740 740 },
741 741 {
742   - "configValue": "11-1",
  742 + "configValue": "11-B",
743 743 "configMapValue": "101.02"
744 744 },
745 745 {
746   - "configValue": "12-1",
  746 + "configValue": "12-B",
747 747 "configMapValue": "101.02"
748 748 },
749 749 {
750   - "configValue": "20-1",
  750 + "configValue": "20-B",
751 751 "configMapValue": "101"
752 752 },
753 753 {
754   - "configValue": "0-2",
  754 + "configValue": "0-S",
755 755 "configMapValue": "101.02"
756 756 },
757 757 {
758   - "configValue": "1-2",
  758 + "configValue": "1-S",
759 759 "configMapValue": "101.02"
760 760 },
761 761 {
762   - "configValue": "2-2",
  762 + "configValue": "2-S",
763 763 "configMapValue": "101.02"
764 764 },
765 765 {
766   - "configValue": "3-2",
  766 + "configValue": "3-S",
767 767 "configMapValue": "101.02"
768 768 },
769 769 {
770   - "configValue": "4-2",
  770 + "configValue": "4-S",
771 771 "configMapValue": "101.02"
772 772 },
773 773 {
774   - "configValue": "5-2",
  774 + "configValue": "5-S",
775 775 "configMapValue": "101.02"
776 776 },
777 777 {
778   - "configValue": "6-2",
  778 + "configValue": "6-S",
779 779 "configMapValue": "101.02"
780 780 },
781 781 {
782   - "configValue": "7-2",
  782 + "configValue": "7-S",
783 783 "configMapValue": "101.02"
784 784 },
785 785 {
786   - "configValue": "8-2",
  786 + "configValue": "8-S",
787 787 "configMapValue": "101.02"
788 788 },
789 789 {
790   - "configValue": "9-2",
  790 + "configValue": "9-S",
791 791 "configMapValue": "101.02"
792 792 },
793 793 {
794   - "configValue": "10-2",
  794 + "configValue": "10-S",
795 795 "configMapValue": "101.02"
796 796 },
797 797 {
798   - "configValue": "11-2",
  798 + "configValue": "11-S",
799 799 "configMapValue": "101.02"
800 800 },
801 801 {
802   - "configValue": "12-2",
  802 + "configValue": "12-S",
803 803 "configMapValue": "101.02"
804 804 },
805 805 {
806   - "configValue": "20-2",
  806 + "configValue": "20-S",
807 807 "configMapValue": "101.02"
808 808 }
809 809 ]
... ... @@ -832,115 +832,115 @@ PLAT_WITHDRAW(7, "平台提现")
832 832 "settingFieldType": 1,
833 833 "dynamicValues": [
834 834 {
835   - "configValue": "0-1",
  835 + "configValue": "0-B",
836 836 "configMapValue": "101.02"
837 837 },
838 838 {
839   - "configValue": "1-1",
  839 + "configValue": "1-B",
840 840 "configMapValue": "101.02"
841 841 },
842 842 {
843   - "configValue": "2-1",
  843 + "configValue": "2-B",
844 844 "configMapValue": "101.02"
845 845 },
846 846 {
847   - "configValue": "3-1",
  847 + "configValue": "3-B",
848 848 "configMapValue": "101.02"
849 849 },
850 850 {
851   - "configValue": "4-1",
  851 + "configValue": "4-B",
852 852 "configMapValue": "101.02"
853 853 },
854 854 {
855   - "configValue": "5-1",
  855 + "configValue": "5-B",
856 856 "configMapValue": "101.02"
857 857 },
858 858 {
859   - "configValue": "6-1",
  859 + "configValue": "6-B",
860 860 "configMapValue": "101.02"
861 861 },
862 862 {
863   - "configValue": "7-1",
  863 + "configValue": "7-B",
864 864 "configMapValue": "101.02"
865 865 },
866 866 {
867   - "configValue": "8-1",
  867 + "configValue": "8-B",
868 868 "configMapValue": "101.02"
869 869 },
870 870 {
871   - "configValue": "9-1",
  871 + "configValue": "9-B",
872 872 "configMapValue": "101.02"
873 873 },
874 874 {
875   - "configValue": "10-1",
  875 + "configValue": "10-B",
876 876 "configMapValue": "101.02"
877 877 },
878 878 {
879   - "configValue": "11-1",
  879 + "configValue": "11-B",
880 880 "configMapValue": "101.02"
881 881 },
882 882 {
883   - "configValue": "12-1",
  883 + "configValue": "12-B",
884 884 "configMapValue": "101.02"
885 885 },
886 886 {
887   - "configValue": "20-1",
  887 + "configValue": "20-B",
888 888 "configMapValue": "101.02"
889 889 },
890 890 {
891   - "configValue": "0-2",
  891 + "configValue": "0-S",
892 892 "configMapValue": "101.02"
893 893 },
894 894 {
895   - "configValue": "1-2",
  895 + "configValue": "1-S",
896 896 "configMapValue": "101.02"
897 897 },
898 898 {
899   - "configValue": "2-2",
  899 + "configValue": "2-S",
900 900 "configMapValue": "101.02"
901 901 },
902 902 {
903   - "configValue": "3-2",
  903 + "configValue": "3-S",
904 904 "configMapValue": "101.02"
905 905 },
906 906 {
907   - "configValue": "4-2",
  907 + "configValue": "4-S",
908 908 "configMapValue": "101.02"
909 909 },
910 910 {
911   - "configValue": "5-2",
  911 + "configValue": "5-S",
912 912 "configMapValue": "101.02"
913 913 },
914 914 {
915   - "configValue": "6-2",
  915 + "configValue": "6-S",
916 916 "configMapValue": "101.02"
917 917 },
918 918 {
919   - "configValue": "7-2",
  919 + "configValue": "7-S",
920 920 "configMapValue": "101.02"
921 921 },
922 922 {
923   - "configValue": "8-2",
  923 + "configValue": "8-S",
924 924 "configMapValue": "101.02"
925 925 },
926 926 {
927   - "configValue": "9-2",
  927 + "configValue": "9-S",
928 928 "configMapValue": "101.02"
929 929 },
930 930 {
931   - "configValue": "10-2",
  931 + "configValue": "10-S",
932 932 "configMapValue": "101.02"
933 933 },
934 934 {
935   - "configValue": "11-2",
  935 + "configValue": "11-S",
936 936 "configMapValue": "101.02"
937 937 },
938 938 {
939   - "configValue": "12-2",
  939 + "configValue": "12-S",
940 940 "configMapValue": "101.02"
941 941 },
942 942 {
943   - "configValue": "20-2",
  943 + "configValue": "20-S",
944 944 "configMapValue": "101.02"
945 945 }
946 946 ]
... ... @@ -981,115 +981,115 @@ PLAT_WITHDRAW(7, "平台提现")
981 981 "settingFieldType": 1,
982 982 "dynamicValues": [
983 983 {
984   - "configValue": "0-1",
  984 + "configValue": "0-B",
985 985 "configMapValue": "101.02"
986 986 },
987 987 {
988   - "configValue": "1-1",
  988 + "configValue": "1-B",
989 989 "configMapValue": "101.02"
990 990 },
991 991 {
992   - "configValue": "2-1",
  992 + "configValue": "2-B",
993 993 "configMapValue": "101.02"
994 994 },
995 995 {
996   - "configValue": "3-1",
  996 + "configValue": "3-B",
997 997 "configMapValue": "101.02"
998 998 },
999 999 {
1000   - "configValue": "4-1",
  1000 + "configValue": "4-B",
1001 1001 "configMapValue": "101.02"
1002 1002 },
1003 1003 {
1004   - "configValue": "5-1",
  1004 + "configValue": "5-B",
1005 1005 "configMapValue": "101.02"
1006 1006 },
1007 1007 {
1008   - "configValue": "6-1",
  1008 + "configValue": "6-B",
1009 1009 "configMapValue": "101.02"
1010 1010 },
1011 1011 {
1012   - "configValue": "7-1",
  1012 + "configValue": "7-B",
1013 1013 "configMapValue": "101.02"
1014 1014 },
1015 1015 {
1016   - "configValue": "8-1",
  1016 + "configValue": "8-B",
1017 1017 "configMapValue": "101.02"
1018 1018 },
1019 1019 {
1020   - "configValue": "9-1",
  1020 + "configValue": "9-B",
1021 1021 "configMapValue": "101.02"
1022 1022 },
1023 1023 {
1024   - "configValue": "10-1",
  1024 + "configValue": "10-B",
1025 1025 "configMapValue": "101.02"
1026 1026 },
1027 1027 {
1028   - "configValue": "11-1",
  1028 + "configValue": "11-B",
1029 1029 "configMapValue": "101.02"
1030 1030 },
1031 1031 {
1032   - "configValue": "12-1",
  1032 + "configValue": "12-B",
1033 1033 "configMapValue": "101.02"
1034 1034 },
1035 1035 {
1036   - "configValue": "20-1",
  1036 + "configValue": "20-B",
1037 1037 "configMapValue": "101"
1038 1038 },
1039 1039 {
1040   - "configValue": "0-2",
  1040 + "configValue": "0-S",
1041 1041 "configMapValue": "101.02"
1042 1042 },
1043 1043 {
1044   - "configValue": "1-2",
  1044 + "configValue": "1-S",
1045 1045 "configMapValue": "101.02"
1046 1046 },
1047 1047 {
1048   - "configValue": "2-2",
  1048 + "configValue": "2-S",
1049 1049 "configMapValue": "101.02"
1050 1050 },
1051 1051 {
1052   - "configValue": "3-2",
  1052 + "configValue": "3-S",
1053 1053 "configMapValue": "101.02"
1054 1054 },
1055 1055 {
1056   - "configValue": "4-2",
  1056 + "configValue": "4-S",
1057 1057 "configMapValue": "101.02"
1058 1058 },
1059 1059 {
1060   - "configValue": "5-2",
  1060 + "configValue": "5-S",
1061 1061 "configMapValue": "101.02"
1062 1062 },
1063 1063 {
1064   - "configValue": "6-2",
  1064 + "configValue": "6-S",
1065 1065 "configMapValue": "101.02"
1066 1066 },
1067 1067 {
1068   - "configValue": "7-2",
  1068 + "configValue": "7-S",
1069 1069 "configMapValue": "101.02"
1070 1070 },
1071 1071 {
1072   - "configValue": "8-2",
  1072 + "configValue": "8-S",
1073 1073 "configMapValue": "101.02"
1074 1074 },
1075 1075 {
1076   - "configValue": "9-2",
  1076 + "configValue": "9-S",
1077 1077 "configMapValue": "101.02"
1078 1078 },
1079 1079 {
1080   - "configValue": "10-2",
  1080 + "configValue": "10-S",
1081 1081 "configMapValue": "101.02"
1082 1082 },
1083 1083 {
1084   - "configValue": "11-2",
  1084 + "configValue": "11-S",
1085 1085 "configMapValue": "101.02"
1086 1086 },
1087 1087 {
1088   - "configValue": "12-2",
  1088 + "configValue": "12-S",
1089 1089 "configMapValue": "101.02"
1090 1090 },
1091 1091 {
1092   - "configValue": "20-2",
  1092 + "configValue": "20-S",
1093 1093 "configMapValue": "101.02"
1094 1094 }
1095 1095 ]
... ... @@ -1462,6 +1462,131 @@ PLAT_WITHDRAW(7, "平台提现")
1462 1462 }
1463 1463 ```
1464 1464  
  1465 +### 2.11 receiveDept 收款部门
  1466 +
  1467 +```json
  1468 +{
  1469 + "pipelineId": 2,
  1470 + "documentType": "AR_receivable",
  1471 + "configKey": "receiveDept",
  1472 + "settingFieldType": 1,
  1473 + "dynamicValues": [
  1474 + {
  1475 + "configValue": "0-B",
  1476 + "configMapValue": "BM000098"
  1477 + },
  1478 + {
  1479 + "configValue": "1-B",
  1480 + "configMapValue": "BM000098"
  1481 + },
  1482 + {
  1483 + "configValue": "2-B",
  1484 + "configMapValue": "BM000098"
  1485 + },
  1486 + {
  1487 + "configValue": "3-B",
  1488 + "configMapValue": "BM000098"
  1489 + },
  1490 + {
  1491 + "configValue": "4-B",
  1492 + "configMapValue": "BM000098"
  1493 + },
  1494 + {
  1495 + "configValue": "5-B",
  1496 + "configMapValue": "BM000098"
  1497 + },
  1498 + {
  1499 + "configValue": "6-B",
  1500 + "configMapValue": "BM000098"
  1501 + },
  1502 + {
  1503 + "configValue": "7-B",
  1504 + "configMapValue": "BM000098"
  1505 + },
  1506 + {
  1507 + "configValue": "8-B",
  1508 + "configMapValue": "BM000098"
  1509 + },
  1510 + {
  1511 + "configValue": "9-B",
  1512 + "configMapValue": "BM000098"
  1513 + },
  1514 + {
  1515 + "configValue": "10-B",
  1516 + "configMapValue": "BM000098"
  1517 + },
  1518 + {
  1519 + "configValue": "11-B",
  1520 + "configMapValue": "BM000098"
  1521 + },
  1522 + {
  1523 + "configValue": "12-B",
  1524 + "configMapValue": "BM000098"
  1525 + },
  1526 + {
  1527 + "configValue": "20-B",
  1528 + "configMapValue": "BM000042"
  1529 + },
  1530 + {
  1531 + "configValue": "0-S",
  1532 + "configMapValue": "BM000098"
  1533 + },
  1534 + {
  1535 + "configValue": "1-S",
  1536 + "configMapValue": "BM000098"
  1537 + },
  1538 + {
  1539 + "configValue": "2-S",
  1540 + "configMapValue": "BM000098"
  1541 + },
  1542 + {
  1543 + "configValue": "3-S",
  1544 + "configMapValue": "BM000098"
  1545 + },
  1546 + {
  1547 + "configValue": "4-S",
  1548 + "configMapValue": "BM000098"
  1549 + },
  1550 + {
  1551 + "configValue": "5-S",
  1552 + "configMapValue": "BM000098"
  1553 + },
  1554 + {
  1555 + "configValue": "6-S",
  1556 + "configMapValue": "BM000098"
  1557 + },
  1558 + {
  1559 + "configValue": "7-S",
  1560 + "configMapValue": "BM000098"
  1561 + },
  1562 + {
  1563 + "configValue": "8-S",
  1564 + "configMapValue": "BM000098"
  1565 + },
  1566 + {
  1567 + "configValue": "9-S",
  1568 + "configMapValue": "BM000098"
  1569 + },
  1570 + {
  1571 + "configValue": "10-S",
  1572 + "configMapValue": "BM000098"
  1573 + },
  1574 + {
  1575 + "configValue": "11-S",
  1576 + "configMapValue": "BM000098"
  1577 + },
  1578 + {
  1579 + "configValue": "12-S",
  1580 + "configMapValue": "BM000098"
  1581 + },
  1582 + {
  1583 + "configValue": "20-S",
  1584 + "configMapValue": "BM000098"
  1585 + }
  1586 + ]
  1587 +}
  1588 +```
  1589 +
1465 1590 ## 3.收款单配置JSON
1466 1591  
1467 1592 ### 3.1 currency 币别
... ...
tax-central/src/main/java/com/diligrp/tax/central/converter/impl/ReceivableReceiveDeptConverter.java 0 → 100644
  View file @3b7a412
  1 +package com.diligrp.tax.central.converter.impl;
  2 +
  3 +import com.diligrp.tax.central.converter.IConverter;
  4 +import com.diligrp.tax.central.domain.mapping.kingdee.base.FSettleTypeID;
  5 +import com.diligrp.tax.central.domain.mapping.kingdee.base.F_PZCW_Base_qtr1;
  6 +import org.springframework.stereotype.Component;
  7 +
  8 +import java.util.Objects;
  9 +
  10 +/**
  11 + * @Author: zhangmeiyang
  12 + * @CreateTime: 2025-11-03 11:02
  13 + * @Version: todo
  14 + */
  15 +@Component
  16 +public class ReceivableReceiveDeptConverter implements IConverter<F_PZCW_Base_qtr1> {
  17 + @Override
  18 + public F_PZCW_Base_qtr1 convert(Object source) {
  19 + if (Objects.isNull(source)) {
  20 + return new F_PZCW_Base_qtr1();
  21 + }
  22 + F_PZCW_Base_qtr1 f_PZCW_Base_qtr1 = new F_PZCW_Base_qtr1();
  23 + f_PZCW_Base_qtr1.setFNUMBER((String) source);
  24 + return f_PZCW_Base_qtr1;
  25 + }
  26 +}
... ...
tax-central/src/main/java/com/diligrp/tax/central/domain/document/kingdee/bill/ReceivableBill.java
  View file @3b7a412
... ... @@ -18,6 +18,12 @@ import java.util.List;
18 18 @Getter
19 19 @Setter
20 20 public class ReceivableBill extends BaseBill {
  21 +
  22 + /**
  23 + * 收款部门
  24 + */
  25 + @Converter(value = ReceivableReceiveDeptConverter.class, targetField = "F_PZCW_Base_qtr1")
  26 + private String receiveDept;
21 27 /**
22 28 * 结算方法(FSettleTypeID)
23 29 */
... ...
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/ReceivableMapping.java
  View file @3b7a412
... ... @@ -29,6 +29,7 @@ import java.util.List;
29 29 "F_ZDB_Text667",
30 30 "F_PZCW_Text",
31 31 "F_PZCW_Base_qtr",
  32 + "F_PZCW_Base_qtr1",
32 33 "F_PZCW_Text1",
33 34 "FEntityDetail",
34 35 })
... ... @@ -45,6 +46,7 @@ public class ReceivableMapping extends BaseMapping implements Serializable {
45 46 private FTRANSFERID FTRANSFERID;
46 47 private FORDERID FORDERID;
47 48 private F_PZCW_Base_qtr F_PZCW_Base_qtr;
  49 + private F_PZCW_Base_qtr1 F_PZCW_Base_qtr1;
48 50 private FChargeId FChargeId;
49 51 private FMAINBOOKSTDCURRID FMAINBOOKSTDCURRID;
50 52 private FCURRENCYID FCURRENCYID;
... ... @@ -209,6 +211,15 @@ public class ReceivableMapping extends BaseMapping implements Serializable {
209 211 F_PZCW_Base_qtr = f_PZCW_Base_qtr;
210 212 }
211 213  
  214 + @JsonProperty("F_PZCW_Base_qtr1")
  215 + public F_PZCW_Base_qtr1 getF_PZCW_Base_qtr1() {
  216 + return F_PZCW_Base_qtr1;
  217 + }
  218 +
  219 + public void setF_PZCW_Base_qtr1(F_PZCW_Base_qtr1 f_PZCW_Base_qtr1) {
  220 + F_PZCW_Base_qtr1 = f_PZCW_Base_qtr1;
  221 + }
  222 +
212 223 @JsonProperty("FMAINBOOKSTDCURRID")
213 224 public FMAINBOOKSTDCURRID getFMAINBOOKSTDCURRID() {
214 225 return FMAINBOOKSTDCURRID;
... ...
tax-central/src/main/java/com/diligrp/tax/central/domain/mapping/kingdee/base/F_PZCW_Base_qtr1.java 0 → 100644
  View file @3b7a412
  1 +package com.diligrp.tax.central.domain.mapping.kingdee.base;
  2 +
  3 +import com.diligrp.tax.central.domain.mapping.kingdee.VerifyMarkInterface;
  4 +import com.fasterxml.jackson.annotation.JsonProperty;
  5 +
  6 +/**
  7 + * @Author: zhangmeiyang
  8 + * @CreateTime: 2025-09-19 14:53
  9 + * @Version: todo
  10 + */
  11 +public class F_PZCW_Base_qtr1 implements VerifyMarkInterface {
  12 + private String FNUMBER;
  13 +
  14 + @JsonProperty("FNUMBER")
  15 + public String getFNUMBER() {
  16 + return FNUMBER;
  17 + }
  18 +
  19 + public void setFNUMBER(String FNUMBER) {
  20 + this.FNUMBER = FNUMBER;
  21 + }
  22 +
  23 + @Override
  24 + public String verify() {
  25 + return "F_PZCW_Base_qtr1.FNUMBER";
  26 + }
  27 +
  28 + @Override
  29 + public String value() {
  30 + return FNUMBER;
  31 + }
  32 +}
... ...