潘钊 / bsth_control · Commits

Commit a76978b5501a2a6e4565baccbbdae586c0c3140f

Authored by 徐烜
1 parent a7bc09a8

update

Inline Side-by-side
Showing 6 changed files with 2615 additions and 1301 deletions
src/main/java/com/bsth/repository/schedule/TTInfoDetailRepository.java
  View file @a76978b
... ... @@ -32,7 +32,7 @@ public interface TTInfoDetailRepository extends BaseRepository<TTInfoDetail, Lon
32 32  
33 33 void deleteByTtinfoId(Long ttid);
34 34  
35   - @Query(value = "select max(tt.fcno) from TTInfoDetail tt where tt.xl.id =?1 and tt.ttinfo.id =?2")
  35 + @Query(value = "select max(tt.fcno) as mx from bsth_c_s_ttinfo_detail tt where tt.xl =?1 and tt.ttinfo =?2", nativeQuery = true)
36 36 Long findMaxFcno(Integer xlid, Long ttinfoid);
37 37  
38 38 }
... ...
src/main/java/com/bsth/service/schedule/TTInfoDetailServiceImpl.java
  View file @a76978b
... ... @@ -9,7 +9,6 @@ import jxl.Sheet;
9 9 import jxl.Workbook;
10 10 import org.apache.commons.lang3.StringUtils;
11 11 import org.joda.time.DateTime;
12   -import org.pentaho.di.core.logging.LogLevel;
13 12 import org.pentaho.di.trans.Trans;
14 13 import org.pentaho.di.trans.TransMeta;
15 14 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -45,14 +44,26 @@ public class TTInfoDetailServiceImpl extends BaseServiceImpl<TTInfoDetail, Long>
45 44 private String fcsj;
46 45 /** 班次类型 */
47 46 private String bc_type;
  47 + /** 线路上下行 */
  48 + private String xldir;
  49 + /** 是偶分班 */
  50 + private Boolean isfb;
48 51  
49 52 public FcInfo() {
50 53 }
51 54  
52   - public FcInfo(Long ttdid, String bc_type, String fcsj) {
53   - this.ttdid = ttdid;
  55 + public FcInfo(String ttdid_str, String bc_type, String fcsj, String xldir, String isfb) {
  56 + this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
54 57 this.bc_type = bc_type;
55 58 this.fcsj = fcsj;
  59 + this.xldir = xldir;
  60 + if ("N".equals(isfb))
  61 + this.isfb = false;
  62 + else if ("Y".equals(isfb))
  63 + this.isfb = true;
  64 + else
  65 + this.isfb = false;
  66 +
56 67 }
57 68  
58 69 public Long getTtdid() {
... ... @@ -78,6 +89,22 @@ public class TTInfoDetailServiceImpl extends BaseServiceImpl<TTInfoDetail, Long>
78 89 public void setBc_type(String bc_type) {
79 90 this.bc_type = bc_type;
80 91 }
  92 +
  93 + public String getXldir() {
  94 + return xldir;
  95 + }
  96 +
  97 + public void setXldir(String xldir) {
  98 + this.xldir = xldir;
  99 + }
  100 +
  101 + public Boolean getIsfb() {
  102 + return isfb;
  103 + }
  104 +
  105 + public void setIsfb(Boolean isfb) {
  106 + this.isfb = isfb;
  107 + }
81 108 }
82 109  
83 110 /**
... ... @@ -119,7 +146,7 @@ public class TTInfoDetailServiceImpl extends BaseServiceImpl<TTInfoDetail, Long>
119 146 dataToolsProperties.getTtinfodetailForeditktr()).toURI());
120 147 TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
121 148 Trans trans = new Trans(transMeta);
122   - trans.setLogLevel(LogLevel.DEBUG);
  149 +// trans.setLogLevel(LogLevel.DEBUG);
123 150 // 1.2、设定命名参数，TODO：之后还要添加其他命名参数
124 151 String outputFilePath = "ttinfodetail_" + new DateTime().toString("yyyy-MM-dd_HH-mm-ss");
125 152 trans.setParameterValue("tempfilepath", dataToolsProperties.getTransTempdir() + File.separator + outputFilePath); // 数据输出文件路径
... ... @@ -152,21 +179,22 @@ public class TTInfoDetailServiceImpl extends BaseServiceImpl<TTInfoDetail, Long>
152 179 for (int r = 1; r < sheet.getRows(); r++) {
153 180 List<FcInfo> fcInfos = new ArrayList<>();
154 181 // 每行第一列都是路牌
155   - fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents())); // 用fcsj放置路牌显示
156   - for (int c = 1; c <= maxfcno * 4; ) {
157   - Long ttdid = StringUtils.isEmpty(sheet.getCell(c, r).getContents()) ? null :
158   - Long.valueOf(sheet.getCell(c, r).getContents());
159   - String fcsj = sheet.getCell(c + 1, r).getContents();
160   - String fzdname = sheet.getCell(c + 2, r).getContents();
161   - String bctype = sheet.getCell(c + 3, r).getContents();
162   -
163   - FcInfo fcInfo = new FcInfo(ttdid, bctype, fcsj);
164   -
165   - if (StringUtils.isNotEmpty(fzdname ))
166   - headarrays[(int)(c / 4) + 1] = fzdname;
  182 + fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null)); // 用fcsj放置路牌显示
  183 + for (int c = 1; c <= maxfcno * 6; ) {
  184 + String ttdid_str = sheet.getCell(c, r).getContents(); // 时刻表明细id
  185 + String fcsj = sheet.getCell(c + 1, r).getContents(); // 发车时间
  186 + String fzdname = sheet.getCell(c + 2, r).getContents(); // 发车站点名称
  187 + String bctype = sheet.getCell(c + 3, r).getContents(); // 班次类型
  188 + String xldir = sheet.getCell(c + 4, r).getContents(); // 线路上下行
  189 + String isfb = sheet.getCell(c + 5, r).getContents(); // 是否分班
  190 +
  191 + FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb);
  192 +
  193 + if (StringUtils.isNotEmpty(fzdname))
  194 + headarrays[(int)(c / 6) + 1] = fzdname;
167 195 fcInfos.add(fcInfo);
168 196  
169   - c += 4;
  197 + c += 6;
170 198 }
171 199 editInfo.getContents().add(fcInfos);
172 200 }
... ...
src/main/resources/datatools/ktrs/ttinfodetailDataInput.ktr
  View file @a76978b
... ... @@ -587,13 +587,31 @@
587 587 <optimizationLevel>9</optimizationLevel>
588 588 <jsScripts> <jsScript> <jsScript_type>0</jsScript_type>
589 589 <jsScript_name>Script 1</jsScript_name>
590   - <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x4e2d;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x5c;d&#x2b;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;</jsScript_script>
  590 + <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x4f7f;&#x7528;&#x6b63;&#x5219;&#x8868;&#x8fbe;&#x5f0f;&#x53bb;&#x9664;&#x7ad9;&#x70b9;&#x540d;&#x79f0;&#x4e2d;&#x7684;&#x6570;&#x5b57;&#xa;qdzname &#x3d; qdzname.replace&#x28;&#x2f;&#x5c;d&#x2b;&#x2f;g,&#x27;&#x27;&#x29;&#x3b;&#xa;&#xa;&#x2f;&#x2f; sendtime&#x5904;&#x7406;&#xa;var sendtime_calcu&#x3b;&#xa;if &#x28;sendtime.length &#x21;&#x3d; 5&#x29; &#xa; sendtime_calcu &#x3d; sendtime.substr&#x28;0, 2&#x29; &#x2b; &#x22;&#x3a;&#x22; &#x2b; sendtime.substr&#x28;2, 2&#x29;&#x3b;&#xa;else &#xa; sendtime_calcu &#x3d; sendtime&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;&#x5206;&#x73ed;&#xa;var isfb &#x3d; 0&#x3b;&#xa;&#xa;&#x2f;&#x2f; &#x8bbe;&#x7f6e;isCanceled&#xa;var iscanceled &#x3d; 0&#x3b;</jsScript_script>
591 591 </jsScript> </jsScripts> <fields> <field> <name>qdzname</name>
592 592 <rename>qdzname</rename>
593 593 <type>String</type>
594 594 <length>-1</length>
595 595 <precision>-1</precision>
596 596 <replace>Y</replace>
  597 + </field> <field> <name>isfb</name>
  598 + <rename>isfb</rename>
  599 + <type>Integer</type>
  600 + <length>-1</length>
  601 + <precision>-1</precision>
  602 + <replace>N</replace>
  603 + </field> <field> <name>iscanceled</name>
  604 + <rename>iscanceled</rename>
  605 + <type>Integer</type>
  606 + <length>-1</length>
  607 + <precision>-1</precision>
  608 + <replace>N</replace>
  609 + </field> <field> <name>sendtime_calcu</name>
  610 + <rename>sendtime_calcu</rename>
  611 + <type>String</type>
  612 + <length>-1</length>
  613 + <precision>-1</precision>
  614 + <replace>N</replace>
597 615 </field> </fields> <cluster_schema/>
598 616 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
599 617 <xloc>788</xloc>
... ... @@ -693,76 +711,8 @@
693 711 </step>
694 712  
695 713 <step>
696   - <name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</name>
697   - <type>ExcelInput</type>
698   - <description/>
699   - <distribute>Y</distribute>
700   - <custom_distribution/>
701   - <copies>1</copies>
702   - <partitioning>
703   - <method>none</method>
704   - <schema_name/>
705   - </partitioning>
706   - <header>Y</header>
707   - <noempty>Y</noempty>
708   - <stoponempty>N</stoponempty>
709   - <filefield/>
710   - <sheetfield/>
711   - <sheetrownumfield/>
712   - <rownumfield/>
713   - <sheetfield/>
714   - <filefield/>
715   - <limit>0</limit>
716   - <encoding/>
717   - <add_to_result_filenames>Y</add_to_result_filenames>
718   - <accept_filenames>N</accept_filenames>
719   - <accept_field/>
720   - <accept_stepname/>
721   - <file>
722   - <name/>
723   - <filemask/>
724   - <exclude_filemask/>
725   - <file_required>N</file_required>
726   - <include_subfolders>N</include_subfolders>
727   - </file>
728   - <fields>
729   - </fields>
730   - <sheets>
731   - <sheet>
732   - <name>&#x5de5;&#x4f5c;&#x8868;1</name>
733   - <startrow>0</startrow>
734   - <startcol>0</startcol>
735   - </sheet>
736   - </sheets>
737   - <strict_types>N</strict_types>
738   - <error_ignored>N</error_ignored>
739   - <error_line_skipped>N</error_line_skipped>
740   - <bad_line_files_destination_directory/>
741   - <bad_line_files_extension>warning</bad_line_files_extension>
742   - <error_line_files_destination_directory/>
743   - <error_line_files_extension>error</error_line_files_extension>
744   - <line_number_files_destination_directory/>
745   - <line_number_files_extension>line</line_number_files_extension>
746   - <shortFileFieldName/>
747   - <pathFieldName/>
748   - <hiddenFieldName/>
749   - <lastModificationTimeFieldName/>
750   - <uriNameFieldName/>
751   - <rootUriNameFieldName/>
752   - <extensionFieldName/>
753   - <sizeFieldName/>
754   - <spreadsheet_type>JXL</spreadsheet_type>
755   - <cluster_schema/>
756   - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
757   - <xloc>112</xloc>
758   - <yloc>44</yloc>
759   - <draw>Y</draw>
760   - </GUI>
761   - </step>
762   -
763   - <step>
764   - <name>&#x67e5;&#x627e;&#x505c;&#x8f66;&#x573a;1</name>
765   - <type>DBLookup</type>
  714 + <name>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail</name>
  715 + <type>InsertUpdate</type>
766 716 <description/>
767 717 <distribute>Y</distribute>
768 718 <custom_distribution/>
... ... @@ -772,141 +722,118 @@
772 722 <schema_name/>
773 723 </partitioning>
774 724 <connection>bus_control_variable</connection>
775   - <cache>N</cache>
776   - <cache_load_all>N</cache_load_all>
777   - <cache_size>0</cache_size>
  725 + <commit>100</commit>
  726 + <update_bypassed>N</update_bypassed>
778 727 <lookup>
779 728 <schema/>
780   - <table>bsth_c_car_park</table>
781   - <orderby/>
782   - <fail_on_multiple>N</fail_on_multiple>
783   - <eat_row_on_failure>N</eat_row_on_failure>
  729 + <table>bsth_c_s_ttinfo_detail</table>
784 730 <key>
785   - <name>tccname_</name>
786   - <field>park_name</field>
  731 + <name>xlid</name>
  732 + <field>xl</field>
787 733 <condition>&#x3d;</condition>
788 734 <name2/>
789 735 </key>
790   - <value>
791   - <name>id</name>
792   - <rename>qdzid</rename>
793   - <default/>
794   - <type>Integer</type>
795   - </value>
796   - </lookup>
797   - <cluster_schema/>
798   - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
799   - <xloc>755</xloc>
800   - <yloc>504</yloc>
801   - <draw>Y</draw>
802   - </GUI>
803   - </step>
804   -
805   - <step>
806   - <name>&#x67e5;&#x627e;&#x505c;&#x8f66;&#x573a;2</name>
807   - <type>DBLookup</type>
808   - <description/>
809   - <distribute>Y</distribute>
810   - <custom_distribution/>
811   - <copies>1</copies>
812   - <partitioning>
813   - <method>none</method>
814   - <schema_name/>
815   - </partitioning>
816   - <connection>bus_control_variable</connection>
817   - <cache>N</cache>
818   - <cache_load_all>N</cache_load_all>
819   - <cache_size>0</cache_size>
820   - <lookup>
821   - <schema/>
822   - <table>bsth_c_car_park</table>
823   - <orderby/>
824   - <fail_on_multiple>N</fail_on_multiple>
825   - <eat_row_on_failure>N</eat_row_on_failure>
826 736 <key>
827   - <name>tccname_</name>
828   - <field>park_name</field>
  737 + <name>ttid</name>
  738 + <field>ttinfo</field>
829 739 <condition>&#x3d;</condition>
830 740 <name2/>
831 741 </key>
832   - <value>
833   - <name>id</name>
834   - <rename>zdzid</rename>
835   - <default/>
836   - <type>Integer</type>
837   - </value>
838   - </lookup>
839   - <cluster_schema/>
840   - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
841   - <xloc>887</xloc>
842   - <yloc>608</yloc>
843   - <draw>Y</draw>
844   - </GUI>
845   - </step>
846   -
847   - <step>
848   - <name>&#x67e5;&#x627e;&#x51fa;&#x573a;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</name>
849   - <type>DBLookup</type>
850   - <description/>
851   - <distribute>Y</distribute>
852   - <custom_distribution/>
853   - <copies>1</copies>
854   - <partitioning>
855   - <method>none</method>
856   - <schema_name/>
857   - </partitioning>
858   - <connection>bus_control_variable</connection>
859   - <cache>N</cache>
860   - <cache_load_all>N</cache_load_all>
861   - <cache_size>0</cache_size>
862   - <lookup>
863   - <schema/>
864   - <table>bsth_c_stationroute</table>
865   - <orderby/>
866   - <fail_on_multiple>N</fail_on_multiple>
867   - <eat_row_on_failure>N</eat_row_on_failure>
868 742 <key>
869   - <name>xlid</name>
870   - <field>line</field>
  743 + <name>lpid</name>
  744 + <field>lp</field>
871 745 <condition>&#x3d;</condition>
872 746 <name2/>
873 747 </key>
874 748 <key>
875   - <name>zdzname</name>
876   - <field>station_name</field>
  749 + <name>fcno</name>
  750 + <field>fcno</field>
877 751 <condition>&#x3d;</condition>
878 752 <name2/>
879 753 </key>
880 754 <key>
881   - <name>endZdtype</name>
882   - <field>station_mark</field>
  755 + <name>bcs</name>
  756 + <field>bcs</field>
883 757 <condition>&#x3d;</condition>
884 758 <name2/>
885 759 </key>
886 760 <value>
887   - <name>station</name>
  761 + <name>lp</name>
  762 + <rename>lpid</rename>
  763 + <update>Y</update>
  764 + </value>
  765 + <value>
  766 + <name>bc_type</name>
  767 + <rename>bctype_code</rename>
  768 + <update>Y</update>
  769 + </value>
  770 + <value>
  771 + <name>bcs</name>
  772 + <rename>bcs</rename>
  773 + <update>Y</update>
  774 + </value>
  775 + <value>
  776 + <name>bcsj</name>
  777 + <rename>bcsj</rename>
  778 + <update>Y</update>
  779 + </value>
  780 + <value>
  781 + <name>fcno</name>
  782 + <rename>fcno</rename>
  783 + <update>Y</update>
  784 + </value>
  785 + <value>
  786 + <name>jhlc</name>
  787 + <rename>jhlc</rename>
  788 + <update>Y</update>
  789 + </value>
  790 + <value>
  791 + <name>fcsj</name>
  792 + <rename>sendtime_calcu</rename>
  793 + <update>Y</update>
  794 + </value>
  795 + <value>
  796 + <name>ttinfo</name>
  797 + <rename>ttid</rename>
  798 + <update>Y</update>
  799 + </value>
  800 + <value>
  801 + <name>xl</name>
  802 + <rename>xlid</rename>
  803 + <update>Y</update>
  804 + </value>
  805 + <value>
  806 + <name>qdz</name>
  807 + <rename>qdzid</rename>
  808 + <update>Y</update>
  809 + </value>
  810 + <value>
  811 + <name>zdz</name>
888 812 <rename>zdzid</rename>
889   - <default/>
890   - <type>Integer</type>
  813 + <update>Y</update>
891 814 </value>
892 815 <value>
893   - <name>directions</name>
  816 + <name>xl_dir</name>
894 817 <rename>sxx</rename>
895   - <default/>
896   - <type>Integer</type>
  818 + <update>Y</update>
  819 + </value>
  820 + <value>
  821 + <name>isfb</name>
  822 + <rename>isfb</rename>
  823 + <update>Y</update>
897 824 </value>
898 825 </lookup>
899 826 <cluster_schema/>
900 827 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
901   - <xloc>329</xloc>
902   - <yloc>505</yloc>
  828 + <xloc>143</xloc>
  829 + <yloc>860</yloc>
903 830 <draw>Y</draw>
904 831 </GUI>
905 832 </step>
906 833  
907 834 <step>
908   - <name>&#x67e5;&#x627e;&#x65f6;&#x523b;&#x8868;&#x57fa;&#x7840;&#x4fe1;&#x606f;&#x5173;&#x8054;</name>
909   - <type>DBLookup</type>
  835 + <name>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 2</name>
  836 + <type>InsertUpdate</type>
910 837 <description/>
911 838 <distribute>Y</distribute>
912 839 <custom_distribution/>
... ... @@ -916,15 +843,11 @@
916 843 <schema_name/>
917 844 </partitioning>
918 845 <connection>bus_control_variable</connection>
919   - <cache>N</cache>
920   - <cache_load_all>N</cache_load_all>
921   - <cache_size>0</cache_size>
  846 + <commit>100</commit>
  847 + <update_bypassed>N</update_bypassed>
922 848 <lookup>
923 849 <schema/>
924   - <table>bsth_c_s_ttinfo</table>
925   - <orderby/>
926   - <fail_on_multiple>N</fail_on_multiple>
927   - <eat_row_on_failure>N</eat_row_on_failure>
  850 + <table>bsth_c_s_ttinfo_detail</table>
928 851 <key>
929 852 <name>xlid</name>
930 853 <field>xl</field>
... ... @@ -932,89 +855,106 @@
932 855 <name2/>
933 856 </key>
934 857 <key>
935   - <name>ttinfoname_</name>
936   - <field>name</field>
  858 + <name>ttid</name>
  859 + <field>ttinfo</field>
937 860 <condition>&#x3d;</condition>
938 861 <name2/>
939 862 </key>
940   - <value>
941   - <name>id</name>
942   - <rename>ttid</rename>
943   - <default/>
944   - <type>Integer</type>
945   - </value>
946   - </lookup>
947   - <cluster_schema/>
948   - <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
949   - <xloc>1011</xloc>
950   - <yloc>134</yloc>
951   - <draw>Y</draw>
952   - </GUI>
953   - </step>
954   -
955   - <step>
956   - <name>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x4e0a;&#x4e0b;&#x884c;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
957   - <type>DBLookup</type>
958   - <description/>
959   - <distribute>Y</distribute>
960   - <custom_distribution/>
961   - <copies>1</copies>
962   - <partitioning>
963   - <method>none</method>
964   - <schema_name/>
965   - </partitioning>
966   - <connection>bus_control_variable</connection>
967   - <cache>N</cache>
968   - <cache_load_all>N</cache_load_all>
969   - <cache_size>0</cache_size>
970   - <lookup>
971   - <schema/>
972   - <table>bsth_c_line_information</table>
973   - <orderby/>
974   - <fail_on_multiple>N</fail_on_multiple>
975   - <eat_row_on_failure>N</eat_row_on_failure>
976 863 <key>
977   - <name>xlid</name>
978   - <field>line</field>
  864 + <name>lpid</name>
  865 + <field>lp</field>
  866 + <condition>&#x3d;</condition>
  867 + <name2/>
  868 + </key>
  869 + <key>
  870 + <name>fcno</name>
  871 + <field>fcno</field>
  872 + <condition>&#x3d;</condition>
  873 + <name2/>
  874 + </key>
  875 + <key>
  876 + <name>bcs</name>
  877 + <field>bcs</field>
979 878 <condition>&#x3d;</condition>
980 879 <name2/>
981 880 </key>
982 881 <value>
983   - <name>up_mileage</name>
984   - <rename>up_mileage</rename>
985   - <default/>
986   - <type>Number</type>
  882 + <name>tcc</name>
  883 + <rename>qdzid</rename>
  884 + <update>Y</update>
987 885 </value>
988 886 <value>
989   - <name>down_mileage</name>
990   - <rename>down_mileage</rename>
991   - <default/>
992   - <type>Number</type>
  887 + <name>zdz</name>
  888 + <rename>zdzid</rename>
  889 + <update>Y</update>
993 890 </value>
994 891 <value>
995   - <name>up_travel_time</name>
996   - <rename>up_travel_time</rename>
997   - <default/>
998   - <type>Number</type>
  892 + <name>xl</name>
  893 + <rename>xlid</rename>
  894 + <update>Y</update>
999 895 </value>
1000 896 <value>
1001   - <name>down_travel_time</name>
1002   - <rename>down_travel_time</rename>
1003   - <default/>
1004   - <type>Number</type>
  897 + <name>ttinfo</name>
  898 + <rename>ttid</rename>
  899 + <update>Y</update>
  900 + </value>
  901 + <value>
  902 + <name>xl_dir</name>
  903 + <rename>sxx</rename>
  904 + <update>Y</update>
  905 + </value>
  906 + <value>
  907 + <name>lp</name>
  908 + <rename>lpid</rename>
  909 + <update>Y</update>
  910 + </value>
  911 + <value>
  912 + <name>jhlc</name>
  913 + <rename>out_mileage</rename>
  914 + <update>Y</update>
  915 + </value>
  916 + <value>
  917 + <name>fcsj</name>
  918 + <rename>sendtime_calcu</rename>
  919 + <update>Y</update>
  920 + </value>
  921 + <value>
  922 + <name>bcsj</name>
  923 + <rename>out_time</rename>
  924 + <update>Y</update>
  925 + </value>
  926 + <value>
  927 + <name>bcs</name>
  928 + <rename>bcs</rename>
  929 + <update>Y</update>
  930 + </value>
  931 + <value>
  932 + <name>fcno</name>
  933 + <rename>fcno</rename>
  934 + <update>Y</update>
  935 + </value>
  936 + <value>
  937 + <name>bc_type</name>
  938 + <rename>bctype_code</rename>
  939 + <update>Y</update>
  940 + </value>
  941 + <value>
  942 + <name>isfb</name>
  943 + <rename>isfb</rename>
  944 + <update>Y</update>
1005 945 </value>
1006 946 </lookup>
1007 947 <cluster_schema/>
1008 948 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1009   - <xloc>149</xloc>
1010   - <yloc>581</yloc>
  949 + <xloc>340</xloc>
  950 + <yloc>890</yloc>
1011 951 <draw>Y</draw>
1012 952 </GUI>
1013 953 </step>
1014 954  
1015 955 <step>
1016   - <name>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x5173;&#x8054;</name>
1017   - <type>DBLookup</type>
  956 + <name>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 3</name>
  957 + <type>InsertUpdate</type>
1018 958 <description/>
1019 959 <distribute>Y</distribute>
1020 960 <custom_distribution/>
... ... @@ -1024,39 +964,118 @@
1024 964 <schema_name/>
1025 965 </partitioning>
1026 966 <connection>bus_control_variable</connection>
1027   - <cache>N</cache>
1028   - <cache_load_all>N</cache_load_all>
1029   - <cache_size>0</cache_size>
  967 + <commit>100</commit>
  968 + <update_bypassed>N</update_bypassed>
1030 969 <lookup>
1031 970 <schema/>
1032   - <table>bsth_c_line</table>
1033   - <orderby/>
1034   - <fail_on_multiple>N</fail_on_multiple>
1035   - <eat_row_on_failure>N</eat_row_on_failure>
  971 + <table>bsth_c_s_ttinfo_detail</table>
1036 972 <key>
1037   - <name>xlname_</name>
1038   - <field>name</field>
  973 + <name>xlid</name>
  974 + <field>xl</field>
  975 + <condition>&#x3d;</condition>
  976 + <name2/>
  977 + </key>
  978 + <key>
  979 + <name>ttid</name>
  980 + <field>ttinfo</field>
  981 + <condition>&#x3d;</condition>
  982 + <name2/>
  983 + </key>
  984 + <key>
  985 + <name>lpid</name>
  986 + <field>lp</field>
  987 + <condition>&#x3d;</condition>
  988 + <name2/>
  989 + </key>
  990 + <key>
  991 + <name>fcno</name>
  992 + <field>fcno</field>
  993 + <condition>&#x3d;</condition>
  994 + <name2/>
  995 + </key>
  996 + <key>
  997 + <name>bcs</name>
  998 + <field>bcs</field>
1039 999 <condition>&#x3d;</condition>
1040 1000 <name2/>
1041 1001 </key>
1042 1002 <value>
1043   - <name>id</name>
  1003 + <name>fcno</name>
  1004 + <rename>fcno</rename>
  1005 + <update>Y</update>
  1006 + </value>
  1007 + <value>
  1008 + <name>bcs</name>
  1009 + <rename>bcs</rename>
  1010 + <update>Y</update>
  1011 + </value>
  1012 + <value>
  1013 + <name>xl</name>
1044 1014 <rename>xlid</rename>
1045   - <default/>
1046   - <type>Integer</type>
  1015 + <update>Y</update>
  1016 + </value>
  1017 + <value>
  1018 + <name>ttinfo</name>
  1019 + <rename>ttid</rename>
  1020 + <update>Y</update>
  1021 + </value>
  1022 + <value>
  1023 + <name>lp</name>
  1024 + <rename>lpid</rename>
  1025 + <update>Y</update>
  1026 + </value>
  1027 + <value>
  1028 + <name>bc_type</name>
  1029 + <rename>bctype_code</rename>
  1030 + <update>Y</update>
  1031 + </value>
  1032 + <value>
  1033 + <name>bcsj</name>
  1034 + <rename>parade_time</rename>
  1035 + <update>Y</update>
  1036 + </value>
  1037 + <value>
  1038 + <name>jhlc</name>
  1039 + <rename>parade_mileage</rename>
  1040 + <update>Y</update>
  1041 + </value>
  1042 + <value>
  1043 + <name>fcsj</name>
  1044 + <rename>sendtime_calcu</rename>
  1045 + <update>Y</update>
  1046 + </value>
  1047 + <value>
  1048 + <name>xl_dir</name>
  1049 + <rename>sxx</rename>
  1050 + <update>Y</update>
  1051 + </value>
  1052 + <value>
  1053 + <name>qdz</name>
  1054 + <rename>qdzid</rename>
  1055 + <update>Y</update>
  1056 + </value>
  1057 + <value>
  1058 + <name>tcc</name>
  1059 + <rename>zdzid</rename>
  1060 + <update>Y</update>
  1061 + </value>
  1062 + <value>
  1063 + <name>isfb</name>
  1064 + <rename>isfb</rename>
  1065 + <update>Y</update>
1047 1066 </value>
1048 1067 </lookup>
1049 1068 <cluster_schema/>
1050 1069 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1051   - <xloc>1007</xloc>
1052   - <yloc>43</yloc>
  1070 + <xloc>770</xloc>
  1071 + <yloc>923</yloc>
1053 1072 <draw>Y</draw>
1054 1073 </GUI>
1055 1074 </step>
1056 1075  
1057 1076 <step>
1058   - <name>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x51fa;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
1059   - <type>DBLookup</type>
  1077 + <name>&#x65f6;&#x523b;&#x8868;&#x660e;&#x7ec6;&#x4fe1;&#x606f;Excel&#x8f93;&#x5165;</name>
  1078 + <type>ExcelInput</type>
1060 1079 <description/>
1061 1080 <distribute>Y</distribute>
1062 1081 <custom_distribution/>
... ... @@ -1065,45 +1084,65 @@
1065 1084 <method>none</method>
1066 1085 <schema_name/>
1067 1086 </partitioning>
1068   - <connection>bus_control_variable</connection>
1069   - <cache>N</cache>
1070   - <cache_load_all>N</cache_load_all>
1071   - <cache_size>0</cache_size>
1072   - <lookup>
1073   - <schema/>
1074   - <table>bsth_c_line_information</table>
1075   - <orderby/>
1076   - <fail_on_multiple>N</fail_on_multiple>
1077   - <eat_row_on_failure>N</eat_row_on_failure>
1078   - <key>
1079   - <name>xlid</name>
1080   - <field>line</field>
1081   - <condition>&#x3d;</condition>
1082   - <name2/>
1083   - </key>
1084   - <value>
1085   - <name>out_mileage</name>
1086   - <rename>out_mileage</rename>
1087   - <default/>
1088   - <type>Number</type>
1089   - </value>
1090   - <value>
1091   - <name>out_time</name>
1092   - <rename>out_time</rename>
1093   - <default/>
1094   - <type>Number</type>
1095   - </value>
1096   - </lookup>
  1087 + <header>Y</header>
  1088 + <noempty>Y</noempty>
  1089 + <stoponempty>N</stoponempty>
  1090 + <filefield/>
  1091 + <sheetfield/>
  1092 + <sheetrownumfield/>
  1093 + <rownumfield/>
  1094 + <sheetfield/>
  1095 + <filefield/>
  1096 + <limit>0</limit>
  1097 + <encoding/>
  1098 + <add_to_result_filenames>Y</add_to_result_filenames>
  1099 + <accept_filenames>N</accept_filenames>
  1100 + <accept_field/>
  1101 + <accept_stepname/>
  1102 + <file>
  1103 + <name/>
  1104 + <filemask/>
  1105 + <exclude_filemask/>
  1106 + <file_required>N</file_required>
  1107 + <include_subfolders>N</include_subfolders>
  1108 + </file>
  1109 + <fields>
  1110 + </fields>
  1111 + <sheets>
  1112 + <sheet>
  1113 + <name>&#x5de5;&#x4f5c;&#x8868;1</name>
  1114 + <startrow>0</startrow>
  1115 + <startcol>0</startcol>
  1116 + </sheet>
  1117 + </sheets>
  1118 + <strict_types>N</strict_types>
  1119 + <error_ignored>N</error_ignored>
  1120 + <error_line_skipped>N</error_line_skipped>
  1121 + <bad_line_files_destination_directory/>
  1122 + <bad_line_files_extension>warning</bad_line_files_extension>
  1123 + <error_line_files_destination_directory/>
  1124 + <error_line_files_extension>error</error_line_files_extension>
  1125 + <line_number_files_destination_directory/>
  1126 + <line_number_files_extension>line</line_number_files_extension>
  1127 + <shortFileFieldName/>
  1128 + <pathFieldName/>
  1129 + <hiddenFieldName/>
  1130 + <lastModificationTimeFieldName/>
  1131 + <uriNameFieldName/>
  1132 + <rootUriNameFieldName/>
  1133 + <extensionFieldName/>
  1134 + <sizeFieldName/>
  1135 + <spreadsheet_type>JXL</spreadsheet_type>
1097 1136 <cluster_schema/>
1098 1137 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1099   - <xloc>335</xloc>
1100   - <yloc>763</yloc>
  1138 + <xloc>112</xloc>
  1139 + <yloc>44</yloc>
1101 1140 <draw>Y</draw>
1102 1141 </GUI>
1103 1142 </step>
1104 1143  
1105 1144 <step>
1106   - <name>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x8fdb;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
  1145 + <name>&#x67e5;&#x627e;&#x505c;&#x8f66;&#x573a;1</name>
1107 1146 <type>DBLookup</type>
1108 1147 <description/>
1109 1148 <distribute>Y</distribute>
... ... @@ -1119,39 +1158,33 @@
1119 1158 <cache_size>0</cache_size>
1120 1159 <lookup>
1121 1160 <schema/>
1122   - <table>bsth_c_line_information</table>
  1161 + <table>bsth_c_car_park</table>
1123 1162 <orderby/>
1124 1163 <fail_on_multiple>N</fail_on_multiple>
1125 1164 <eat_row_on_failure>N</eat_row_on_failure>
1126 1165 <key>
1127   - <name>xlid</name>
1128   - <field>line</field>
  1166 + <name>tccname_</name>
  1167 + <field>park_name</field>
1129 1168 <condition>&#x3d;</condition>
1130 1169 <name2/>
1131 1170 </key>
1132 1171 <value>
1133   - <name>parade_mileage</name>
1134   - <rename>parade_mileage</rename>
1135   - <default/>
1136   - <type>Number</type>
1137   - </value>
1138   - <value>
1139   - <name>parade_time</name>
1140   - <rename>parade_time</rename>
  1172 + <name>id</name>
  1173 + <rename>qdzid</rename>
1141 1174 <default/>
1142   - <type>Number</type>
  1175 + <type>Integer</type>
1143 1176 </value>
1144 1177 </lookup>
1145 1178 <cluster_schema/>
1146 1179 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1147   - <xloc>550</xloc>
1148   - <yloc>920</yloc>
  1180 + <xloc>755</xloc>
  1181 + <yloc>504</yloc>
1149 1182 <draw>Y</draw>
1150 1183 </GUI>
1151 1184 </step>
1152 1185  
1153 1186 <step>
1154   - <name>&#x67e5;&#x627e;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;</name>
  1187 + <name>&#x67e5;&#x627e;&#x505c;&#x8f66;&#x573a;2</name>
1155 1188 <type>DBLookup</type>
1156 1189 <description/>
1157 1190 <distribute>Y</distribute>
... ... @@ -1167,36 +1200,18 @@
1167 1200 <cache_size>0</cache_size>
1168 1201 <lookup>
1169 1202 <schema/>
1170   - <table>bsth_c_stationroute</table>
  1203 + <table>bsth_c_car_park</table>
1171 1204 <orderby/>
1172 1205 <fail_on_multiple>N</fail_on_multiple>
1173 1206 <eat_row_on_failure>N</eat_row_on_failure>
1174 1207 <key>
1175   - <name>xlid</name>
1176   - <field>line</field>
1177   - <condition>&#x3d;</condition>
1178   - <name2/>
1179   - </key>
1180   - <key>
1181   - <name>sxx</name>
1182   - <field>directions</field>
1183   - <condition>&#x3d;</condition>
1184   - <name2/>
1185   - </key>
1186   - <key>
1187   - <name>endZdtype</name>
1188   - <field>station_mark</field>
  1208 + <name>tccname_</name>
  1209 + <field>park_name</field>
1189 1210 <condition>&#x3d;</condition>
1190 1211 <name2/>
1191 1212 </key>
1192 1213 <value>
1193   - <name>station_name</name>
1194   - <rename>zdzname</rename>
1195   - <default/>
1196   - <type>String</type>
1197   - </value>
1198   - <value>
1199   - <name>station</name>
  1214 + <name>id</name>
1200 1215 <rename>zdzid</rename>
1201 1216 <default/>
1202 1217 <type>Integer</type>
... ... @@ -1204,14 +1219,14 @@
1204 1219 </lookup>
1205 1220 <cluster_schema/>
1206 1221 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1207   - <xloc>280</xloc>
1208   - <yloc>404</yloc>
  1222 + <xloc>887</xloc>
  1223 + <yloc>608</yloc>
1209 1224 <draw>Y</draw>
1210 1225 </GUI>
1211 1226 </step>
1212 1227  
1213 1228 <step>
1214   - <name>&#x67e5;&#x627e;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</name>
  1229 + <name>&#x67e5;&#x627e;&#x51fa;&#x573a;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</name>
1215 1230 <type>DBLookup</type>
1216 1231 <description/>
1217 1232 <distribute>Y</distribute>
... ... @@ -1238,20 +1253,20 @@
1238 1253 <name2/>
1239 1254 </key>
1240 1255 <key>
1241   - <name>qdzname</name>
  1256 + <name>zdzname</name>
1242 1257 <field>station_name</field>
1243 1258 <condition>&#x3d;</condition>
1244 1259 <name2/>
1245 1260 </key>
1246 1261 <key>
1247   - <name>sendZdtype</name>
  1262 + <name>endZdtype</name>
1248 1263 <field>station_mark</field>
1249 1264 <condition>&#x3d;</condition>
1250 1265 <name2/>
1251 1266 </key>
1252 1267 <value>
1253 1268 <name>station</name>
1254   - <rename>qdzid</rename>
  1269 + <rename>zdzid</rename>
1255 1270 <default/>
1256 1271 <type>Integer</type>
1257 1272 </value>
... ... @@ -1264,14 +1279,14 @@
1264 1279 </lookup>
1265 1280 <cluster_schema/>
1266 1281 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1267   - <xloc>430</xloc>
1268   - <yloc>403</yloc>
  1282 + <xloc>329</xloc>
  1283 + <yloc>505</yloc>
1269 1284 <draw>Y</draw>
1270 1285 </GUI>
1271 1286 </step>
1272 1287  
1273 1288 <step>
1274   - <name>&#x67e5;&#x627e;&#x8def;&#x724c;&#x5173;&#x8054;</name>
  1289 + <name>&#x67e5;&#x627e;&#x65f6;&#x523b;&#x8868;&#x57fa;&#x7840;&#x4fe1;&#x606f;&#x5173;&#x8054;</name>
1275 1290 <type>DBLookup</type>
1276 1291 <description/>
1277 1292 <distribute>Y</distribute>
... ... @@ -1287,7 +1302,7 @@
1287 1302 <cache_size>0</cache_size>
1288 1303 <lookup>
1289 1304 <schema/>
1290   - <table>bsth_c_s_gbi</table>
  1305 + <table>bsth_c_s_ttinfo</table>
1291 1306 <orderby/>
1292 1307 <fail_on_multiple>N</fail_on_multiple>
1293 1308 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -1298,28 +1313,34 @@
1298 1313 <name2/>
1299 1314 </key>
1300 1315 <key>
1301   - <name>lp</name>
1302   - <field>lp_name</field>
  1316 + <name>ttinfoname_</name>
  1317 + <field>name</field>
  1318 + <condition>&#x3d;</condition>
  1319 + <name2/>
  1320 + </key>
  1321 + <key>
  1322 + <name>iscanceled</name>
  1323 + <field>is_cancel</field>
1303 1324 <condition>&#x3d;</condition>
1304 1325 <name2/>
1305 1326 </key>
1306 1327 <value>
1307 1328 <name>id</name>
1308   - <rename>lpid</rename>
  1329 + <rename>ttid</rename>
1309 1330 <default/>
1310 1331 <type>Integer</type>
1311 1332 </value>
1312 1333 </lookup>
1313 1334 <cluster_schema/>
1314 1335 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1315   - <xloc>1013</xloc>
1316   - <yloc>265</yloc>
  1336 + <xloc>1011</xloc>
  1337 + <yloc>134</yloc>
1317 1338 <draw>Y</draw>
1318 1339 </GUI>
1319 1340 </step>
1320 1341  
1321 1342 <step>
1322   - <name>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ebf;&#x8def;&#x65b9;&#x5411;</name>
  1343 + <name>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x4e0a;&#x4e0b;&#x884c;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
1323 1344 <type>DBLookup</type>
1324 1345 <description/>
1325 1346 <distribute>Y</distribute>
... ... @@ -1335,7 +1356,7 @@
1335 1356 <cache_size>0</cache_size>
1336 1357 <lookup>
1337 1358 <schema/>
1338   - <table>bsth_c_stationroute</table>
  1359 + <table>bsth_c_line_information</table>
1339 1360 <orderby/>
1340 1361 <fail_on_multiple>N</fail_on_multiple>
1341 1362 <eat_row_on_failure>N</eat_row_on_failure>
... ... @@ -1345,35 +1366,41 @@
1345 1366 <condition>&#x3d;</condition>
1346 1367 <name2/>
1347 1368 </key>
1348   - <key>
1349   - <name>startZdtype_calcu</name>
1350   - <field>station_mark</field>
1351   - <condition>&#x3d;</condition>
1352   - <name2/>
1353   - </key>
1354   - <key>
1355   - <name>qdzname_calcu</name>
1356   - <field>station_name</field>
1357   - <condition>&#x3d;</condition>
1358   - <name2/>
1359   - </key>
1360 1369 <value>
1361   - <name>directions</name>
1362   - <rename>sxx</rename>
  1370 + <name>up_mileage</name>
  1371 + <rename>up_mileage</rename>
1363 1372 <default/>
1364   - <type>String</type>
  1373 + <type>Number</type>
  1374 + </value>
  1375 + <value>
  1376 + <name>down_mileage</name>
  1377 + <rename>down_mileage</rename>
  1378 + <default/>
  1379 + <type>Number</type>
  1380 + </value>
  1381 + <value>
  1382 + <name>up_travel_time</name>
  1383 + <rename>up_travel_time</rename>
  1384 + <default/>
  1385 + <type>Number</type>
  1386 + </value>
  1387 + <value>
  1388 + <name>down_travel_time</name>
  1389 + <rename>down_travel_time</rename>
  1390 + <default/>
  1391 + <type>Number</type>
1365 1392 </value>
1366 1393 </lookup>
1367 1394 <cluster_schema/>
1368 1395 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1369   - <xloc>548</xloc>
1370   - <yloc>610</yloc>
  1396 + <xloc>149</xloc>
  1397 + <yloc>581</yloc>
1371 1398 <draw>Y</draw>
1372 1399 </GUI>
1373 1400 </step>
1374 1401  
1375 1402 <step>
1376   - <name>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x5e76;&#x4f5c;&#x4e3a;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;</name>
  1403 + <name>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x5173;&#x8054;</name>
1377 1404 <type>DBLookup</type>
1378 1405 <description/>
1379 1406 <distribute>Y</distribute>
... ... @@ -1389,46 +1416,34 @@
1389 1416 <cache_size>0</cache_size>
1390 1417 <lookup>
1391 1418 <schema/>
1392   - <table>bsth_c_stationroute</table>
  1419 + <table>bsth_c_line</table>
1393 1420 <orderby/>
1394 1421 <fail_on_multiple>N</fail_on_multiple>
1395 1422 <eat_row_on_failure>N</eat_row_on_failure>
1396 1423 <key>
1397   - <name>xlid</name>
1398   - <field>line</field>
1399   - <condition>&#x3d;</condition>
1400   - <name2/>
1401   - </key>
1402   - <key>
1403   - <name>endZdtype_calcu</name>
1404   - <field>station_mark</field>
1405   - <condition>&#x3d;</condition>
1406   - <name2/>
1407   - </key>
1408   - <key>
1409   - <name>sxx</name>
1410   - <field>directions</field>
  1424 + <name>xlname_</name>
  1425 + <field>name</field>
1411 1426 <condition>&#x3d;</condition>
1412 1427 <name2/>
1413 1428 </key>
1414 1429 <value>
1415   - <name>station</name>
1416   - <rename>qdzid</rename>
  1430 + <name>id</name>
  1431 + <rename>xlid</rename>
1417 1432 <default/>
1418 1433 <type>Integer</type>
1419 1434 </value>
1420 1435 </lookup>
1421 1436 <cluster_schema/>
1422 1437 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1423   - <xloc>550</xloc>
1424   - <yloc>701</yloc>
  1438 + <xloc>1007</xloc>
  1439 + <yloc>43</yloc>
1425 1440 <draw>Y</draw>
1426 1441 </GUI>
1427 1442 </step>
1428 1443  
1429 1444 <step>
1430   - <name>&#x6b63;&#x5e38;&#x73ed;&#x6b21;_&#x5904;&#x7406;&#x6570;&#x636e;</name>
1431   - <type>ScriptValueMod</type>
  1445 + <name>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x51fa;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
  1446 + <type>DBLookup</type>
1432 1447 <description/>
1433 1448 <distribute>Y</distribute>
1434 1449 <custom_distribution/>
... ... @@ -1437,34 +1452,46 @@
1437 1452 <method>none</method>
1438 1453 <schema_name/>
1439 1454 </partitioning>
1440   - <compatible>N</compatible>
1441   - <optimizationLevel>9</optimizationLevel>
1442   - <jsScripts> <jsScript> <jsScript_type>0</jsScript_type>
1443   - <jsScript_name>Script 1</jsScript_name>
1444   - <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var sendZdtype &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;&#xa;</jsScript_script>
1445   - </jsScript> </jsScripts> <fields> <field> <name>sendZdtype</name>
1446   - <rename>sendZdtype</rename>
1447   - <type>String</type>
1448   - <length>-1</length>
1449   - <precision>-1</precision>
1450   - <replace>N</replace>
1451   - </field> <field> <name>endZdtype</name>
1452   - <rename>endZdtype</rename>
1453   - <type>String</type>
1454   - <length>-1</length>
1455   - <precision>-1</precision>
1456   - <replace>N</replace>
1457   - </field> </fields> <cluster_schema/>
  1455 + <connection>bus_control_variable</connection>
  1456 + <cache>N</cache>
  1457 + <cache_load_all>N</cache_load_all>
  1458 + <cache_size>0</cache_size>
  1459 + <lookup>
  1460 + <schema/>
  1461 + <table>bsth_c_line_information</table>
  1462 + <orderby/>
  1463 + <fail_on_multiple>N</fail_on_multiple>
  1464 + <eat_row_on_failure>N</eat_row_on_failure>
  1465 + <key>
  1466 + <name>xlid</name>
  1467 + <field>line</field>
  1468 + <condition>&#x3d;</condition>
  1469 + <name2/>
  1470 + </key>
  1471 + <value>
  1472 + <name>out_mileage</name>
  1473 + <rename>out_mileage</rename>
  1474 + <default/>
  1475 + <type>Number</type>
  1476 + </value>
  1477 + <value>
  1478 + <name>out_time</name>
  1479 + <rename>out_time</rename>
  1480 + <default/>
  1481 + <type>Number</type>
  1482 + </value>
  1483 + </lookup>
  1484 + <cluster_schema/>
1458 1485 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1459   - <xloc>588</xloc>
1460   - <yloc>403</yloc>
  1486 + <xloc>335</xloc>
  1487 + <yloc>763</yloc>
1461 1488 <draw>Y</draw>
1462 1489 </GUI>
1463 1490 </step>
1464 1491  
1465 1492 <step>
1466   - <name>&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x6570;&#x636e;</name>
1467   - <type>Dummy</type>
  1493 + <name>&#x67e5;&#x627e;&#x7ebf;&#x8def;&#x8fdb;&#x573a;&#x91cc;&#x7a0b;&#x65f6;&#x95f4;</name>
  1494 + <type>DBLookup</type>
1468 1495 <description/>
1469 1496 <distribute>Y</distribute>
1470 1497 <custom_distribution/>
... ... @@ -1473,17 +1500,46 @@
1473 1500 <method>none</method>
1474 1501 <schema_name/>
1475 1502 </partitioning>
  1503 + <connection>bus_control_variable</connection>
  1504 + <cache>N</cache>
  1505 + <cache_load_all>N</cache_load_all>
  1506 + <cache_size>0</cache_size>
  1507 + <lookup>
  1508 + <schema/>
  1509 + <table>bsth_c_line_information</table>
  1510 + <orderby/>
  1511 + <fail_on_multiple>N</fail_on_multiple>
  1512 + <eat_row_on_failure>N</eat_row_on_failure>
  1513 + <key>
  1514 + <name>xlid</name>
  1515 + <field>line</field>
  1516 + <condition>&#x3d;</condition>
  1517 + <name2/>
  1518 + </key>
  1519 + <value>
  1520 + <name>parade_mileage</name>
  1521 + <rename>parade_mileage</rename>
  1522 + <default/>
  1523 + <type>Number</type>
  1524 + </value>
  1525 + <value>
  1526 + <name>parade_time</name>
  1527 + <rename>parade_time</rename>
  1528 + <default/>
  1529 + <type>Number</type>
  1530 + </value>
  1531 + </lookup>
1476 1532 <cluster_schema/>
1477 1533 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1478   - <xloc>725</xloc>
1479   - <yloc>404</yloc>
  1534 + <xloc>550</xloc>
  1535 + <yloc>920</yloc>
1480 1536 <draw>Y</draw>
1481 1537 </GUI>
1482 1538 </step>
1483 1539  
1484 1540 <step>
1485   - <name>&#x6dfb;&#x52a0;&#x53d1;&#x8f66;&#x987a;&#x5e8f;&#x53f7;</name>
1486   - <type>GroupBy</type>
  1541 + <name>&#x67e5;&#x627e;&#x7ec8;&#x70b9;&#x7ad9;&#x5173;&#x8054;</name>
  1542 + <type>DBLookup</type>
1487 1543 <description/>
1488 1544 <distribute>Y</distribute>
1489 1545 <custom_distribution/>
... ... @@ -1492,32 +1548,58 @@
1492 1548 <method>none</method>
1493 1549 <schema_name/>
1494 1550 </partitioning>
1495   - <all_rows>Y</all_rows>
1496   - <ignore_aggregate>N</ignore_aggregate>
1497   - <field_ignore/>
1498   - <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
1499   - <prefix>grp</prefix>
1500   - <add_linenr>Y</add_linenr>
1501   - <linenr_fieldname>fcno</linenr_fieldname>
1502   - <give_back_row>N</give_back_row>
1503   - <group>
1504   - <field>
1505   - <name>lp</name>
1506   - </field>
1507   - </group>
1508   - <fields>
1509   - </fields>
  1551 + <connection>bus_control_variable</connection>
  1552 + <cache>N</cache>
  1553 + <cache_load_all>N</cache_load_all>
  1554 + <cache_size>0</cache_size>
  1555 + <lookup>
  1556 + <schema/>
  1557 + <table>bsth_c_stationroute</table>
  1558 + <orderby/>
  1559 + <fail_on_multiple>N</fail_on_multiple>
  1560 + <eat_row_on_failure>N</eat_row_on_failure>
  1561 + <key>
  1562 + <name>xlid</name>
  1563 + <field>line</field>
  1564 + <condition>&#x3d;</condition>
  1565 + <name2/>
  1566 + </key>
  1567 + <key>
  1568 + <name>sxx</name>
  1569 + <field>directions</field>
  1570 + <condition>&#x3d;</condition>
  1571 + <name2/>
  1572 + </key>
  1573 + <key>
  1574 + <name>endZdtype</name>
  1575 + <field>station_mark</field>
  1576 + <condition>&#x3d;</condition>
  1577 + <name2/>
  1578 + </key>
  1579 + <value>
  1580 + <name>station_name</name>
  1581 + <rename>zdzname</rename>
  1582 + <default/>
  1583 + <type>String</type>
  1584 + </value>
  1585 + <value>
  1586 + <name>station</name>
  1587 + <rename>zdzid</rename>
  1588 + <default/>
  1589 + <type>Integer</type>
  1590 + </value>
  1591 + </lookup>
1510 1592 <cluster_schema/>
1511 1593 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1512   - <xloc>442</xloc>
1513   - <yloc>44</yloc>
  1594 + <xloc>280</xloc>
  1595 + <yloc>404</yloc>
1514 1596 <draw>Y</draw>
1515 1597 </GUI>
1516 1598 </step>
1517 1599  
1518 1600 <step>
1519   - <name>&#x6dfb;&#x52a0;&#x5bf9;&#x5e94;&#x73ed;&#x6b21;&#x6570;</name>
1520   - <type>GroupBy</type>
  1601 + <name>&#x67e5;&#x627e;&#x8d77;&#x70b9;&#x7ad9;&#x5173;&#x8054;&#x5e76;&#x786e;&#x5b9a;&#x4e0a;&#x4e0b;&#x884c;</name>
  1602 + <type>DBLookup</type>
1521 1603 <description/>
1522 1604 <distribute>Y</distribute>
1523 1605 <custom_distribution/>
... ... @@ -1526,29 +1608,58 @@
1526 1608 <method>none</method>
1527 1609 <schema_name/>
1528 1610 </partitioning>
1529   - <all_rows>Y</all_rows>
1530   - <ignore_aggregate>N</ignore_aggregate>
1531   - <field_ignore/>
1532   - <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
1533   - <prefix>grp</prefix>
1534   - <add_linenr>Y</add_linenr>
1535   - <linenr_fieldname>bcs</linenr_fieldname>
1536   - <give_back_row>N</give_back_row>
1537   - <group>
1538   - </group>
1539   - <fields>
1540   - </fields>
  1611 + <connection>bus_control_variable</connection>
  1612 + <cache>N</cache>
  1613 + <cache_load_all>N</cache_load_all>
  1614 + <cache_size>0</cache_size>
  1615 + <lookup>
  1616 + <schema/>
  1617 + <table>bsth_c_stationroute</table>
  1618 + <orderby/>
  1619 + <fail_on_multiple>N</fail_on_multiple>
  1620 + <eat_row_on_failure>N</eat_row_on_failure>
  1621 + <key>
  1622 + <name>xlid</name>
  1623 + <field>line</field>
  1624 + <condition>&#x3d;</condition>
  1625 + <name2/>
  1626 + </key>
  1627 + <key>
  1628 + <name>qdzname</name>
  1629 + <field>station_name</field>
  1630 + <condition>&#x3d;</condition>
  1631 + <name2/>
  1632 + </key>
  1633 + <key>
  1634 + <name>sendZdtype</name>
  1635 + <field>station_mark</field>
  1636 + <condition>&#x3d;</condition>
  1637 + <name2/>
  1638 + </key>
  1639 + <value>
  1640 + <name>station</name>
  1641 + <rename>qdzid</rename>
  1642 + <default/>
  1643 + <type>Integer</type>
  1644 + </value>
  1645 + <value>
  1646 + <name>directions</name>
  1647 + <rename>sxx</rename>
  1648 + <default/>
  1649 + <type>Integer</type>
  1650 + </value>
  1651 + </lookup>
1541 1652 <cluster_schema/>
1542 1653 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1543   - <xloc>692</xloc>
1544   - <yloc>44</yloc>
  1654 + <xloc>430</xloc>
  1655 + <yloc>403</yloc>
1545 1656 <draw>Y</draw>
1546 1657 </GUI>
1547 1658 </step>
1548 1659  
1549 1660 <step>
1550   - <name>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</name>
1551   - <type>Normaliser</type>
  1661 + <name>&#x67e5;&#x627e;&#x8def;&#x724c;&#x5173;&#x8054;</name>
  1662 + <type>DBLookup</type>
1552 1663 <description/>
1553 1664 <distribute>Y</distribute>
1554 1665 <custom_distribution/>
... ... @@ -1557,18 +1668,46 @@
1557 1668 <method>none</method>
1558 1669 <schema_name/>
1559 1670 </partitioning>
1560   - <typefield>&#x7ad9;&#x70b9;&#x540d;&#x79f0;</typefield>
1561   - <fields> </fields> <cluster_schema/>
  1671 + <connection>bus_control_variable</connection>
  1672 + <cache>N</cache>
  1673 + <cache_load_all>N</cache_load_all>
  1674 + <cache_size>0</cache_size>
  1675 + <lookup>
  1676 + <schema/>
  1677 + <table>bsth_c_s_gbi</table>
  1678 + <orderby/>
  1679 + <fail_on_multiple>N</fail_on_multiple>
  1680 + <eat_row_on_failure>N</eat_row_on_failure>
  1681 + <key>
  1682 + <name>xlid</name>
  1683 + <field>xl</field>
  1684 + <condition>&#x3d;</condition>
  1685 + <name2/>
  1686 + </key>
  1687 + <key>
  1688 + <name>lp</name>
  1689 + <field>lp_name</field>
  1690 + <condition>&#x3d;</condition>
  1691 + <name2/>
  1692 + </key>
  1693 + <value>
  1694 + <name>id</name>
  1695 + <rename>lpid</rename>
  1696 + <default/>
  1697 + <type>Integer</type>
  1698 + </value>
  1699 + </lookup>
  1700 + <cluster_schema/>
1562 1701 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1563   - <xloc>248</xloc>
1564   - <yloc>44</yloc>
  1702 + <xloc>1013</xloc>
  1703 + <yloc>265</yloc>
1565 1704 <draw>Y</draw>
1566 1705 </GUI>
1567 1706 </step>
1568 1707  
1569 1708 <step>
1570   - <name>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178;</name>
1571   - <type>ValueMapper</type>
  1709 + <name>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ebf;&#x8def;&#x65b9;&#x5411;</name>
  1710 + <type>DBLookup</type>
1572 1711 <description/>
1573 1712 <distribute>Y</distribute>
1574 1713 <custom_distribution/>
... ... @@ -1577,54 +1716,52 @@
1577 1716 <method>none</method>
1578 1717 <schema_name/>
1579 1718 </partitioning>
1580   - <field_to_use>bctype</field_to_use>
1581   - <target_field>bctype_code</target_field>
1582   - <non_match_default>&#x672a;&#x77e5;&#x7c7b;&#x578b;</non_match_default>
1583   - <fields>
1584   - <field>
1585   - <source_value>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</source_value>
1586   - <target_value>normal</target_value>
1587   - </field>
1588   - <field>
1589   - <source_value>&#x51fa;&#x573a;</source_value>
1590   - <target_value>out</target_value>
1591   - </field>
1592   - <field>
1593   - <source_value>&#x8fdb;&#x573a;</source_value>
1594   - <target_value>in</target_value>
1595   - </field>
1596   - <field>
1597   - <source_value>&#x52a0;&#x6cb9;</source_value>
1598   - <target_value>oil</target_value>
1599   - </field>
1600   - <field>
1601   - <source_value>&#x4e34;&#x52a0;</source_value>
1602   - <target_value>temp</target_value>
1603   - </field>
1604   - <field>
1605   - <source_value>&#x533a;&#x95f4;</source_value>
1606   - <target_value>region</target_value>
1607   - </field>
1608   - <field>
1609   - <source_value>&#x653e;&#x7a7a;</source_value>
1610   - <target_value>venting</target_value>
1611   - </field>
1612   - <field>
1613   - <source_value>&#x653e;&#x5927;&#x7ad9;</source_value>
1614   - <target_value>major</target_value>
1615   - </field>
1616   - </fields>
  1719 + <connection>bus_control_variable</connection>
  1720 + <cache>N</cache>
  1721 + <cache_load_all>N</cache_load_all>
  1722 + <cache_size>0</cache_size>
  1723 + <lookup>
  1724 + <schema/>
  1725 + <table>bsth_c_stationroute</table>
  1726 + <orderby/>
  1727 + <fail_on_multiple>N</fail_on_multiple>
  1728 + <eat_row_on_failure>N</eat_row_on_failure>
  1729 + <key>
  1730 + <name>xlid</name>
  1731 + <field>line</field>
  1732 + <condition>&#x3d;</condition>
  1733 + <name2/>
  1734 + </key>
  1735 + <key>
  1736 + <name>startZdtype_calcu</name>
  1737 + <field>station_mark</field>
  1738 + <condition>&#x3d;</condition>
  1739 + <name2/>
  1740 + </key>
  1741 + <key>
  1742 + <name>qdzname_calcu</name>
  1743 + <field>station_name</field>
  1744 + <condition>&#x3d;</condition>
  1745 + <name2/>
  1746 + </key>
  1747 + <value>
  1748 + <name>directions</name>
  1749 + <rename>sxx</rename>
  1750 + <default/>
  1751 + <type>String</type>
  1752 + </value>
  1753 + </lookup>
1617 1754 <cluster_schema/>
1618 1755 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1619   - <xloc>149</xloc>
1620   - <yloc>491</yloc>
  1756 + <xloc>548</xloc>
  1757 + <yloc>610</yloc>
1621 1758 <draw>Y</draw>
1622 1759 </GUI>
1623 1760 </step>
1624 1761  
1625 1762 <step>
1626   - <name>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 2</name>
1627   - <type>ValueMapper</type>
  1763 + <name>&#x67e5;&#x627e;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x5e76;&#x4f5c;&#x4e3a;&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;</name>
  1764 + <type>DBLookup</type>
1628 1765 <description/>
1629 1766 <distribute>Y</distribute>
1630 1767 <custom_distribution/>
... ... @@ -1633,54 +1770,52 @@
1633 1770 <method>none</method>
1634 1771 <schema_name/>
1635 1772 </partitioning>
1636   - <field_to_use>bctype</field_to_use>
1637   - <target_field>bctype_code</target_field>
1638   - <non_match_default>&#x672a;&#x77e5;&#x7c7b;&#x578b;</non_match_default>
1639   - <fields>
1640   - <field>
1641   - <source_value>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</source_value>
1642   - <target_value>normal</target_value>
1643   - </field>
1644   - <field>
1645   - <source_value>&#x51fa;&#x573a;</source_value>
1646   - <target_value>out</target_value>
1647   - </field>
1648   - <field>
1649   - <source_value>&#x8fdb;&#x573a;</source_value>
1650   - <target_value>in</target_value>
1651   - </field>
1652   - <field>
1653   - <source_value>&#x52a0;&#x6cb9;</source_value>
1654   - <target_value>oil</target_value>
1655   - </field>
1656   - <field>
1657   - <source_value>&#x4e34;&#x52a0;</source_value>
1658   - <target_value>temp</target_value>
1659   - </field>
1660   - <field>
1661   - <source_value>&#x533a;&#x95f4;</source_value>
1662   - <target_value>region</target_value>
1663   - </field>
1664   - <field>
1665   - <source_value>&#x653e;&#x7a7a;</source_value>
1666   - <target_value>venting</target_value>
1667   - </field>
1668   - <field>
1669   - <source_value>&#x653e;&#x5927;&#x7ad9;</source_value>
1670   - <target_value>major</target_value>
1671   - </field>
1672   - </fields>
  1773 + <connection>bus_control_variable</connection>
  1774 + <cache>N</cache>
  1775 + <cache_load_all>N</cache_load_all>
  1776 + <cache_size>0</cache_size>
  1777 + <lookup>
  1778 + <schema/>
  1779 + <table>bsth_c_stationroute</table>
  1780 + <orderby/>
  1781 + <fail_on_multiple>N</fail_on_multiple>
  1782 + <eat_row_on_failure>N</eat_row_on_failure>
  1783 + <key>
  1784 + <name>xlid</name>
  1785 + <field>line</field>
  1786 + <condition>&#x3d;</condition>
  1787 + <name2/>
  1788 + </key>
  1789 + <key>
  1790 + <name>endZdtype_calcu</name>
  1791 + <field>station_mark</field>
  1792 + <condition>&#x3d;</condition>
  1793 + <name2/>
  1794 + </key>
  1795 + <key>
  1796 + <name>sxx</name>
  1797 + <field>directions</field>
  1798 + <condition>&#x3d;</condition>
  1799 + <name2/>
  1800 + </key>
  1801 + <value>
  1802 + <name>station</name>
  1803 + <rename>qdzid</rename>
  1804 + <default/>
  1805 + <type>Integer</type>
  1806 + </value>
  1807 + </lookup>
1673 1808 <cluster_schema/>
1674 1809 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1675   - <xloc>333</xloc>
1676   - <yloc>681</yloc>
  1810 + <xloc>550</xloc>
  1811 + <yloc>701</yloc>
1677 1812 <draw>Y</draw>
1678 1813 </GUI>
1679 1814 </step>
1680 1815  
1681 1816 <step>
1682   - <name>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 3</name>
1683   - <type>ValueMapper</type>
  1817 + <name>&#x6b63;&#x5e38;&#x73ed;&#x6b21;_&#x5904;&#x7406;&#x6570;&#x636e;</name>
  1818 + <type>ScriptValueMod</type>
1684 1819 <description/>
1685 1820 <distribute>Y</distribute>
1686 1821 <custom_distribution/>
... ... @@ -1689,54 +1824,34 @@
1689 1824 <method>none</method>
1690 1825 <schema_name/>
1691 1826 </partitioning>
1692   - <field_to_use>bctype</field_to_use>
1693   - <target_field>bctype_code</target_field>
1694   - <non_match_default>&#x672a;&#x77e5;&#x7c7b;&#x578b;</non_match_default>
1695   - <fields>
1696   - <field>
1697   - <source_value>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</source_value>
1698   - <target_value>normal</target_value>
1699   - </field>
1700   - <field>
1701   - <source_value>&#x51fa;&#x573a;</source_value>
1702   - <target_value>out</target_value>
1703   - </field>
1704   - <field>
1705   - <source_value>&#x8fdb;&#x573a;</source_value>
1706   - <target_value>in</target_value>
1707   - </field>
1708   - <field>
1709   - <source_value>&#x52a0;&#x6cb9;</source_value>
1710   - <target_value>oil</target_value>
1711   - </field>
1712   - <field>
1713   - <source_value>&#x4e34;&#x52a0;</source_value>
1714   - <target_value>temp</target_value>
1715   - </field>
1716   - <field>
1717   - <source_value>&#x533a;&#x95f4;</source_value>
1718   - <target_value>region</target_value>
1719   - </field>
1720   - <field>
1721   - <source_value>&#x653e;&#x7a7a;</source_value>
1722   - <target_value>venting</target_value>
1723   - </field>
1724   - <field>
1725   - <source_value>&#x653e;&#x5927;&#x7ad9;</source_value>
1726   - <target_value>major</target_value>
1727   - </field>
1728   - </fields>
1729   - <cluster_schema/>
  1827 + <compatible>N</compatible>
  1828 + <optimizationLevel>9</optimizationLevel>
  1829 + <jsScripts> <jsScript> <jsScript_type>0</jsScript_type>
  1830 + <jsScript_name>Script 1</jsScript_name>
  1831 + <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var sendZdtype &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype &#x3d; &#x27;E&#x27;&#x3b;&#xa;</jsScript_script>
  1832 + </jsScript> </jsScripts> <fields> <field> <name>sendZdtype</name>
  1833 + <rename>sendZdtype</rename>
  1834 + <type>String</type>
  1835 + <length>-1</length>
  1836 + <precision>-1</precision>
  1837 + <replace>N</replace>
  1838 + </field> <field> <name>endZdtype</name>
  1839 + <rename>endZdtype</rename>
  1840 + <type>String</type>
  1841 + <length>-1</length>
  1842 + <precision>-1</precision>
  1843 + <replace>N</replace>
  1844 + </field> </fields> <cluster_schema/>
1730 1845 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1731   - <xloc>548</xloc>
1732   - <yloc>844</yloc>
  1846 + <xloc>588</xloc>
  1847 + <yloc>403</yloc>
1733 1848 <draw>Y</draw>
1734 1849 </GUI>
1735 1850 </step>
1736 1851  
1737 1852 <step>
1738   - <name>&#x7c7b;&#x578b;&#x4fee;&#x6b63;</name>
1739   - <type>SelectValues</type>
  1853 + <name>&#x6b63;&#x5e38;&#x73ed;&#x6b21;&#x6570;&#x636e;</name>
  1854 + <type>Dummy</type>
1740 1855 <description/>
1741 1856 <distribute>Y</distribute>
1742 1857 <custom_distribution/>
... ... @@ -1745,48 +1860,17 @@
1745 1860 <method>none</method>
1746 1861 <schema_name/>
1747 1862 </partitioning>
1748   - <fields> <select_unspecified>N</select_unspecified>
1749   - <meta> <name>jhlc</name>
1750   - <rename>jhlc</rename>
1751   - <type>Number</type>
1752   - <length>-2</length>
1753   - <precision>-2</precision>
1754   - <conversion_mask/>
1755   - <date_format_lenient>false</date_format_lenient>
1756   - <date_format_locale/>
1757   - <date_format_timezone/>
1758   - <lenient_string_to_number>false</lenient_string_to_number>
1759   - <encoding/>
1760   - <decimal_symbol/>
1761   - <grouping_symbol/>
1762   - <currency_symbol/>
1763   - <storage_type/>
1764   - </meta> <meta> <name>bcsj</name>
1765   - <rename>bcsj</rename>
1766   - <type>Integer</type>
1767   - <length>-2</length>
1768   - <precision>-2</precision>
1769   - <conversion_mask/>
1770   - <date_format_lenient>false</date_format_lenient>
1771   - <date_format_locale/>
1772   - <date_format_timezone/>
1773   - <lenient_string_to_number>false</lenient_string_to_number>
1774   - <encoding/>
1775   - <decimal_symbol/>
1776   - <grouping_symbol/>
1777   - <currency_symbol/>
1778   - <storage_type/>
1779   - </meta> </fields> <cluster_schema/>
  1863 + <cluster_schema/>
1780 1864 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1781   - <xloc>146</xloc>
1782   - <yloc>768</yloc>
  1865 + <xloc>725</xloc>
  1866 + <yloc>404</yloc>
1783 1867 <draw>Y</draw>
1784 1868 </GUI>
1785 1869 </step>
1786 1870  
1787 1871 <step>
1788   - <name>&#x8ba1;&#x7b97;&#x73ed;&#x6b21;&#x7c7b;&#x578b;</name>
1789   - <type>ValueMapper</type>
  1872 + <name>&#x6dfb;&#x52a0;&#x53d1;&#x8f66;&#x987a;&#x5e8f;&#x53f7;</name>
  1873 + <type>GroupBy</type>
1790 1874 <description/>
1791 1875 <distribute>Y</distribute>
1792 1876 <custom_distribution/>
... ... @@ -1795,30 +1879,32 @@
1795 1879 <method>none</method>
1796 1880 <schema_name/>
1797 1881 </partitioning>
1798   - <field_to_use>qdzname</field_to_use>
1799   - <target_field>bctype</target_field>
1800   - <non_match_default>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</non_match_default>
1801   - <fields>
1802   - <field>
1803   - <source_value>&#x51fa;&#x573a;</source_value>
1804   - <target_value>&#x51fa;&#x573a;</target_value>
1805   - </field>
1806   - <field>
1807   - <source_value>&#x8fdb;&#x573a;</source_value>
1808   - <target_value>&#x8fdb;&#x573a;</target_value>
1809   - </field>
1810   - </fields>
  1882 + <all_rows>Y</all_rows>
  1883 + <ignore_aggregate>N</ignore_aggregate>
  1884 + <field_ignore/>
  1885 + <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
  1886 + <prefix>grp</prefix>
  1887 + <add_linenr>Y</add_linenr>
  1888 + <linenr_fieldname>fcno</linenr_fieldname>
  1889 + <give_back_row>N</give_back_row>
  1890 + <group>
  1891 + <field>
  1892 + <name>lp</name>
  1893 + </field>
  1894 + </group>
  1895 + <fields>
  1896 + </fields>
1811 1897 <cluster_schema/>
1812 1898 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1813   - <xloc>1014</xloc>
1814   - <yloc>401</yloc>
  1899 + <xloc>442</xloc>
  1900 + <yloc>44</yloc>
1815 1901 <draw>Y</draw>
1816 1902 </GUI>
1817 1903 </step>
1818 1904  
1819 1905 <step>
1820   - <name>&#x8bb0;&#x5f55;&#x5173;&#x8054; &#x28;&#x7b1b;&#x5361;&#x5c14;&#x8f93;&#x51fa;&#x29;</name>
1821   - <type>JoinRows</type>
  1906 + <name>&#x6dfb;&#x52a0;&#x5bf9;&#x5e94;&#x73ed;&#x6b21;&#x6570;</name>
  1907 + <type>GroupBy</type>
1822 1908 <description/>
1823 1909 <distribute>Y</distribute>
1824 1910 <custom_distribution/>
... ... @@ -1827,29 +1913,29 @@
1827 1913 <method>none</method>
1828 1914 <schema_name/>
1829 1915 </partitioning>
  1916 + <all_rows>Y</all_rows>
  1917 + <ignore_aggregate>N</ignore_aggregate>
  1918 + <field_ignore/>
1830 1919 <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
1831   - <prefix>out</prefix>
1832   - <cache_size>500</cache_size>
1833   - <main/>
1834   - <compare>
1835   -<condition>
1836   - <negated>N</negated>
1837   - <leftvalue/>
1838   - <function>&#x3d;</function>
1839   - <rightvalue/>
1840   - </condition>
1841   - </compare>
  1920 + <prefix>grp</prefix>
  1921 + <add_linenr>Y</add_linenr>
  1922 + <linenr_fieldname>bcs</linenr_fieldname>
  1923 + <give_back_row>N</give_back_row>
  1924 + <group>
  1925 + </group>
  1926 + <fields>
  1927 + </fields>
1842 1928 <cluster_schema/>
1843 1929 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1844   - <xloc>310</xloc>
1845   - <yloc>133</yloc>
  1930 + <xloc>692</xloc>
  1931 + <yloc>44</yloc>
1846 1932 <draw>Y</draw>
1847 1933 </GUI>
1848 1934 </step>
1849 1935  
1850 1936 <step>
1851   - <name>&#x8fc7;&#x6ee4;&#x8bb0;&#x5f55;&#xff08;&#x53d1;&#x8f66;&#x65f6;&#x95f4;&#x4e3a;&#x7a7a;&#xff09;</name>
1852   - <type>FilterRows</type>
  1937 + <name>&#x73ed;&#x6b21;&#x6570;&#x636e;&#x8303;&#x5f0f;&#x5316;</name>
  1938 + <type>Normaliser</type>
1853 1939 <description/>
1854 1940 <distribute>Y</distribute>
1855 1941 <custom_distribution/>
... ... @@ -1858,27 +1944,18 @@
1858 1944 <method>none</method>
1859 1945 <schema_name/>
1860 1946 </partitioning>
1861   -<send_true_to/>
1862   -<send_false_to/>
1863   - <compare>
1864   -<condition>
1865   - <negated>N</negated>
1866   - <leftvalue>sendtime</leftvalue>
1867   - <function>IS NOT NULL</function>
1868   - <rightvalue/>
1869   - </condition>
1870   - </compare>
1871   - <cluster_schema/>
  1947 + <typefield>&#x7ad9;&#x70b9;&#x540d;&#x79f0;</typefield>
  1948 + <fields> </fields> <cluster_schema/>
1872 1949 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1873   - <xloc>571</xloc>
  1950 + <xloc>248</xloc>
1874 1951 <yloc>44</yloc>
1875 1952 <draw>Y</draw>
1876 1953 </GUI>
1877 1954 </step>
1878 1955  
1879 1956 <step>
1880   - <name>&#x8fdb;&#x573a;&#x73ed;&#x6b21;_&#x786e;&#x5b9a;&#x8d77;&#x70b9;&#x7ad9;&#x540d;&#x5b57;</name>
1881   - <type>ScriptValueMod</type>
  1957 + <name>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178;</name>
  1958 + <type>ValueMapper</type>
1882 1959 <description/>
1883 1960 <distribute>Y</distribute>
1884 1961 <custom_distribution/>
... ... @@ -1887,40 +1964,54 @@
1887 1964 <method>none</method>
1888 1965 <schema_name/>
1889 1966 </partitioning>
1890   - <compatible>N</compatible>
1891   - <optimizationLevel>9</optimizationLevel>
1892   - <jsScripts> <jsScript> <jsScript_type>0</jsScript_type>
1893   - <jsScript_name>Script 1</jsScript_name>
1894   - <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var qdzname_calcu &#x3d; cc_groups&#x5b;gno - 2&#x5d;&#x3b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#x662f;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x8fd9;&#x91cc;&#x53ea;&#x6709;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#xff0c;&#x8fd8;&#x9700;&#x8981;&#x8ba1;&#x7b97;&#xa;var startZdtype_calcu &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype_calcu &#x3d; &#x27;E&#x27;&#x3b;</jsScript_script>
1895   - </jsScript> </jsScripts> <fields> <field> <name>qdzname_calcu</name>
1896   - <rename>qdzname_calcu</rename>
1897   - <type>String</type>
1898   - <length>-1</length>
1899   - <precision>-1</precision>
1900   - <replace>N</replace>
1901   - </field> <field> <name>startZdtype_calcu</name>
1902   - <rename>startZdtype_calcu</rename>
1903   - <type>String</type>
1904   - <length>-1</length>
1905   - <precision>-1</precision>
1906   - <replace>N</replace>
1907   - </field> <field> <name>endZdtype_calcu</name>
1908   - <rename>endZdtype_calcu</rename>
1909   - <type>String</type>
1910   - <length>-1</length>
1911   - <precision>-1</precision>
1912   - <replace>N</replace>
1913   - </field> </fields> <cluster_schema/>
  1967 + <field_to_use>bctype</field_to_use>
  1968 + <target_field>bctype_code</target_field>
  1969 + <non_match_default>&#x672a;&#x77e5;&#x7c7b;&#x578b;</non_match_default>
  1970 + <fields>
  1971 + <field>
  1972 + <source_value>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</source_value>
  1973 + <target_value>normal</target_value>
  1974 + </field>
  1975 + <field>
  1976 + <source_value>&#x51fa;&#x573a;</source_value>
  1977 + <target_value>out</target_value>
  1978 + </field>
  1979 + <field>
  1980 + <source_value>&#x8fdb;&#x573a;</source_value>
  1981 + <target_value>in</target_value>
  1982 + </field>
  1983 + <field>
  1984 + <source_value>&#x52a0;&#x6cb9;</source_value>
  1985 + <target_value>oil</target_value>
  1986 + </field>
  1987 + <field>
  1988 + <source_value>&#x4e34;&#x52a0;</source_value>
  1989 + <target_value>temp</target_value>
  1990 + </field>
  1991 + <field>
  1992 + <source_value>&#x533a;&#x95f4;</source_value>
  1993 + <target_value>region</target_value>
  1994 + </field>
  1995 + <field>
  1996 + <source_value>&#x653e;&#x7a7a;</source_value>
  1997 + <target_value>venting</target_value>
  1998 + </field>
  1999 + <field>
  2000 + <source_value>&#x653e;&#x5927;&#x7ad9;</source_value>
  2001 + <target_value>major</target_value>
  2002 + </field>
  2003 + </fields>
  2004 + <cluster_schema/>
1914 2005 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1915   - <xloc>754</xloc>
1916   - <yloc>610</yloc>
  2006 + <xloc>149</xloc>
  2007 + <yloc>491</yloc>
1917 2008 <draw>Y</draw>
1918 2009 </GUI>
1919 2010 </step>
1920 2011  
1921 2012 <step>
1922   - <name>&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</name>
1923   - <type>Dummy</type>
  2013 + <name>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 2</name>
  2014 + <type>ValueMapper</type>
1924 2015 <description/>
1925 2016 <distribute>Y</distribute>
1926 2017 <custom_distribution/>
... ... @@ -1929,17 +2020,54 @@
1929 2020 <method>none</method>
1930 2021 <schema_name/>
1931 2022 </partitioning>
  2023 + <field_to_use>bctype</field_to_use>
  2024 + <target_field>bctype_code</target_field>
  2025 + <non_match_default>&#x672a;&#x77e5;&#x7c7b;&#x578b;</non_match_default>
  2026 + <fields>
  2027 + <field>
  2028 + <source_value>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</source_value>
  2029 + <target_value>normal</target_value>
  2030 + </field>
  2031 + <field>
  2032 + <source_value>&#x51fa;&#x573a;</source_value>
  2033 + <target_value>out</target_value>
  2034 + </field>
  2035 + <field>
  2036 + <source_value>&#x8fdb;&#x573a;</source_value>
  2037 + <target_value>in</target_value>
  2038 + </field>
  2039 + <field>
  2040 + <source_value>&#x52a0;&#x6cb9;</source_value>
  2041 + <target_value>oil</target_value>
  2042 + </field>
  2043 + <field>
  2044 + <source_value>&#x4e34;&#x52a0;</source_value>
  2045 + <target_value>temp</target_value>
  2046 + </field>
  2047 + <field>
  2048 + <source_value>&#x533a;&#x95f4;</source_value>
  2049 + <target_value>region</target_value>
  2050 + </field>
  2051 + <field>
  2052 + <source_value>&#x653e;&#x7a7a;</source_value>
  2053 + <target_value>venting</target_value>
  2054 + </field>
  2055 + <field>
  2056 + <source_value>&#x653e;&#x5927;&#x7ad9;</source_value>
  2057 + <target_value>major</target_value>
  2058 + </field>
  2059 + </fields>
1932 2060 <cluster_schema/>
1933 2061 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
1934   - <xloc>997</xloc>
1935   - <yloc>606</yloc>
  2062 + <xloc>333</xloc>
  2063 + <yloc>681</yloc>
1936 2064 <draw>Y</draw>
1937 2065 </GUI>
1938 2066 </step>
1939 2067  
1940 2068 <step>
1941   - <name>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail</name>
1942   - <type>InsertUpdate</type>
  2069 + <name>&#x73ed;&#x6b21;&#x7c7b;&#x578b;&#x5b57;&#x5178; 3</name>
  2070 + <type>ValueMapper</type>
1943 2071 <description/>
1944 2072 <distribute>Y</distribute>
1945 2073 <custom_distribution/>
... ... @@ -1948,114 +2076,136 @@
1948 2076 <method>none</method>
1949 2077 <schema_name/>
1950 2078 </partitioning>
1951   - <connection>bus_control_variable</connection>
1952   - <commit>100</commit>
1953   - <update_bypassed>N</update_bypassed>
1954   - <lookup>
1955   - <schema/>
1956   - <table>bsth_c_s_ttinfo_detail</table>
1957   - <key>
1958   - <name>xlid</name>
1959   - <field>xl</field>
1960   - <condition>&#x3d;</condition>
1961   - <name2/>
1962   - </key>
1963   - <key>
1964   - <name>ttid</name>
1965   - <field>ttinfo</field>
1966   - <condition>&#x3d;</condition>
1967   - <name2/>
1968   - </key>
1969   - <key>
1970   - <name>lpid</name>
1971   - <field>lp</field>
1972   - <condition>&#x3d;</condition>
1973   - <name2/>
1974   - </key>
1975   - <key>
1976   - <name>fcno</name>
1977   - <field>fcno</field>
1978   - <condition>&#x3d;</condition>
1979   - <name2/>
1980   - </key>
1981   - <key>
1982   - <name>bcs</name>
1983   - <field>bcs</field>
1984   - <condition>&#x3d;</condition>
1985   - <name2/>
1986   - </key>
1987   - <value>
1988   - <name>lp</name>
1989   - <rename>lpid</rename>
1990   - <update>Y</update>
1991   - </value>
1992   - <value>
1993   - <name>bc_type</name>
1994   - <rename>bctype_code</rename>
1995   - <update>Y</update>
1996   - </value>
1997   - <value>
1998   - <name>bcs</name>
1999   - <rename>bcs</rename>
2000   - <update>Y</update>
2001   - </value>
2002   - <value>
2003   - <name>bcsj</name>
2004   - <rename>bcsj</rename>
2005   - <update>Y</update>
2006   - </value>
2007   - <value>
2008   - <name>fcno</name>
2009   - <rename>fcno</rename>
2010   - <update>Y</update>
2011   - </value>
2012   - <value>
2013   - <name>jhlc</name>
  2079 + <field_to_use>bctype</field_to_use>
  2080 + <target_field>bctype_code</target_field>
  2081 + <non_match_default>&#x672a;&#x77e5;&#x7c7b;&#x578b;</non_match_default>
  2082 + <fields>
  2083 + <field>
  2084 + <source_value>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</source_value>
  2085 + <target_value>normal</target_value>
  2086 + </field>
  2087 + <field>
  2088 + <source_value>&#x51fa;&#x573a;</source_value>
  2089 + <target_value>out</target_value>
  2090 + </field>
  2091 + <field>
  2092 + <source_value>&#x8fdb;&#x573a;</source_value>
  2093 + <target_value>in</target_value>
  2094 + </field>
  2095 + <field>
  2096 + <source_value>&#x52a0;&#x6cb9;</source_value>
  2097 + <target_value>oil</target_value>
  2098 + </field>
  2099 + <field>
  2100 + <source_value>&#x4e34;&#x52a0;</source_value>
  2101 + <target_value>temp</target_value>
  2102 + </field>
  2103 + <field>
  2104 + <source_value>&#x533a;&#x95f4;</source_value>
  2105 + <target_value>region</target_value>
  2106 + </field>
  2107 + <field>
  2108 + <source_value>&#x653e;&#x7a7a;</source_value>
  2109 + <target_value>venting</target_value>
  2110 + </field>
  2111 + <field>
  2112 + <source_value>&#x653e;&#x5927;&#x7ad9;</source_value>
  2113 + <target_value>major</target_value>
  2114 + </field>
  2115 + </fields>
  2116 + <cluster_schema/>
  2117 + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
  2118 + <xloc>548</xloc>
  2119 + <yloc>844</yloc>
  2120 + <draw>Y</draw>
  2121 + </GUI>
  2122 + </step>
  2123 +
  2124 + <step>
  2125 + <name>&#x7c7b;&#x578b;&#x4fee;&#x6b63;</name>
  2126 + <type>SelectValues</type>
  2127 + <description/>
  2128 + <distribute>Y</distribute>
  2129 + <custom_distribution/>
  2130 + <copies>1</copies>
  2131 + <partitioning>
  2132 + <method>none</method>
  2133 + <schema_name/>
  2134 + </partitioning>
  2135 + <fields> <select_unspecified>N</select_unspecified>
  2136 + <meta> <name>jhlc</name>
2014 2137 <rename>jhlc</rename>
2015   - <update>Y</update>
2016   - </value>
2017   - <value>
2018   - <name>fcsj</name>
2019   - <rename>sendtime</rename>
2020   - <update>Y</update>
2021   - </value>
2022   - <value>
2023   - <name>ttinfo</name>
2024   - <rename>ttid</rename>
2025   - <update>Y</update>
2026   - </value>
2027   - <value>
2028   - <name>xl</name>
2029   - <rename>xlid</rename>
2030   - <update>Y</update>
2031   - </value>
2032   - <value>
2033   - <name>qdz</name>
2034   - <rename>qdzid</rename>
2035   - <update>Y</update>
2036   - </value>
2037   - <value>
2038   - <name>zdz</name>
2039   - <rename>zdzid</rename>
2040   - <update>Y</update>
2041   - </value>
2042   - <value>
2043   - <name>xl_dir</name>
2044   - <rename>sxx</rename>
2045   - <update>Y</update>
2046   - </value>
2047   - </lookup>
  2138 + <type>Number</type>
  2139 + <length>-2</length>
  2140 + <precision>-2</precision>
  2141 + <conversion_mask/>
  2142 + <date_format_lenient>false</date_format_lenient>
  2143 + <date_format_locale/>
  2144 + <date_format_timezone/>
  2145 + <lenient_string_to_number>false</lenient_string_to_number>
  2146 + <encoding/>
  2147 + <decimal_symbol/>
  2148 + <grouping_symbol/>
  2149 + <currency_symbol/>
  2150 + <storage_type/>
  2151 + </meta> <meta> <name>bcsj</name>
  2152 + <rename>bcsj</rename>
  2153 + <type>Integer</type>
  2154 + <length>-2</length>
  2155 + <precision>-2</precision>
  2156 + <conversion_mask/>
  2157 + <date_format_lenient>false</date_format_lenient>
  2158 + <date_format_locale/>
  2159 + <date_format_timezone/>
  2160 + <lenient_string_to_number>false</lenient_string_to_number>
  2161 + <encoding/>
  2162 + <decimal_symbol/>
  2163 + <grouping_symbol/>
  2164 + <currency_symbol/>
  2165 + <storage_type/>
  2166 + </meta> </fields> <cluster_schema/>
  2167 + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
  2168 + <xloc>146</xloc>
  2169 + <yloc>768</yloc>
  2170 + <draw>Y</draw>
  2171 + </GUI>
  2172 + </step>
  2173 +
  2174 + <step>
  2175 + <name>&#x8ba1;&#x7b97;&#x73ed;&#x6b21;&#x7c7b;&#x578b;</name>
  2176 + <type>ValueMapper</type>
  2177 + <description/>
  2178 + <distribute>Y</distribute>
  2179 + <custom_distribution/>
  2180 + <copies>1</copies>
  2181 + <partitioning>
  2182 + <method>none</method>
  2183 + <schema_name/>
  2184 + </partitioning>
  2185 + <field_to_use>qdzname</field_to_use>
  2186 + <target_field>bctype</target_field>
  2187 + <non_match_default>&#x6b63;&#x5e38;&#x73ed;&#x6b21;</non_match_default>
  2188 + <fields>
  2189 + <field>
  2190 + <source_value>&#x51fa;&#x573a;</source_value>
  2191 + <target_value>&#x51fa;&#x573a;</target_value>
  2192 + </field>
  2193 + <field>
  2194 + <source_value>&#x8fdb;&#x573a;</source_value>
  2195 + <target_value>&#x8fdb;&#x573a;</target_value>
  2196 + </field>
  2197 + </fields>
2048 2198 <cluster_schema/>
2049 2199 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
2050   - <xloc>143</xloc>
2051   - <yloc>860</yloc>
  2200 + <xloc>1014</xloc>
  2201 + <yloc>401</yloc>
2052 2202 <draw>Y</draw>
2053 2203 </GUI>
2054 2204 </step>
2055 2205  
2056 2206 <step>
2057   - <name>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 2</name>
2058   - <type>InsertUpdate</type>
  2207 + <name>&#x8bb0;&#x5f55;&#x5173;&#x8054; &#x28;&#x7b1b;&#x5361;&#x5c14;&#x8f93;&#x51fa;&#x29;</name>
  2208 + <type>JoinRows</type>
2059 2209 <description/>
2060 2210 <distribute>Y</distribute>
2061 2211 <custom_distribution/>
... ... @@ -2064,114 +2214,29 @@
2064 2214 <method>none</method>
2065 2215 <schema_name/>
2066 2216 </partitioning>
2067   - <connection>bus_control_variable</connection>
2068   - <commit>100</commit>
2069   - <update_bypassed>N</update_bypassed>
2070   - <lookup>
2071   - <schema/>
2072   - <table>bsth_c_s_ttinfo_detail</table>
2073   - <key>
2074   - <name>xlid</name>
2075   - <field>xl</field>
2076   - <condition>&#x3d;</condition>
2077   - <name2/>
2078   - </key>
2079   - <key>
2080   - <name>ttid</name>
2081   - <field>ttinfo</field>
2082   - <condition>&#x3d;</condition>
2083   - <name2/>
2084   - </key>
2085   - <key>
2086   - <name>lpid</name>
2087   - <field>lp</field>
2088   - <condition>&#x3d;</condition>
2089   - <name2/>
2090   - </key>
2091   - <key>
2092   - <name>fcno</name>
2093   - <field>fcno</field>
2094   - <condition>&#x3d;</condition>
2095   - <name2/>
2096   - </key>
2097   - <key>
2098   - <name>bcs</name>
2099   - <field>bcs</field>
2100   - <condition>&#x3d;</condition>
2101   - <name2/>
2102   - </key>
2103   - <value>
2104   - <name>tcc</name>
2105   - <rename>qdzid</rename>
2106   - <update>Y</update>
2107   - </value>
2108   - <value>
2109   - <name>zdz</name>
2110   - <rename>zdzid</rename>
2111   - <update>Y</update>
2112   - </value>
2113   - <value>
2114   - <name>xl</name>
2115   - <rename>xlid</rename>
2116   - <update>Y</update>
2117   - </value>
2118   - <value>
2119   - <name>ttinfo</name>
2120   - <rename>ttid</rename>
2121   - <update>Y</update>
2122   - </value>
2123   - <value>
2124   - <name>xl_dir</name>
2125   - <rename>sxx</rename>
2126   - <update>Y</update>
2127   - </value>
2128   - <value>
2129   - <name>lp</name>
2130   - <rename>lpid</rename>
2131   - <update>Y</update>
2132   - </value>
2133   - <value>
2134   - <name>jhlc</name>
2135   - <rename>out_mileage</rename>
2136   - <update>Y</update>
2137   - </value>
2138   - <value>
2139   - <name>fcsj</name>
2140   - <rename>sendtime</rename>
2141   - <update>Y</update>
2142   - </value>
2143   - <value>
2144   - <name>bcsj</name>
2145   - <rename>out_time</rename>
2146   - <update>Y</update>
2147   - </value>
2148   - <value>
2149   - <name>bcs</name>
2150   - <rename>bcs</rename>
2151   - <update>Y</update>
2152   - </value>
2153   - <value>
2154   - <name>fcno</name>
2155   - <rename>fcno</rename>
2156   - <update>Y</update>
2157   - </value>
2158   - <value>
2159   - <name>bc_type</name>
2160   - <rename>bctype_code</rename>
2161   - <update>Y</update>
2162   - </value>
2163   - </lookup>
  2217 + <directory>&#x25;&#x25;java.io.tmpdir&#x25;&#x25;</directory>
  2218 + <prefix>out</prefix>
  2219 + <cache_size>500</cache_size>
  2220 + <main/>
  2221 + <compare>
  2222 +<condition>
  2223 + <negated>N</negated>
  2224 + <leftvalue/>
  2225 + <function>&#x3d;</function>
  2226 + <rightvalue/>
  2227 + </condition>
  2228 + </compare>
2164 2229 <cluster_schema/>
2165 2230 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
2166   - <xloc>340</xloc>
2167   - <yloc>890</yloc>
  2231 + <xloc>310</xloc>
  2232 + <yloc>133</yloc>
2168 2233 <draw>Y</draw>
2169 2234 </GUI>
2170 2235 </step>
2171 2236  
2172 2237 <step>
2173   - <name>&#x63d2;&#x5165;&#x2f;&#x66f4;&#x65b0;bsth_c_s_ttinfo_detail 3</name>
2174   - <type>InsertUpdate</type>
  2238 + <name>&#x8fc7;&#x6ee4;&#x8bb0;&#x5f55;&#xff08;&#x53d1;&#x8f66;&#x65f6;&#x95f4;&#x4e3a;&#x7a7a;&#xff09;</name>
  2239 + <type>FilterRows</type>
2175 2240 <description/>
2176 2241 <distribute>Y</distribute>
2177 2242 <custom_distribution/>
... ... @@ -2180,107 +2245,81 @@
2180 2245 <method>none</method>
2181 2246 <schema_name/>
2182 2247 </partitioning>
2183   - <connection>bus_control_variable</connection>
2184   - <commit>100</commit>
2185   - <update_bypassed>N</update_bypassed>
2186   - <lookup>
2187   - <schema/>
2188   - <table>bsth_c_s_ttinfo_detail</table>
2189   - <key>
2190   - <name>xlid</name>
2191   - <field>xl</field>
2192   - <condition>&#x3d;</condition>
2193   - <name2/>
2194   - </key>
2195   - <key>
2196   - <name>ttid</name>
2197   - <field>ttinfo</field>
2198   - <condition>&#x3d;</condition>
2199   - <name2/>
2200   - </key>
2201   - <key>
2202   - <name>lpid</name>
2203   - <field>lp</field>
2204   - <condition>&#x3d;</condition>
2205   - <name2/>
2206   - </key>
2207   - <key>
2208   - <name>fcno</name>
2209   - <field>fcno</field>
2210   - <condition>&#x3d;</condition>
2211   - <name2/>
2212   - </key>
2213   - <key>
2214   - <name>bcs</name>
2215   - <field>bcs</field>
2216   - <condition>&#x3d;</condition>
2217   - <name2/>
2218   - </key>
2219   - <value>
2220   - <name>fcno</name>
2221   - <rename>fcno</rename>
2222   - <update>Y</update>
2223   - </value>
2224   - <value>
2225   - <name>bcs</name>
2226   - <rename>bcs</rename>
2227   - <update>Y</update>
2228   - </value>
2229   - <value>
2230   - <name>xl</name>
2231   - <rename>xlid</rename>
2232   - <update>Y</update>
2233   - </value>
2234   - <value>
2235   - <name>ttinfo</name>
2236   - <rename>ttid</rename>
2237   - <update>Y</update>
2238   - </value>
2239   - <value>
2240   - <name>lp</name>
2241   - <rename>lpid</rename>
2242   - <update>Y</update>
2243   - </value>
2244   - <value>
2245   - <name>bc_type</name>
2246   - <rename>bctype_code</rename>
2247   - <update>Y</update>
2248   - </value>
2249   - <value>
2250   - <name>bcsj</name>
2251   - <rename>parade_time</rename>
2252   - <update>Y</update>
2253   - </value>
2254   - <value>
2255   - <name>jhlc</name>
2256   - <rename>parade_mileage</rename>
2257   - <update>Y</update>
2258   - </value>
2259   - <value>
2260   - <name>fcsj</name>
2261   - <rename>sendtime</rename>
2262   - <update>Y</update>
2263   - </value>
2264   - <value>
2265   - <name>xl_dir</name>
2266   - <rename>sxx</rename>
2267   - <update>Y</update>
2268   - </value>
2269   - <value>
2270   - <name>qdz</name>
2271   - <rename>qdzid</rename>
2272   - <update>Y</update>
2273   - </value>
2274   - <value>
2275   - <name>tcc</name>
2276   - <rename>zdzid</rename>
2277   - <update>Y</update>
2278   - </value>
2279   - </lookup>
  2248 +<send_true_to/>
  2249 +<send_false_to/>
  2250 + <compare>
  2251 +<condition>
  2252 + <negated>N</negated>
  2253 + <leftvalue>sendtime</leftvalue>
  2254 + <function>IS NOT NULL</function>
  2255 + <rightvalue/>
  2256 + </condition>
  2257 + </compare>
2280 2258 <cluster_schema/>
2281 2259 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
2282   - <xloc>770</xloc>
2283   - <yloc>923</yloc>
  2260 + <xloc>571</xloc>
  2261 + <yloc>44</yloc>
  2262 + <draw>Y</draw>
  2263 + </GUI>
  2264 + </step>
  2265 +
  2266 + <step>
  2267 + <name>&#x8fdb;&#x573a;&#x73ed;&#x6b21;_&#x786e;&#x5b9a;&#x8d77;&#x70b9;&#x7ad9;&#x540d;&#x5b57;</name>
  2268 + <type>ScriptValueMod</type>
  2269 + <description/>
  2270 + <distribute>Y</distribute>
  2271 + <custom_distribution/>
  2272 + <copies>1</copies>
  2273 + <partitioning>
  2274 + <method>none</method>
  2275 + <schema_name/>
  2276 + </partitioning>
  2277 + <compatible>N</compatible>
  2278 + <optimizationLevel>9</optimizationLevel>
  2279 + <jsScripts> <jsScript> <jsScript_type>0</jsScript_type>
  2280 + <jsScript_name>Script 1</jsScript_name>
  2281 + <jsScript_script>&#x2f;&#x2f;Script here&#xa;&#xa;&#x2f;&#x2f; &#x6dfb;&#x52a0;&#x7ad9;&#x70b9;&#x6807;&#x8bc6;&#xa;var cc_groups &#x3d; qdzgroups.split&#x28;&#x22;,&#x22;&#x29;&#x3b; &#x2f;&#x2f; &#x6240;&#x6709;&#x73ed;&#x6b21;&#x8d77;&#x70b9;&#x7ad9;&#x6570;&#x7ec4;&#xa;var qdzname_calcu &#x3d; cc_groups&#x5b;gno - 2&#x5d;&#x3b; &#x2f;&#x2f; &#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#x662f;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x7ec8;&#x70b9;&#x7ad9;&#xff0c;&#x8fd9;&#x91cc;&#x53ea;&#x6709;&#x4e0a;&#x4e00;&#x4e2a;&#x73ed;&#x6b21;&#x7684;&#x8d77;&#x70b9;&#x7ad9;&#xff0c;&#x8fd8;&#x9700;&#x8981;&#x8ba1;&#x7b97;&#xa;var startZdtype_calcu &#x3d; &#x27;B&#x27;&#x3b;&#xa;var endZdtype_calcu &#x3d; &#x27;E&#x27;&#x3b;</jsScript_script>
  2282 + </jsScript> </jsScripts> <fields> <field> <name>qdzname_calcu</name>
  2283 + <rename>qdzname_calcu</rename>
  2284 + <type>String</type>
  2285 + <length>-1</length>
  2286 + <precision>-1</precision>
  2287 + <replace>N</replace>
  2288 + </field> <field> <name>startZdtype_calcu</name>
  2289 + <rename>startZdtype_calcu</rename>
  2290 + <type>String</type>
  2291 + <length>-1</length>
  2292 + <precision>-1</precision>
  2293 + <replace>N</replace>
  2294 + </field> <field> <name>endZdtype_calcu</name>
  2295 + <rename>endZdtype_calcu</rename>
  2296 + <type>String</type>
  2297 + <length>-1</length>
  2298 + <precision>-1</precision>
  2299 + <replace>N</replace>
  2300 + </field> </fields> <cluster_schema/>
  2301 + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
  2302 + <xloc>754</xloc>
  2303 + <yloc>610</yloc>
  2304 + <draw>Y</draw>
  2305 + </GUI>
  2306 + </step>
  2307 +
  2308 + <step>
  2309 + <name>&#x8fdb;&#x573a;&#x73ed;&#x6b21;&#x6570;&#x636e;</name>
  2310 + <type>Dummy</type>
  2311 + <description/>
  2312 + <distribute>Y</distribute>
  2313 + <custom_distribution/>
  2314 + <copies>1</copies>
  2315 + <partitioning>
  2316 + <method>none</method>
  2317 + <schema_name/>
  2318 + </partitioning>
  2319 + <cluster_schema/>
  2320 + <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
  2321 + <xloc>997</xloc>
  2322 + <yloc>606</yloc>
2284 2323 <draw>Y</draw>
2285 2324 </GUI>
2286 2325 </step>
... ...
src/main/resources/datatools/ktrs/ttinfodetailoutputforedit.ktr
  View file @a76978b
... ... @@ -309,8 +309,8 @@
309 309 <fields>
310 310 <field>
311 311 <name>lp</name>
312   - <type>Integer</type>
313   - <format>0</format>
  312 + <type>String</type>
  313 + <format/>
314 314 </field>
315 315 <field>
316 316 <name>fcno1_id</name>
... ... @@ -333,6 +333,16 @@
333 333 <format/>
334 334 </field>
335 335 <field>
  336 + <name>fcno1_xldir</name>
  337 + <type>String</type>
  338 + <format/>
  339 + </field>
  340 + <field>
  341 + <name>fcno1_isfb</name>
  342 + <type>String</type>
  343 + <format/>
  344 + </field>
  345 + <field>
336 346 <name>fcno2_id</name>
337 347 <type>String</type>
338 348 <format/>
... ... @@ -353,6 +363,16 @@
353 363 <format/>
354 364 </field>
355 365 <field>
  366 + <name>fcno2_xldir</name>
  367 + <type>String</type>
  368 + <format/>
  369 + </field>
  370 + <field>
  371 + <name>fcno2_isfb</name>
  372 + <type>String</type>
  373 + <format/>
  374 + </field>
  375 + <field>
356 376 <name>fcno3_id</name>
357 377 <type>String</type>
358 378 <format/>
... ... @@ -373,6 +393,16 @@
373 393 <format/>
374 394 </field>
375 395 <field>
  396 + <name>fcno3_xldir</name>
  397 + <type>String</type>
  398 + <format/>
  399 + </field>
  400 + <field>
  401 + <name>fcno3_isfb</name>
  402 + <type>String</type>
  403 + <format/>
  404 + </field>
  405 + <field>
376 406 <name>fcno4_id</name>
377 407 <type>String</type>
378 408 <format/>
... ... @@ -393,6 +423,16 @@
393 423 <format/>
394 424 </field>
395 425 <field>
  426 + <name>fcno4_xldir</name>
  427 + <type>String</type>
  428 + <format/>
  429 + </field>
  430 + <field>
  431 + <name>fcno4_isfb</name>
  432 + <type>String</type>
  433 + <format/>
  434 + </field>
  435 + <field>
396 436 <name>fcno5_id</name>
397 437 <type>String</type>
398 438 <format/>
... ... @@ -413,6 +453,16 @@
413 453 <format/>
414 454 </field>
415 455 <field>
  456 + <name>fcno5_xldir</name>
  457 + <type>String</type>
  458 + <format/>
  459 + </field>
  460 + <field>
  461 + <name>fcno5_isfb</name>
  462 + <type>String</type>
  463 + <format/>
  464 + </field>
  465 + <field>
416 466 <name>fcno6_id</name>
417 467 <type>String</type>
418 468 <format/>
... ... @@ -433,6 +483,16 @@
433 483 <format/>
434 484 </field>
435 485 <field>
  486 + <name>fcno6_xldir</name>
  487 + <type>String</type>
  488 + <format/>
  489 + </field>
  490 + <field>
  491 + <name>fcno6_isfb</name>
  492 + <type>String</type>
  493 + <format/>
  494 + </field>
  495 + <field>
436 496 <name>fcno7_id</name>
437 497 <type>String</type>
438 498 <format/>
... ... @@ -453,6 +513,16 @@
453 513 <format/>
454 514 </field>
455 515 <field>
  516 + <name>fcno7_xldir</name>
  517 + <type>String</type>
  518 + <format/>
  519 + </field>
  520 + <field>
  521 + <name>fcno7_isfb</name>
  522 + <type>String</type>
  523 + <format/>
  524 + </field>
  525 + <field>
456 526 <name>fcno8_id</name>
457 527 <type>String</type>
458 528 <format/>
... ... @@ -473,6 +543,16 @@
473 543 <format/>
474 544 </field>
475 545 <field>
  546 + <name>fcno8_xldir</name>
  547 + <type>String</type>
  548 + <format/>
  549 + </field>
  550 + <field>
  551 + <name>fcno8_isfb</name>
  552 + <type>String</type>
  553 + <format/>
  554 + </field>
  555 + <field>
476 556 <name>fcno9_id</name>
477 557 <type>String</type>
478 558 <format/>
... ... @@ -493,6 +573,16 @@
493 573 <format/>
494 574 </field>
495 575 <field>
  576 + <name>fcno9_xldir</name>
  577 + <type>String</type>
  578 + <format/>
  579 + </field>
  580 + <field>
  581 + <name>fcno9_isfb</name>
  582 + <type>String</type>
  583 + <format/>
  584 + </field>
  585 + <field>
496 586 <name>fcno10_id</name>
497 587 <type>String</type>
498 588 <format/>
... ... @@ -513,6 +603,16 @@
513 603 <format/>
514 604 </field>
515 605 <field>
  606 + <name>fcno10_xldir</name>
  607 + <type>String</type>
  608 + <format/>
  609 + </field>
  610 + <field>
  611 + <name>fcno10_isfb</name>
  612 + <type>String</type>
  613 + <format/>
  614 + </field>
  615 + <field>
516 616 <name>fcno11_id</name>
517 617 <type>String</type>
518 618 <format/>
... ... @@ -533,6 +633,16 @@
533 633 <format/>
534 634 </field>
535 635 <field>
  636 + <name>fcno11_xldir</name>
  637 + <type>String</type>
  638 + <format/>
  639 + </field>
  640 + <field>
  641 + <name>fcno11_isfb</name>
  642 + <type>String</type>
  643 + <format/>
  644 + </field>
  645 + <field>
536 646 <name>fcno12_id</name>
537 647 <type>String</type>
538 648 <format/>
... ... @@ -553,6 +663,16 @@
553 663 <format/>
554 664 </field>
555 665 <field>
  666 + <name>fcno12_xldir</name>
  667 + <type>String</type>
  668 + <format/>
  669 + </field>
  670 + <field>
  671 + <name>fcno12_isfb</name>
  672 + <type>String</type>
  673 + <format/>
  674 + </field>
  675 + <field>
556 676 <name>fcno13_id</name>
557 677 <type>String</type>
558 678 <format/>
... ... @@ -573,6 +693,16 @@
573 693 <format/>
574 694 </field>
575 695 <field>
  696 + <name>fcno13_xldir</name>
  697 + <type>String</type>
  698 + <format/>
  699 + </field>
  700 + <field>
  701 + <name>fcno13_isfb</name>
  702 + <type>String</type>
  703 + <format/>
  704 + </field>
  705 + <field>
576 706 <name>fcno14_id</name>
577 707 <type>String</type>
578 708 <format/>
... ... @@ -593,6 +723,16 @@
593 723 <format/>
594 724 </field>
595 725 <field>
  726 + <name>fcno14_xldir</name>
  727 + <type>String</type>
  728 + <format/>
  729 + </field>
  730 + <field>
  731 + <name>fcno14_isfb</name>
  732 + <type>String</type>
  733 + <format/>
  734 + </field>
  735 + <field>
596 736 <name>fcno15_id</name>
597 737 <type>String</type>
598 738 <format/>
... ... @@ -613,6 +753,16 @@
613 753 <format/>
614 754 </field>
615 755 <field>
  756 + <name>fcno15_xldir</name>
  757 + <type>String</type>
  758 + <format/>
  759 + </field>
  760 + <field>
  761 + <name>fcno15_isfb</name>
  762 + <type>String</type>
  763 + <format/>
  764 + </field>
  765 + <field>
616 766 <name>fcno16_id</name>
617 767 <type>String</type>
618 768 <format/>
... ... @@ -633,6 +783,16 @@
633 783 <format/>
634 784 </field>
635 785 <field>
  786 + <name>fcno16_xldir</name>
  787 + <type>String</type>
  788 + <format/>
  789 + </field>
  790 + <field>
  791 + <name>fcno16_isfb</name>
  792 + <type>String</type>
  793 + <format/>
  794 + </field>
  795 + <field>
636 796 <name>fcno17_id</name>
637 797 <type>String</type>
638 798 <format/>
... ... @@ -653,6 +813,16 @@
653 813 <format/>
654 814 </field>
655 815 <field>
  816 + <name>fcno17_xldir</name>
  817 + <type>String</type>
  818 + <format/>
  819 + </field>
  820 + <field>
  821 + <name>fcno17_isfb</name>
  822 + <type>String</type>
  823 + <format/>
  824 + </field>
  825 + <field>
656 826 <name>fcno18_id</name>
657 827 <type>String</type>
658 828 <format/>
... ... @@ -673,6 +843,16 @@
673 843 <format/>
674 844 </field>
675 845 <field>
  846 + <name>fcno18_xldir</name>
  847 + <type>String</type>
  848 + <format/>
  849 + </field>
  850 + <field>
  851 + <name>fcno18_isfb</name>
  852 + <type>String</type>
  853 + <format/>
  854 + </field>
  855 + <field>
676 856 <name>fcno19_id</name>
677 857 <type>String</type>
678 858 <format/>
... ... @@ -693,6 +873,16 @@
693 873 <format/>
694 874 </field>
695 875 <field>
  876 + <name>fcno19_xldir</name>
  877 + <type>String</type>
  878 + <format/>
  879 + </field>
  880 + <field>
  881 + <name>fcno19_isfb</name>
  882 + <type>String</type>
  883 + <format/>
  884 + </field>
  885 + <field>
696 886 <name>fcno20_id</name>
697 887 <type>String</type>
698 888 <format/>
... ... @@ -713,6 +903,16 @@
713 903 <format/>
714 904 </field>
715 905 <field>
  906 + <name>fcno20_xldir</name>
  907 + <type>String</type>
  908 + <format/>
  909 + </field>
  910 + <field>
  911 + <name>fcno20_isfb</name>
  912 + <type>String</type>
  913 + <format/>
  914 + </field>
  915 + <field>
716 916 <name>fcno21_id</name>
717 917 <type>String</type>
718 918 <format/>
... ... @@ -733,6 +933,16 @@
733 933 <format/>
734 934 </field>
735 935 <field>
  936 + <name>fcno21_xldir</name>
  937 + <type>String</type>
  938 + <format/>
  939 + </field>
  940 + <field>
  941 + <name>fcno21_isfb</name>
  942 + <type>String</type>
  943 + <format/>
  944 + </field>
  945 + <field>
736 946 <name>fcno22_id</name>
737 947 <type>String</type>
738 948 <format/>
... ... @@ -753,6 +963,16 @@
753 963 <format/>
754 964 </field>
755 965 <field>
  966 + <name>fcno22_xldir</name>
  967 + <type>String</type>
  968 + <format/>
  969 + </field>
  970 + <field>
  971 + <name>fcno22_isfb</name>
  972 + <type>String</type>
  973 + <format/>
  974 + </field>
  975 + <field>
756 976 <name>fcno23_id</name>
757 977 <type>String</type>
758 978 <format/>
... ... @@ -773,6 +993,16 @@
773 993 <format/>
774 994 </field>
775 995 <field>
  996 + <name>fcno23_xldir</name>
  997 + <type>String</type>
  998 + <format/>
  999 + </field>
  1000 + <field>
  1001 + <name>fcno23_isfb</name>
  1002 + <type>String</type>
  1003 + <format/>
  1004 + </field>
  1005 + <field>
776 1006 <name>fcno24_id</name>
777 1007 <type>String</type>
778 1008 <format/>
... ... @@ -793,6 +1023,16 @@
793 1023 <format/>
794 1024 </field>
795 1025 <field>
  1026 + <name>fcno24_xldir</name>
  1027 + <type>String</type>
  1028 + <format/>
  1029 + </field>
  1030 + <field>
  1031 + <name>fcno24_isfb</name>
  1032 + <type>String</type>
  1033 + <format/>
  1034 + </field>
  1035 + <field>
796 1036 <name>fcno25_id</name>
797 1037 <type>String</type>
798 1038 <format/>
... ... @@ -813,6 +1053,16 @@
813 1053 <format/>
814 1054 </field>
815 1055 <field>
  1056 + <name>fcno25_xldir</name>
  1057 + <type>String</type>
  1058 + <format/>
  1059 + </field>
  1060 + <field>
  1061 + <name>fcno25_isfb</name>
  1062 + <type>String</type>
  1063 + <format/>
  1064 + </field>
  1065 + <field>
816 1066 <name>fcno26_id</name>
817 1067 <type>String</type>
818 1068 <format/>
... ... @@ -833,6 +1083,16 @@
833 1083 <format/>
834 1084 </field>
835 1085 <field>
  1086 + <name>fcno26_xldir</name>
  1087 + <type>String</type>
  1088 + <format/>
  1089 + </field>
  1090 + <field>
  1091 + <name>fcno26_isfb</name>
  1092 + <type>String</type>
  1093 + <format/>
  1094 + </field>
  1095 + <field>
836 1096 <name>fcno27_id</name>
837 1097 <type>String</type>
838 1098 <format/>
... ... @@ -853,6 +1113,16 @@
853 1113 <format/>
854 1114 </field>
855 1115 <field>
  1116 + <name>fcno27_xldir</name>
  1117 + <type>String</type>
  1118 + <format/>
  1119 + </field>
  1120 + <field>
  1121 + <name>fcno27_isfb</name>
  1122 + <type>String</type>
  1123 + <format/>
  1124 + </field>
  1125 + <field>
856 1126 <name>fcno28_id</name>
857 1127 <type>String</type>
858 1128 <format/>
... ... @@ -873,6 +1143,16 @@
873 1143 <format/>
874 1144 </field>
875 1145 <field>
  1146 + <name>fcno28_xldir</name>
  1147 + <type>String</type>
  1148 + <format/>
  1149 + </field>
  1150 + <field>
  1151 + <name>fcno28_isfb</name>
  1152 + <type>String</type>
  1153 + <format/>
  1154 + </field>
  1155 + <field>
876 1156 <name>fcno29_id</name>
877 1157 <type>String</type>
878 1158 <format/>
... ... @@ -893,6 +1173,16 @@
893 1173 <format/>
894 1174 </field>
895 1175 <field>
  1176 + <name>fcno29_xldir</name>
  1177 + <type>String</type>
  1178 + <format/>
  1179 + </field>
  1180 + <field>
  1181 + <name>fcno29_isfb</name>
  1182 + <type>String</type>
  1183 + <format/>
  1184 + </field>
  1185 + <field>
896 1186 <name>fcno30_id</name>
897 1187 <type>String</type>
898 1188 <format/>
... ... @@ -912,6 +1202,16 @@
912 1202 <type>String</type>
913 1203 <format/>
914 1204 </field>
  1205 + <field>
  1206 + <name>fcno30_xldir</name>
  1207 + <type>String</type>
  1208 + <format/>
  1209 + </field>
  1210 + <field>
  1211 + <name>fcno30_isfb</name>
  1212 + <type>String</type>
  1213 + <format/>
  1214 + </field>
915 1215 </fields>
916 1216 <custom>
917 1217 <header_font_name>arial</header_font_name>
... ... @@ -1013,9 +1313,9 @@
1013 1313 <target_aggregation_type>-</target_aggregation_type>
1014 1314 </field>
1015 1315 <field>
1016   - <field_name>id</field_name>
1017   - <key_value>2</key_value>
1018   - <target_name>fcno2_id</target_name>
  1316 + <field_name>xl_dir</field_name>
  1317 + <key_value>1</key_value>
  1318 + <target_name>fcno1_xldir</target_name>
1019 1319 <target_type>String</target_type>
1020 1320 <target_format/>
1021 1321 <target_length>-1</target_length>
... ... @@ -1027,9 +1327,9 @@
1027 1327 <target_aggregation_type>-</target_aggregation_type>
1028 1328 </field>
1029 1329 <field>
1030   - <field_name>fcsj</field_name>
1031   - <key_value>2</key_value>
1032   - <target_name>fcno2_fcsj</target_name>
  1330 + <field_name>isfb</field_name>
  1331 + <key_value>1</key_value>
  1332 + <target_name>fcno1_isfb</target_name>
1033 1333 <target_type>String</target_type>
1034 1334 <target_format/>
1035 1335 <target_length>-1</target_length>
... ... @@ -1041,9 +1341,9 @@
1041 1341 <target_aggregation_type>-</target_aggregation_type>
1042 1342 </field>
1043 1343 <field>
1044   - <field_name>fczdName</field_name>
  1344 + <field_name>id</field_name>
1045 1345 <key_value>2</key_value>
1046   - <target_name>fcno2_zdname</target_name>
  1346 + <target_name>fcno2_id</target_name>
1047 1347 <target_type>String</target_type>
1048 1348 <target_format/>
1049 1349 <target_length>-1</target_length>
... ... @@ -1055,9 +1355,9 @@
1055 1355 <target_aggregation_type>-</target_aggregation_type>
1056 1356 </field>
1057 1357 <field>
1058   - <field_name>bc_type</field_name>
  1358 + <field_name>fcsj</field_name>
1059 1359 <key_value>2</key_value>
1060   - <target_name>fcno2_bctype</target_name>
  1360 + <target_name>fcno2_fcsj</target_name>
1061 1361 <target_type>String</target_type>
1062 1362 <target_format/>
1063 1363 <target_length>-1</target_length>
... ... @@ -1069,9 +1369,9 @@
1069 1369 <target_aggregation_type>-</target_aggregation_type>
1070 1370 </field>
1071 1371 <field>
1072   - <field_name>id</field_name>
1073   - <key_value>3</key_value>
1074   - <target_name>fcno3_id</target_name>
  1372 + <field_name>fczdName</field_name>
  1373 + <key_value>2</key_value>
  1374 + <target_name>fcno2_zdname</target_name>
1075 1375 <target_type>String</target_type>
1076 1376 <target_format/>
1077 1377 <target_length>-1</target_length>
... ... @@ -1083,9 +1383,9 @@
1083 1383 <target_aggregation_type>-</target_aggregation_type>
1084 1384 </field>
1085 1385 <field>
1086   - <field_name>fcsj</field_name>
1087   - <key_value>3</key_value>
1088   - <target_name>fcno3_fcsj</target_name>
  1386 + <field_name>bc_type</field_name>
  1387 + <key_value>2</key_value>
  1388 + <target_name>fcno2_bctype</target_name>
1089 1389 <target_type>String</target_type>
1090 1390 <target_format/>
1091 1391 <target_length>-1</target_length>
... ... @@ -1097,9 +1397,9 @@
1097 1397 <target_aggregation_type>-</target_aggregation_type>
1098 1398 </field>
1099 1399 <field>
1100   - <field_name>fczdName</field_name>
1101   - <key_value>3</key_value>
1102   - <target_name>fcno3_zdname</target_name>
  1400 + <field_name>xl_dir</field_name>
  1401 + <key_value>2</key_value>
  1402 + <target_name>fcno2_xldir</target_name>
1103 1403 <target_type>String</target_type>
1104 1404 <target_format/>
1105 1405 <target_length>-1</target_length>
... ... @@ -1111,9 +1411,9 @@
1111 1411 <target_aggregation_type>-</target_aggregation_type>
1112 1412 </field>
1113 1413 <field>
1114   - <field_name>bc_type</field_name>
1115   - <key_value>3</key_value>
1116   - <target_name>fcno3_bctype</target_name>
  1414 + <field_name>isfb</field_name>
  1415 + <key_value>2</key_value>
  1416 + <target_name>fcno2_isfb</target_name>
1117 1417 <target_type>String</target_type>
1118 1418 <target_format/>
1119 1419 <target_length>-1</target_length>
... ... @@ -1126,8 +1426,8 @@
1126 1426 </field>
1127 1427 <field>
1128 1428 <field_name>id</field_name>
1129   - <key_value>4</key_value>
1130   - <target_name>fcno4_id</target_name>
  1429 + <key_value>3</key_value>
  1430 + <target_name>fcno3_id</target_name>
1131 1431 <target_type>String</target_type>
1132 1432 <target_format/>
1133 1433 <target_length>-1</target_length>
... ... @@ -1140,8 +1440,8 @@
1140 1440 </field>
1141 1441 <field>
1142 1442 <field_name>fcsj</field_name>
1143   - <key_value>4</key_value>
1144   - <target_name>fcno4_fcsj</target_name>
  1443 + <key_value>3</key_value>
  1444 + <target_name>fcno3_fcsj</target_name>
1145 1445 <target_type>String</target_type>
1146 1446 <target_format/>
1147 1447 <target_length>-1</target_length>
... ... @@ -1154,8 +1454,8 @@
1154 1454 </field>
1155 1455 <field>
1156 1456 <field_name>fczdName</field_name>
1157   - <key_value>4</key_value>
1158   - <target_name>fcno4_zdname</target_name>
  1457 + <key_value>3</key_value>
  1458 + <target_name>fcno3_zdname</target_name>
1159 1459 <target_type>String</target_type>
1160 1460 <target_format/>
1161 1461 <target_length>-1</target_length>
... ... @@ -1168,8 +1468,8 @@
1168 1468 </field>
1169 1469 <field>
1170 1470 <field_name>bc_type</field_name>
1171   - <key_value>4</key_value>
1172   - <target_name>fcno4_bctype</target_name>
  1471 + <key_value>3</key_value>
  1472 + <target_name>fcno3_bctype</target_name>
1173 1473 <target_type>String</target_type>
1174 1474 <target_format/>
1175 1475 <target_length>-1</target_length>
... ... @@ -1181,9 +1481,9 @@
1181 1481 <target_aggregation_type>-</target_aggregation_type>
1182 1482 </field>
1183 1483 <field>
1184   - <field_name>id</field_name>
1185   - <key_value>5</key_value>
1186   - <target_name>fcno5_id</target_name>
  1484 + <field_name>xl_dir</field_name>
  1485 + <key_value>3</key_value>
  1486 + <target_name>fcno3_xldir</target_name>
1187 1487 <target_type>String</target_type>
1188 1488 <target_format/>
1189 1489 <target_length>-1</target_length>
... ... @@ -1195,9 +1495,9 @@
1195 1495 <target_aggregation_type>-</target_aggregation_type>
1196 1496 </field>
1197 1497 <field>
1198   - <field_name>fcsj</field_name>
1199   - <key_value>5</key_value>
1200   - <target_name>fcno5_fcsj</target_name>
  1498 + <field_name>isfb</field_name>
  1499 + <key_value>3</key_value>
  1500 + <target_name>fcno3_isfb</target_name>
1201 1501 <target_type>String</target_type>
1202 1502 <target_format/>
1203 1503 <target_length>-1</target_length>
... ... @@ -1209,9 +1509,9 @@
1209 1509 <target_aggregation_type>-</target_aggregation_type>
1210 1510 </field>
1211 1511 <field>
1212   - <field_name>fczdName</field_name>
1213   - <key_value>5</key_value>
1214   - <target_name>fcno5_zdname</target_name>
  1512 + <field_name>id</field_name>
  1513 + <key_value>4</key_value>
  1514 + <target_name>fcno4_id</target_name>
1215 1515 <target_type>String</target_type>
1216 1516 <target_format/>
1217 1517 <target_length>-1</target_length>
... ... @@ -1223,9 +1523,9 @@
1223 1523 <target_aggregation_type>-</target_aggregation_type>
1224 1524 </field>
1225 1525 <field>
1226   - <field_name>bc_type</field_name>
1227   - <key_value>5</key_value>
1228   - <target_name>fcno5_bctype</target_name>
  1526 + <field_name>fcsj</field_name>
  1527 + <key_value>4</key_value>
  1528 + <target_name>fcno4_fcsj</target_name>
1229 1529 <target_type>String</target_type>
1230 1530 <target_format/>
1231 1531 <target_length>-1</target_length>
... ... @@ -1237,9 +1537,9 @@
1237 1537 <target_aggregation_type>-</target_aggregation_type>
1238 1538 </field>
1239 1539 <field>
1240   - <field_name>id</field_name>
1241   - <key_value>6</key_value>
1242   - <target_name>fcno6_id</target_name>
  1540 + <field_name>fczdName</field_name>
  1541 + <key_value>4</key_value>
  1542 + <target_name>fcno4_zdname</target_name>
1243 1543 <target_type>String</target_type>
1244 1544 <target_format/>
1245 1545 <target_length>-1</target_length>
... ... @@ -1251,9 +1551,9 @@
1251 1551 <target_aggregation_type>-</target_aggregation_type>
1252 1552 </field>
1253 1553 <field>
1254   - <field_name>fcsj</field_name>
1255   - <key_value>6</key_value>
1256   - <target_name>fcno6_fcsj</target_name>
  1554 + <field_name>bc_type</field_name>
  1555 + <key_value>4</key_value>
  1556 + <target_name>fcno4_bctype</target_name>
1257 1557 <target_type>String</target_type>
1258 1558 <target_format/>
1259 1559 <target_length>-1</target_length>
... ... @@ -1265,9 +1565,9 @@
1265 1565 <target_aggregation_type>-</target_aggregation_type>
1266 1566 </field>
1267 1567 <field>
1268   - <field_name>fczdName</field_name>
1269   - <key_value>6</key_value>
1270   - <target_name>fcno6_zdname</target_name>
  1568 + <field_name>xl_dir</field_name>
  1569 + <key_value>4</key_value>
  1570 + <target_name>fcno4_xldir</target_name>
1271 1571 <target_type>String</target_type>
1272 1572 <target_format/>
1273 1573 <target_length>-1</target_length>
... ... @@ -1279,9 +1579,9 @@
1279 1579 <target_aggregation_type>-</target_aggregation_type>
1280 1580 </field>
1281 1581 <field>
1282   - <field_name>bc_type</field_name>
1283   - <key_value>6</key_value>
1284   - <target_name>fcno6_bctype</target_name>
  1582 + <field_name>isfb</field_name>
  1583 + <key_value>4</key_value>
  1584 + <target_name>fcno4_isfb</target_name>
1285 1585 <target_type>String</target_type>
1286 1586 <target_format/>
1287 1587 <target_length>-1</target_length>
... ... @@ -1294,8 +1594,8 @@
1294 1594 </field>
1295 1595 <field>
1296 1596 <field_name>id</field_name>
1297   - <key_value>7</key_value>
1298   - <target_name>fcno7_id</target_name>
  1597 + <key_value>5</key_value>
  1598 + <target_name>fcno5_id</target_name>
1299 1599 <target_type>String</target_type>
1300 1600 <target_format/>
1301 1601 <target_length>-1</target_length>
... ... @@ -1308,8 +1608,8 @@
1308 1608 </field>
1309 1609 <field>
1310 1610 <field_name>fcsj</field_name>
1311   - <key_value>7</key_value>
1312   - <target_name>fcno7_fcsj</target_name>
  1611 + <key_value>5</key_value>
  1612 + <target_name>fcno5_fcsj</target_name>
1313 1613 <target_type>String</target_type>
1314 1614 <target_format/>
1315 1615 <target_length>-1</target_length>
... ... @@ -1322,8 +1622,8 @@
1322 1622 </field>
1323 1623 <field>
1324 1624 <field_name>fczdName</field_name>
1325   - <key_value>7</key_value>
1326   - <target_name>fcno7_zdname</target_name>
  1625 + <key_value>5</key_value>
  1626 + <target_name>fcno5_zdname</target_name>
1327 1627 <target_type>String</target_type>
1328 1628 <target_format/>
1329 1629 <target_length>-1</target_length>
... ... @@ -1336,8 +1636,8 @@
1336 1636 </field>
1337 1637 <field>
1338 1638 <field_name>bc_type</field_name>
1339   - <key_value>7</key_value>
1340   - <target_name>fcno7_bctype</target_name>
  1639 + <key_value>5</key_value>
  1640 + <target_name>fcno5_bctype</target_name>
1341 1641 <target_type>String</target_type>
1342 1642 <target_format/>
1343 1643 <target_length>-1</target_length>
... ... @@ -1349,9 +1649,9 @@
1349 1649 <target_aggregation_type>-</target_aggregation_type>
1350 1650 </field>
1351 1651 <field>
1352   - <field_name>id</field_name>
1353   - <key_value>8</key_value>
1354   - <target_name>fcno8_id</target_name>
  1652 + <field_name>xl_dir</field_name>
  1653 + <key_value>5</key_value>
  1654 + <target_name>fcno5_xldir</target_name>
1355 1655 <target_type>String</target_type>
1356 1656 <target_format/>
1357 1657 <target_length>-1</target_length>
... ... @@ -1363,9 +1663,9 @@
1363 1663 <target_aggregation_type>-</target_aggregation_type>
1364 1664 </field>
1365 1665 <field>
1366   - <field_name>fcsj</field_name>
1367   - <key_value>8</key_value>
1368   - <target_name>fcno8_fcsj</target_name>
  1666 + <field_name>isfb</field_name>
  1667 + <key_value>5</key_value>
  1668 + <target_name>fcno5_isfb</target_name>
1369 1669 <target_type>String</target_type>
1370 1670 <target_format/>
1371 1671 <target_length>-1</target_length>
... ... @@ -1377,9 +1677,9 @@
1377 1677 <target_aggregation_type>-</target_aggregation_type>
1378 1678 </field>
1379 1679 <field>
1380   - <field_name>fczdName</field_name>
1381   - <key_value>8</key_value>
1382   - <target_name>fcno8_zdname</target_name>
  1680 + <field_name>id</field_name>
  1681 + <key_value>6</key_value>
  1682 + <target_name>fcno6_id</target_name>
1383 1683 <target_type>String</target_type>
1384 1684 <target_format/>
1385 1685 <target_length>-1</target_length>
... ... @@ -1391,9 +1691,9 @@
1391 1691 <target_aggregation_type>-</target_aggregation_type>
1392 1692 </field>
1393 1693 <field>
1394   - <field_name>bc_type</field_name>
1395   - <key_value>8</key_value>
1396   - <target_name>fcno8_bctype</target_name>
  1694 + <field_name>fcsj</field_name>
  1695 + <key_value>6</key_value>
  1696 + <target_name>fcno6_fcsj</target_name>
1397 1697 <target_type>String</target_type>
1398 1698 <target_format/>
1399 1699 <target_length>-1</target_length>
... ... @@ -1405,9 +1705,9 @@
1405 1705 <target_aggregation_type>-</target_aggregation_type>
1406 1706 </field>
1407 1707 <field>
1408   - <field_name>id</field_name>
1409   - <key_value>9</key_value>
1410   - <target_name>fcno9_id</target_name>
  1708 + <field_name>fczdName</field_name>
  1709 + <key_value>6</key_value>
  1710 + <target_name>fcno6_zdname</target_name>
1411 1711 <target_type>String</target_type>
1412 1712 <target_format/>
1413 1713 <target_length>-1</target_length>
... ... @@ -1419,9 +1719,9 @@
1419 1719 <target_aggregation_type>-</target_aggregation_type>
1420 1720 </field>
1421 1721 <field>
1422   - <field_name>fcsj</field_name>
1423   - <key_value>9</key_value>
1424   - <target_name>fcno9_fcsj</target_name>
  1722 + <field_name>bc_type</field_name>
  1723 + <key_value>6</key_value>
  1724 + <target_name>fcno6_bctype</target_name>
1425 1725 <target_type>String</target_type>
1426 1726 <target_format/>
1427 1727 <target_length>-1</target_length>
... ... @@ -1433,9 +1733,9 @@
1433 1733 <target_aggregation_type>-</target_aggregation_type>
1434 1734 </field>
1435 1735 <field>
1436   - <field_name>fczdName</field_name>
1437   - <key_value>9</key_value>
1438   - <target_name>fcno9_zdname</target_name>
  1736 + <field_name>xl_dir</field_name>
  1737 + <key_value>6</key_value>
  1738 + <target_name>fcno6_xldir</target_name>
1439 1739 <target_type>String</target_type>
1440 1740 <target_format/>
1441 1741 <target_length>-1</target_length>
... ... @@ -1447,9 +1747,9 @@
1447 1747 <target_aggregation_type>-</target_aggregation_type>
1448 1748 </field>
1449 1749 <field>
1450   - <field_name>bc_type</field_name>
1451   - <key_value>9</key_value>
1452   - <target_name>fcno9_bctype</target_name>
  1750 + <field_name>isfb</field_name>
  1751 + <key_value>6</key_value>
  1752 + <target_name>fcno6_isfb</target_name>
1453 1753 <target_type>String</target_type>
1454 1754 <target_format/>
1455 1755 <target_length>-1</target_length>
... ... @@ -1462,8 +1762,8 @@
1462 1762 </field>
1463 1763 <field>
1464 1764 <field_name>id</field_name>
1465   - <key_value>10</key_value>
1466   - <target_name>fcno10_id</target_name>
  1765 + <key_value>7</key_value>
  1766 + <target_name>fcno7_id</target_name>
1467 1767 <target_type>String</target_type>
1468 1768 <target_format/>
1469 1769 <target_length>-1</target_length>
... ... @@ -1476,8 +1776,8 @@
1476 1776 </field>
1477 1777 <field>
1478 1778 <field_name>fcsj</field_name>
1479   - <key_value>10</key_value>
1480   - <target_name>fcno10_fcsj</target_name>
  1779 + <key_value>7</key_value>
  1780 + <target_name>fcno7_fcsj</target_name>
1481 1781 <target_type>String</target_type>
1482 1782 <target_format/>
1483 1783 <target_length>-1</target_length>
... ... @@ -1490,8 +1790,8 @@
1490 1790 </field>
1491 1791 <field>
1492 1792 <field_name>fczdName</field_name>
1493   - <key_value>10</key_value>
1494   - <target_name>fcno10_zdname</target_name>
  1793 + <key_value>7</key_value>
  1794 + <target_name>fcno7_zdname</target_name>
1495 1795 <target_type>String</target_type>
1496 1796 <target_format/>
1497 1797 <target_length>-1</target_length>
... ... @@ -1504,8 +1804,8 @@
1504 1804 </field>
1505 1805 <field>
1506 1806 <field_name>bc_type</field_name>
1507   - <key_value>10</key_value>
1508   - <target_name>fcno10_bctype</target_name>
  1807 + <key_value>7</key_value>
  1808 + <target_name>fcno7_bctype</target_name>
1509 1809 <target_type>String</target_type>
1510 1810 <target_format/>
1511 1811 <target_length>-1</target_length>
... ... @@ -1517,9 +1817,9 @@
1517 1817 <target_aggregation_type>-</target_aggregation_type>
1518 1818 </field>
1519 1819 <field>
1520   - <field_name>id</field_name>
1521   - <key_value>11</key_value>
1522   - <target_name>fcno11_id</target_name>
  1820 + <field_name>xl_dir</field_name>
  1821 + <key_value>7</key_value>
  1822 + <target_name>fcno7_xldir</target_name>
1523 1823 <target_type>String</target_type>
1524 1824 <target_format/>
1525 1825 <target_length>-1</target_length>
... ... @@ -1531,9 +1831,9 @@
1531 1831 <target_aggregation_type>-</target_aggregation_type>
1532 1832 </field>
1533 1833 <field>
1534   - <field_name>fcsj</field_name>
1535   - <key_value>11</key_value>
1536   - <target_name>fcno11_fcsj</target_name>
  1834 + <field_name>isfb</field_name>
  1835 + <key_value>7</key_value>
  1836 + <target_name>fcno7_isfb</target_name>
1537 1837 <target_type>String</target_type>
1538 1838 <target_format/>
1539 1839 <target_length>-1</target_length>
... ... @@ -1545,9 +1845,9 @@
1545 1845 <target_aggregation_type>-</target_aggregation_type>
1546 1846 </field>
1547 1847 <field>
1548   - <field_name>fczdName</field_name>
1549   - <key_value>11</key_value>
1550   - <target_name>fcno11_zdname</target_name>
  1848 + <field_name>id</field_name>
  1849 + <key_value>8</key_value>
  1850 + <target_name>fcno8_id</target_name>
1551 1851 <target_type>String</target_type>
1552 1852 <target_format/>
1553 1853 <target_length>-1</target_length>
... ... @@ -1559,9 +1859,9 @@
1559 1859 <target_aggregation_type>-</target_aggregation_type>
1560 1860 </field>
1561 1861 <field>
1562   - <field_name>bc_type</field_name>
1563   - <key_value>11</key_value>
1564   - <target_name>fcno11_bctype</target_name>
  1862 + <field_name>fcsj</field_name>
  1863 + <key_value>8</key_value>
  1864 + <target_name>fcno8_fcsj</target_name>
1565 1865 <target_type>String</target_type>
1566 1866 <target_format/>
1567 1867 <target_length>-1</target_length>
... ... @@ -1573,9 +1873,9 @@
1573 1873 <target_aggregation_type>-</target_aggregation_type>
1574 1874 </field>
1575 1875 <field>
1576   - <field_name>id</field_name>
1577   - <key_value>12</key_value>
1578   - <target_name>fcno12_id</target_name>
  1876 + <field_name>fczdName</field_name>
  1877 + <key_value>8</key_value>
  1878 + <target_name>fcno8_zdname</target_name>
1579 1879 <target_type>String</target_type>
1580 1880 <target_format/>
1581 1881 <target_length>-1</target_length>
... ... @@ -1587,9 +1887,9 @@
1587 1887 <target_aggregation_type>-</target_aggregation_type>
1588 1888 </field>
1589 1889 <field>
1590   - <field_name>fcsj</field_name>
1591   - <key_value>12</key_value>
1592   - <target_name>fcno12_fcsj</target_name>
  1890 + <field_name>bc_type</field_name>
  1891 + <key_value>8</key_value>
  1892 + <target_name>fcno8_bctype</target_name>
1593 1893 <target_type>String</target_type>
1594 1894 <target_format/>
1595 1895 <target_length>-1</target_length>
... ... @@ -1601,9 +1901,9 @@
1601 1901 <target_aggregation_type>-</target_aggregation_type>
1602 1902 </field>
1603 1903 <field>
1604   - <field_name>fczdName</field_name>
1605   - <key_value>12</key_value>
1606   - <target_name>fcno12_zdname</target_name>
  1904 + <field_name>xl_dir</field_name>
  1905 + <key_value>8</key_value>
  1906 + <target_name>fcno8_xldir</target_name>
1607 1907 <target_type>String</target_type>
1608 1908 <target_format/>
1609 1909 <target_length>-1</target_length>
... ... @@ -1615,9 +1915,9 @@
1615 1915 <target_aggregation_type>-</target_aggregation_type>
1616 1916 </field>
1617 1917 <field>
1618   - <field_name>bc_type</field_name>
1619   - <key_value>12</key_value>
1620   - <target_name>fcno12_bctype</target_name>
  1918 + <field_name>isfb</field_name>
  1919 + <key_value>8</key_value>
  1920 + <target_name>fcno8_isfb</target_name>
1621 1921 <target_type>String</target_type>
1622 1922 <target_format/>
1623 1923 <target_length>-1</target_length>
... ... @@ -1630,8 +1930,8 @@
1630 1930 </field>
1631 1931 <field>
1632 1932 <field_name>id</field_name>
1633   - <key_value>13</key_value>
1634   - <target_name>fcno13_id</target_name>
  1933 + <key_value>9</key_value>
  1934 + <target_name>fcno9_id</target_name>
1635 1935 <target_type>String</target_type>
1636 1936 <target_format/>
1637 1937 <target_length>-1</target_length>
... ... @@ -1644,8 +1944,8 @@
1644 1944 </field>
1645 1945 <field>
1646 1946 <field_name>fcsj</field_name>
1647   - <key_value>13</key_value>
1648   - <target_name>fcno13_fcsj</target_name>
  1947 + <key_value>9</key_value>
  1948 + <target_name>fcno9_fcsj</target_name>
1649 1949 <target_type>String</target_type>
1650 1950 <target_format/>
1651 1951 <target_length>-1</target_length>
... ... @@ -1658,8 +1958,8 @@
1658 1958 </field>
1659 1959 <field>
1660 1960 <field_name>fczdName</field_name>
1661   - <key_value>13</key_value>
1662   - <target_name>fcno13_zdname</target_name>
  1961 + <key_value>9</key_value>
  1962 + <target_name>fcno9_zdname</target_name>
1663 1963 <target_type>String</target_type>
1664 1964 <target_format/>
1665 1965 <target_length>-1</target_length>
... ... @@ -1672,8 +1972,8 @@
1672 1972 </field>
1673 1973 <field>
1674 1974 <field_name>bc_type</field_name>
1675   - <key_value>13</key_value>
1676   - <target_name>fcno13_bctype</target_name>
  1975 + <key_value>9</key_value>
  1976 + <target_name>fcno9_bctype</target_name>
1677 1977 <target_type>String</target_type>
1678 1978 <target_format/>
1679 1979 <target_length>-1</target_length>
... ... @@ -1685,9 +1985,9 @@
1685 1985 <target_aggregation_type>-</target_aggregation_type>
1686 1986 </field>
1687 1987 <field>
1688   - <field_name>id</field_name>
1689   - <key_value>14</key_value>
1690   - <target_name>fcno14_id</target_name>
  1988 + <field_name>xl_dir</field_name>
  1989 + <key_value>9</key_value>
  1990 + <target_name>fcno9_xldir</target_name>
1691 1991 <target_type>String</target_type>
1692 1992 <target_format/>
1693 1993 <target_length>-1</target_length>
... ... @@ -1699,9 +1999,9 @@
1699 1999 <target_aggregation_type>-</target_aggregation_type>
1700 2000 </field>
1701 2001 <field>
1702   - <field_name>fcsj</field_name>
1703   - <key_value>14</key_value>
1704   - <target_name>fcno14_fcsj</target_name>
  2002 + <field_name>isfb</field_name>
  2003 + <key_value>9</key_value>
  2004 + <target_name>fcno9_isfb</target_name>
1705 2005 <target_type>String</target_type>
1706 2006 <target_format/>
1707 2007 <target_length>-1</target_length>
... ... @@ -1713,9 +2013,9 @@
1713 2013 <target_aggregation_type>-</target_aggregation_type>
1714 2014 </field>
1715 2015 <field>
1716   - <field_name>fczdName</field_name>
1717   - <key_value>14</key_value>
1718   - <target_name>fcno14_zdname</target_name>
  2016 + <field_name>id</field_name>
  2017 + <key_value>10</key_value>
  2018 + <target_name>fcno10_id</target_name>
1719 2019 <target_type>String</target_type>
1720 2020 <target_format/>
1721 2021 <target_length>-1</target_length>
... ... @@ -1727,9 +2027,9 @@
1727 2027 <target_aggregation_type>-</target_aggregation_type>
1728 2028 </field>
1729 2029 <field>
1730   - <field_name>bc_type</field_name>
1731   - <key_value>14</key_value>
1732   - <target_name>fcno14_bctype</target_name>
  2030 + <field_name>fcsj</field_name>
  2031 + <key_value>10</key_value>
  2032 + <target_name>fcno10_fcsj</target_name>
1733 2033 <target_type>String</target_type>
1734 2034 <target_format/>
1735 2035 <target_length>-1</target_length>
... ... @@ -1741,9 +2041,9 @@
1741 2041 <target_aggregation_type>-</target_aggregation_type>
1742 2042 </field>
1743 2043 <field>
1744   - <field_name>id</field_name>
1745   - <key_value>15</key_value>
1746   - <target_name>fcno15_id</target_name>
  2044 + <field_name>fczdName</field_name>
  2045 + <key_value>10</key_value>
  2046 + <target_name>fcno10_zdname</target_name>
1747 2047 <target_type>String</target_type>
1748 2048 <target_format/>
1749 2049 <target_length>-1</target_length>
... ... @@ -1755,9 +2055,9 @@
1755 2055 <target_aggregation_type>-</target_aggregation_type>
1756 2056 </field>
1757 2057 <field>
1758   - <field_name>fcsj</field_name>
1759   - <key_value>15</key_value>
1760   - <target_name>fcno15_fcsj</target_name>
  2058 + <field_name>bc_type</field_name>
  2059 + <key_value>10</key_value>
  2060 + <target_name>fcno10_bctype</target_name>
1761 2061 <target_type>String</target_type>
1762 2062 <target_format/>
1763 2063 <target_length>-1</target_length>
... ... @@ -1769,9 +2069,9 @@
1769 2069 <target_aggregation_type>-</target_aggregation_type>
1770 2070 </field>
1771 2071 <field>
1772   - <field_name>fczdName</field_name>
1773   - <key_value>15</key_value>
1774   - <target_name>fcno15_zdname</target_name>
  2072 + <field_name>xl_dir</field_name>
  2073 + <key_value>10</key_value>
  2074 + <target_name>fcno10_xldir</target_name>
1775 2075 <target_type>String</target_type>
1776 2076 <target_format/>
1777 2077 <target_length>-1</target_length>
... ... @@ -1783,9 +2083,9 @@
1783 2083 <target_aggregation_type>-</target_aggregation_type>
1784 2084 </field>
1785 2085 <field>
1786   - <field_name>bc_type</field_name>
1787   - <key_value>15</key_value>
1788   - <target_name>fcno15_bctype</target_name>
  2086 + <field_name>isfb</field_name>
  2087 + <key_value>10</key_value>
  2088 + <target_name>fcno10_isfb</target_name>
1789 2089 <target_type>String</target_type>
1790 2090 <target_format/>
1791 2091 <target_length>-1</target_length>
... ... @@ -1798,8 +2098,8 @@
1798 2098 </field>
1799 2099 <field>
1800 2100 <field_name>id</field_name>
1801   - <key_value>16</key_value>
1802   - <target_name>fcno16_id</target_name>
  2101 + <key_value>11</key_value>
  2102 + <target_name>fcno11_id</target_name>
1803 2103 <target_type>String</target_type>
1804 2104 <target_format/>
1805 2105 <target_length>-1</target_length>
... ... @@ -1812,8 +2112,8 @@
1812 2112 </field>
1813 2113 <field>
1814 2114 <field_name>fcsj</field_name>
1815   - <key_value>16</key_value>
1816   - <target_name>fcno16_fcsj</target_name>
  2115 + <key_value>11</key_value>
  2116 + <target_name>fcno11_fcsj</target_name>
1817 2117 <target_type>String</target_type>
1818 2118 <target_format/>
1819 2119 <target_length>-1</target_length>
... ... @@ -1826,7 +2126,427 @@
1826 2126 </field>
1827 2127 <field>
1828 2128 <field_name>fczdName</field_name>
1829   - <key_value>16</key_value>
  2129 + <key_value>11</key_value>
  2130 + <target_name>fcno11_zdname</target_name>
  2131 + <target_type>String</target_type>
  2132 + <target_format/>
  2133 + <target_length>-1</target_length>
  2134 + <target_precision>-1</target_precision>
  2135 + <target_decimal_symbol/>
  2136 + <target_grouping_symbol/>
  2137 + <target_currency_symbol/>
  2138 + <target_null_string/>
  2139 + <target_aggregation_type>-</target_aggregation_type>
  2140 + </field>
  2141 + <field>
  2142 + <field_name>bc_type</field_name>
  2143 + <key_value>11</key_value>
  2144 + <target_name>fcno11_bctype</target_name>
  2145 + <target_type>String</target_type>
  2146 + <target_format/>
  2147 + <target_length>-1</target_length>
  2148 + <target_precision>-1</target_precision>
  2149 + <target_decimal_symbol/>
  2150 + <target_grouping_symbol/>
  2151 + <target_currency_symbol/>
  2152 + <target_null_string/>
  2153 + <target_aggregation_type>-</target_aggregation_type>
  2154 + </field>
  2155 + <field>
  2156 + <field_name>xl_dir</field_name>
  2157 + <key_value>11</key_value>
  2158 + <target_name>fcno11_xldir</target_name>
  2159 + <target_type>String</target_type>
  2160 + <target_format/>
  2161 + <target_length>-1</target_length>
  2162 + <target_precision>-1</target_precision>
  2163 + <target_decimal_symbol/>
  2164 + <target_grouping_symbol/>
  2165 + <target_currency_symbol/>
  2166 + <target_null_string/>
  2167 + <target_aggregation_type>-</target_aggregation_type>
  2168 + </field>
  2169 + <field>
  2170 + <field_name>isfb</field_name>
  2171 + <key_value>11</key_value>
  2172 + <target_name>fcno11_isfb</target_name>
  2173 + <target_type>String</target_type>
  2174 + <target_format/>
  2175 + <target_length>-1</target_length>
  2176 + <target_precision>-1</target_precision>
  2177 + <target_decimal_symbol/>
  2178 + <target_grouping_symbol/>
  2179 + <target_currency_symbol/>
  2180 + <target_null_string/>
  2181 + <target_aggregation_type>-</target_aggregation_type>
  2182 + </field>
  2183 + <field>
  2184 + <field_name>id</field_name>
  2185 + <key_value>12</key_value>
  2186 + <target_name>fcno12_id</target_name>
  2187 + <target_type>String</target_type>
  2188 + <target_format/>
  2189 + <target_length>-1</target_length>
  2190 + <target_precision>-1</target_precision>
  2191 + <target_decimal_symbol/>
  2192 + <target_grouping_symbol/>
  2193 + <target_currency_symbol/>
  2194 + <target_null_string/>
  2195 + <target_aggregation_type>-</target_aggregation_type>
  2196 + </field>
  2197 + <field>
  2198 + <field_name>fcsj</field_name>
  2199 + <key_value>12</key_value>
  2200 + <target_name>fcno12_fcsj</target_name>
  2201 + <target_type>String</target_type>
  2202 + <target_format/>
  2203 + <target_length>-1</target_length>
  2204 + <target_precision>-1</target_precision>
  2205 + <target_decimal_symbol/>
  2206 + <target_grouping_symbol/>
  2207 + <target_currency_symbol/>
  2208 + <target_null_string/>
  2209 + <target_aggregation_type>-</target_aggregation_type>
  2210 + </field>
  2211 + <field>
  2212 + <field_name>fczdName</field_name>
  2213 + <key_value>12</key_value>
  2214 + <target_name>fcno12_zdname</target_name>
  2215 + <target_type>String</target_type>
  2216 + <target_format/>
  2217 + <target_length>-1</target_length>
  2218 + <target_precision>-1</target_precision>
  2219 + <target_decimal_symbol/>
  2220 + <target_grouping_symbol/>
  2221 + <target_currency_symbol/>
  2222 + <target_null_string/>
  2223 + <target_aggregation_type>-</target_aggregation_type>
  2224 + </field>
  2225 + <field>
  2226 + <field_name>bc_type</field_name>
  2227 + <key_value>12</key_value>
  2228 + <target_name>fcno12_bctype</target_name>
  2229 + <target_type>String</target_type>
  2230 + <target_format/>
  2231 + <target_length>-1</target_length>
  2232 + <target_precision>-1</target_precision>
  2233 + <target_decimal_symbol/>
  2234 + <target_grouping_symbol/>
  2235 + <target_currency_symbol/>
  2236 + <target_null_string/>
  2237 + <target_aggregation_type>-</target_aggregation_type>
  2238 + </field>
  2239 + <field>
  2240 + <field_name>xl_dir</field_name>
  2241 + <key_value>12</key_value>
  2242 + <target_name>fcno12_xldir</target_name>
  2243 + <target_type>String</target_type>
  2244 + <target_format/>
  2245 + <target_length>-1</target_length>
  2246 + <target_precision>-1</target_precision>
  2247 + <target_decimal_symbol/>
  2248 + <target_grouping_symbol/>
  2249 + <target_currency_symbol/>
  2250 + <target_null_string/>
  2251 + <target_aggregation_type>-</target_aggregation_type>
  2252 + </field>
  2253 + <field>
  2254 + <field_name>isfb</field_name>
  2255 + <key_value>12</key_value>
  2256 + <target_name>fcno12_isfb</target_name>
  2257 + <target_type>String</target_type>
  2258 + <target_format/>
  2259 + <target_length>-1</target_length>
  2260 + <target_precision>-1</target_precision>
  2261 + <target_decimal_symbol/>
  2262 + <target_grouping_symbol/>
  2263 + <target_currency_symbol/>
  2264 + <target_null_string/>
  2265 + <target_aggregation_type>-</target_aggregation_type>
  2266 + </field>
  2267 + <field>
  2268 + <field_name>id</field_name>
  2269 + <key_value>13</key_value>
  2270 + <target_name>fcno13_id</target_name>
  2271 + <target_type>String</target_type>
  2272 + <target_format/>
  2273 + <target_length>-1</target_length>
  2274 + <target_precision>-1</target_precision>
  2275 + <target_decimal_symbol/>
  2276 + <target_grouping_symbol/>
  2277 + <target_currency_symbol/>
  2278 + <target_null_string/>
  2279 + <target_aggregation_type>-</target_aggregation_type>
  2280 + </field>
  2281 + <field>
  2282 + <field_name>fcsj</field_name>
  2283 + <key_value>13</key_value>
  2284 + <target_name>fcno13_fcsj</target_name>
  2285 + <target_type>String</target_type>
  2286 + <target_format/>
  2287 + <target_length>-1</target_length>
  2288 + <target_precision>-1</target_precision>
  2289 + <target_decimal_symbol/>
  2290 + <target_grouping_symbol/>
  2291 + <target_currency_symbol/>
  2292 + <target_null_string/>
  2293 + <target_aggregation_type>-</target_aggregation_type>
  2294 + </field>
  2295 + <field>
  2296 + <field_name>fczdName</field_name>
  2297 + <key_value>13</key_value>
  2298 + <target_name>fcno13_zdname</target_name>
  2299 + <target_type>String</target_type>
  2300 + <target_format/>
  2301 + <target_length>-1</target_length>
  2302 + <target_precision>-1</target_precision>
  2303 + <target_decimal_symbol/>
  2304 + <target_grouping_symbol/>
  2305 + <target_currency_symbol/>
  2306 + <target_null_string/>
  2307 + <target_aggregation_type>-</target_aggregation_type>
  2308 + </field>
  2309 + <field>
  2310 + <field_name>bc_type</field_name>
  2311 + <key_value>13</key_value>
  2312 + <target_name>fcno13_bctype</target_name>
  2313 + <target_type>String</target_type>
  2314 + <target_format/>
  2315 + <target_length>-1</target_length>
  2316 + <target_precision>-1</target_precision>
  2317 + <target_decimal_symbol/>
  2318 + <target_grouping_symbol/>
  2319 + <target_currency_symbol/>
  2320 + <target_null_string/>
  2321 + <target_aggregation_type>-</target_aggregation_type>
  2322 + </field>
  2323 + <field>
  2324 + <field_name>xl_dir</field_name>
  2325 + <key_value>13</key_value>
  2326 + <target_name>fcno13_xldir</target_name>
  2327 + <target_type>String</target_type>
  2328 + <target_format/>
  2329 + <target_length>-1</target_length>
  2330 + <target_precision>-1</target_precision>
  2331 + <target_decimal_symbol/>
  2332 + <target_grouping_symbol/>
  2333 + <target_currency_symbol/>
  2334 + <target_null_string/>
  2335 + <target_aggregation_type>-</target_aggregation_type>
  2336 + </field>
  2337 + <field>
  2338 + <field_name>isfb</field_name>
  2339 + <key_value>13</key_value>
  2340 + <target_name>fcno13_isfb</target_name>
  2341 + <target_type>String</target_type>
  2342 + <target_format/>
  2343 + <target_length>-1</target_length>
  2344 + <target_precision>-1</target_precision>
  2345 + <target_decimal_symbol/>
  2346 + <target_grouping_symbol/>
  2347 + <target_currency_symbol/>
  2348 + <target_null_string/>
  2349 + <target_aggregation_type>-</target_aggregation_type>
  2350 + </field>
  2351 + <field>
  2352 + <field_name>id</field_name>
  2353 + <key_value>14</key_value>
  2354 + <target_name>fcno14_id</target_name>
  2355 + <target_type>String</target_type>
  2356 + <target_format/>
  2357 + <target_length>-1</target_length>
  2358 + <target_precision>-1</target_precision>
  2359 + <target_decimal_symbol/>
  2360 + <target_grouping_symbol/>
  2361 + <target_currency_symbol/>
  2362 + <target_null_string/>
  2363 + <target_aggregation_type>-</target_aggregation_type>
  2364 + </field>
  2365 + <field>
  2366 + <field_name>fcsj</field_name>
  2367 + <key_value>14</key_value>
  2368 + <target_name>fcno14_fcsj</target_name>
  2369 + <target_type>String</target_type>
  2370 + <target_format/>
  2371 + <target_length>-1</target_length>
  2372 + <target_precision>-1</target_precision>
  2373 + <target_decimal_symbol/>
  2374 + <target_grouping_symbol/>
  2375 + <target_currency_symbol/>
  2376 + <target_null_string/>
  2377 + <target_aggregation_type>-</target_aggregation_type>
  2378 + </field>
  2379 + <field>
  2380 + <field_name>fczdName</field_name>
  2381 + <key_value>14</key_value>
  2382 + <target_name>fcno14_zdname</target_name>
  2383 + <target_type>String</target_type>
  2384 + <target_format/>
  2385 + <target_length>-1</target_length>
  2386 + <target_precision>-1</target_precision>
  2387 + <target_decimal_symbol/>
  2388 + <target_grouping_symbol/>
  2389 + <target_currency_symbol/>
  2390 + <target_null_string/>
  2391 + <target_aggregation_type>-</target_aggregation_type>
  2392 + </field>
  2393 + <field>
  2394 + <field_name>bc_type</field_name>
  2395 + <key_value>14</key_value>
  2396 + <target_name>fcno14_bctype</target_name>
  2397 + <target_type>String</target_type>
  2398 + <target_format/>
  2399 + <target_length>-1</target_length>
  2400 + <target_precision>-1</target_precision>
  2401 + <target_decimal_symbol/>
  2402 + <target_grouping_symbol/>
  2403 + <target_currency_symbol/>
  2404 + <target_null_string/>
  2405 + <target_aggregation_type>-</target_aggregation_type>
  2406 + </field>
  2407 + <field>
  2408 + <field_name>xl_dir</field_name>
  2409 + <key_value>14</key_value>
  2410 + <target_name>fcno14_xldir</target_name>
  2411 + <target_type>String</target_type>
  2412 + <target_format/>
  2413 + <target_length>-1</target_length>
  2414 + <target_precision>-1</target_precision>
  2415 + <target_decimal_symbol/>
  2416 + <target_grouping_symbol/>
  2417 + <target_currency_symbol/>
  2418 + <target_null_string/>
  2419 + <target_aggregation_type>-</target_aggregation_type>
  2420 + </field>
  2421 + <field>
  2422 + <field_name>isfb</field_name>
  2423 + <key_value>14</key_value>
  2424 + <target_name>fcno14_isfb</target_name>
  2425 + <target_type>String</target_type>
  2426 + <target_format/>
  2427 + <target_length>-1</target_length>
  2428 + <target_precision>-1</target_precision>
  2429 + <target_decimal_symbol/>
  2430 + <target_grouping_symbol/>
  2431 + <target_currency_symbol/>
  2432 + <target_null_string/>
  2433 + <target_aggregation_type>-</target_aggregation_type>
  2434 + </field>
  2435 + <field>
  2436 + <field_name>id</field_name>
  2437 + <key_value>15</key_value>
  2438 + <target_name>fcno15_id</target_name>
  2439 + <target_type>String</target_type>
  2440 + <target_format/>
  2441 + <target_length>-1</target_length>
  2442 + <target_precision>-1</target_precision>
  2443 + <target_decimal_symbol/>
  2444 + <target_grouping_symbol/>
  2445 + <target_currency_symbol/>
  2446 + <target_null_string/>
  2447 + <target_aggregation_type>-</target_aggregation_type>
  2448 + </field>
  2449 + <field>
  2450 + <field_name>fcsj</field_name>
  2451 + <key_value>15</key_value>
  2452 + <target_name>fcno15_fcsj</target_name>
  2453 + <target_type>String</target_type>
  2454 + <target_format/>
  2455 + <target_length>-1</target_length>
  2456 + <target_precision>-1</target_precision>
  2457 + <target_decimal_symbol/>
  2458 + <target_grouping_symbol/>
  2459 + <target_currency_symbol/>
  2460 + <target_null_string/>
  2461 + <target_aggregation_type>-</target_aggregation_type>
  2462 + </field>
  2463 + <field>
  2464 + <field_name>fczdName</field_name>
  2465 + <key_value>15</key_value>
  2466 + <target_name>fcno15_zdname</target_name>
  2467 + <target_type>String</target_type>
  2468 + <target_format/>
  2469 + <target_length>-1</target_length>
  2470 + <target_precision>-1</target_precision>
  2471 + <target_decimal_symbol/>
  2472 + <target_grouping_symbol/>
  2473 + <target_currency_symbol/>
  2474 + <target_null_string/>
  2475 + <target_aggregation_type>-</target_aggregation_type>
  2476 + </field>
  2477 + <field>
  2478 + <field_name>bc_type</field_name>
  2479 + <key_value>15</key_value>
  2480 + <target_name>fcno15_bctype</target_name>
  2481 + <target_type>String</target_type>
  2482 + <target_format/>
  2483 + <target_length>-1</target_length>
  2484 + <target_precision>-1</target_precision>
  2485 + <target_decimal_symbol/>
  2486 + <target_grouping_symbol/>
  2487 + <target_currency_symbol/>
  2488 + <target_null_string/>
  2489 + <target_aggregation_type>-</target_aggregation_type>
  2490 + </field>
  2491 + <field>
  2492 + <field_name>xl_dir</field_name>
  2493 + <key_value>15</key_value>
  2494 + <target_name>fcno15_xldir</target_name>
  2495 + <target_type>String</target_type>
  2496 + <target_format/>
  2497 + <target_length>-1</target_length>
  2498 + <target_precision>-1</target_precision>
  2499 + <target_decimal_symbol/>
  2500 + <target_grouping_symbol/>
  2501 + <target_currency_symbol/>
  2502 + <target_null_string/>
  2503 + <target_aggregation_type>-</target_aggregation_type>
  2504 + </field>
  2505 + <field>
  2506 + <field_name>isfb</field_name>
  2507 + <key_value>15</key_value>
  2508 + <target_name>fcno15_isfb</target_name>
  2509 + <target_type>String</target_type>
  2510 + <target_format/>
  2511 + <target_length>-1</target_length>
  2512 + <target_precision>-1</target_precision>
  2513 + <target_decimal_symbol/>
  2514 + <target_grouping_symbol/>
  2515 + <target_currency_symbol/>
  2516 + <target_null_string/>
  2517 + <target_aggregation_type>-</target_aggregation_type>
  2518 + </field>
  2519 + <field>
  2520 + <field_name>id</field_name>
  2521 + <key_value>16</key_value>
  2522 + <target_name>fcno16_id</target_name>
  2523 + <target_type>String</target_type>
  2524 + <target_format/>
  2525 + <target_length>-1</target_length>
  2526 + <target_precision>-1</target_precision>
  2527 + <target_decimal_symbol/>
  2528 + <target_grouping_symbol/>
  2529 + <target_currency_symbol/>
  2530 + <target_null_string/>
  2531 + <target_aggregation_type>-</target_aggregation_type>
  2532 + </field>
  2533 + <field>
  2534 + <field_name>fcsj</field_name>
  2535 + <key_value>16</key_value>
  2536 + <target_name>fcno16_fcsj</target_name>
  2537 + <target_type>String</target_type>
  2538 + <target_format/>
  2539 + <target_length>-1</target_length>
  2540 + <target_precision>-1</target_precision>
  2541 + <target_decimal_symbol/>
  2542 + <target_grouping_symbol/>
  2543 + <target_currency_symbol/>
  2544 + <target_null_string/>
  2545 + <target_aggregation_type>-</target_aggregation_type>
  2546 + </field>
  2547 + <field>
  2548 + <field_name>fczdName</field_name>
  2549 + <key_value>16</key_value>
1830 2550 <target_name>fcno16_zdname</target_name>
1831 2551 <target_type>String</target_type>
1832 2552 <target_format/>
... ... @@ -1840,8 +2560,204 @@
1840 2560 </field>
1841 2561 <field>
1842 2562 <field_name>bc_type</field_name>
1843   - <key_value>16</key_value>
1844   - <target_name>fcno16_bctype</target_name>
  2563 + <key_value>16</key_value>
  2564 + <target_name>fcno16_bctype</target_name>
  2565 + <target_type>String</target_type>
  2566 + <target_format/>
  2567 + <target_length>-1</target_length>
  2568 + <target_precision>-1</target_precision>
  2569 + <target_decimal_symbol/>
  2570 + <target_grouping_symbol/>
  2571 + <target_currency_symbol/>
  2572 + <target_null_string/>
  2573 + <target_aggregation_type>-</target_aggregation_type>
  2574 + </field>
  2575 + <field>
  2576 + <field_name>xl_dir</field_name>
  2577 + <key_value>16</key_value>
  2578 + <target_name>fcno16_xldir</target_name>
  2579 + <target_type>String</target_type>
  2580 + <target_format/>
  2581 + <target_length>-1</target_length>
  2582 + <target_precision>-1</target_precision>
  2583 + <target_decimal_symbol/>
  2584 + <target_grouping_symbol/>
  2585 + <target_currency_symbol/>
  2586 + <target_null_string/>
  2587 + <target_aggregation_type>-</target_aggregation_type>
  2588 + </field>
  2589 + <field>
  2590 + <field_name>isfb</field_name>
  2591 + <key_value>16</key_value>
  2592 + <target_name>fcno16_isfb</target_name>
  2593 + <target_type>String</target_type>
  2594 + <target_format/>
  2595 + <target_length>-1</target_length>
  2596 + <target_precision>-1</target_precision>
  2597 + <target_decimal_symbol/>
  2598 + <target_grouping_symbol/>
  2599 + <target_currency_symbol/>
  2600 + <target_null_string/>
  2601 + <target_aggregation_type>-</target_aggregation_type>
  2602 + </field>
  2603 + <field>
  2604 + <field_name>id</field_name>
  2605 + <key_value>17</key_value>
  2606 + <target_name>fcno17_id</target_name>
  2607 + <target_type>String</target_type>
  2608 + <target_format/>
  2609 + <target_length>-1</target_length>
  2610 + <target_precision>-1</target_precision>
  2611 + <target_decimal_symbol/>
  2612 + <target_grouping_symbol/>
  2613 + <target_currency_symbol/>
  2614 + <target_null_string/>
  2615 + <target_aggregation_type>-</target_aggregation_type>
  2616 + </field>
  2617 + <field>
  2618 + <field_name>fcsj</field_name>
  2619 + <key_value>17</key_value>
  2620 + <target_name>fcno17_fcsj</target_name>
  2621 + <target_type>String</target_type>
  2622 + <target_format/>
  2623 + <target_length>-1</target_length>
  2624 + <target_precision>-1</target_precision>
  2625 + <target_decimal_symbol/>
  2626 + <target_grouping_symbol/>
  2627 + <target_currency_symbol/>
  2628 + <target_null_string/>
  2629 + <target_aggregation_type>-</target_aggregation_type>
  2630 + </field>
  2631 + <field>
  2632 + <field_name>fczdName</field_name>
  2633 + <key_value>17</key_value>
  2634 + <target_name>fcno17_zdname</target_name>
  2635 + <target_type>String</target_type>
  2636 + <target_format/>
  2637 + <target_length>-1</target_length>
  2638 + <target_precision>-1</target_precision>
  2639 + <target_decimal_symbol/>
  2640 + <target_grouping_symbol/>
  2641 + <target_currency_symbol/>
  2642 + <target_null_string/>
  2643 + <target_aggregation_type>-</target_aggregation_type>
  2644 + </field>
  2645 + <field>
  2646 + <field_name>bc_type</field_name>
  2647 + <key_value>17</key_value>
  2648 + <target_name>fcno17_bctype</target_name>
  2649 + <target_type>String</target_type>
  2650 + <target_format/>
  2651 + <target_length>-1</target_length>
  2652 + <target_precision>-1</target_precision>
  2653 + <target_decimal_symbol/>
  2654 + <target_grouping_symbol/>
  2655 + <target_currency_symbol/>
  2656 + <target_null_string/>
  2657 + <target_aggregation_type>-</target_aggregation_type>
  2658 + </field>
  2659 + <field>
  2660 + <field_name>xl_dir</field_name>
  2661 + <key_value>17</key_value>
  2662 + <target_name>fcno17_xldir</target_name>
  2663 + <target_type>String</target_type>
  2664 + <target_format/>
  2665 + <target_length>-1</target_length>
  2666 + <target_precision>-1</target_precision>
  2667 + <target_decimal_symbol/>
  2668 + <target_grouping_symbol/>
  2669 + <target_currency_symbol/>
  2670 + <target_null_string/>
  2671 + <target_aggregation_type>-</target_aggregation_type>
  2672 + </field>
  2673 + <field>
  2674 + <field_name>isfb</field_name>
  2675 + <key_value>17</key_value>
  2676 + <target_name>fcno17_isfb</target_name>
  2677 + <target_type>String</target_type>
  2678 + <target_format/>
  2679 + <target_length>-1</target_length>
  2680 + <target_precision>-1</target_precision>
  2681 + <target_decimal_symbol/>
  2682 + <target_grouping_symbol/>
  2683 + <target_currency_symbol/>
  2684 + <target_null_string/>
  2685 + <target_aggregation_type>-</target_aggregation_type>
  2686 + </field>
  2687 + <field>
  2688 + <field_name>id</field_name>
  2689 + <key_value>18</key_value>
  2690 + <target_name>fcno18_id</target_name>
  2691 + <target_type>String</target_type>
  2692 + <target_format/>
  2693 + <target_length>-1</target_length>
  2694 + <target_precision>-1</target_precision>
  2695 + <target_decimal_symbol/>
  2696 + <target_grouping_symbol/>
  2697 + <target_currency_symbol/>
  2698 + <target_null_string/>
  2699 + <target_aggregation_type>-</target_aggregation_type>
  2700 + </field>
  2701 + <field>
  2702 + <field_name>fcsj</field_name>
  2703 + <key_value>18</key_value>
  2704 + <target_name>fcno18_fcsj</target_name>
  2705 + <target_type>String</target_type>
  2706 + <target_format/>
  2707 + <target_length>-1</target_length>
  2708 + <target_precision>-1</target_precision>
  2709 + <target_decimal_symbol/>
  2710 + <target_grouping_symbol/>
  2711 + <target_currency_symbol/>
  2712 + <target_null_string/>
  2713 + <target_aggregation_type>-</target_aggregation_type>
  2714 + </field>
  2715 + <field>
  2716 + <field_name>fczdName</field_name>
  2717 + <key_value>18</key_value>
  2718 + <target_name>fcno18_zdname</target_name>
  2719 + <target_type>String</target_type>
  2720 + <target_format/>
  2721 + <target_length>-1</target_length>
  2722 + <target_precision>-1</target_precision>
  2723 + <target_decimal_symbol/>
  2724 + <target_grouping_symbol/>
  2725 + <target_currency_symbol/>
  2726 + <target_null_string/>
  2727 + <target_aggregation_type>-</target_aggregation_type>
  2728 + </field>
  2729 + <field>
  2730 + <field_name>bc_type</field_name>
  2731 + <key_value>18</key_value>
  2732 + <target_name>fcno18_bctype</target_name>
  2733 + <target_type>String</target_type>
  2734 + <target_format/>
  2735 + <target_length>-1</target_length>
  2736 + <target_precision>-1</target_precision>
  2737 + <target_decimal_symbol/>
  2738 + <target_grouping_symbol/>
  2739 + <target_currency_symbol/>
  2740 + <target_null_string/>
  2741 + <target_aggregation_type>-</target_aggregation_type>
  2742 + </field>
  2743 + <field>
  2744 + <field_name>xl_dir</field_name>
  2745 + <key_value>18</key_value>
  2746 + <target_name>fcno18_xldir</target_name>
  2747 + <target_type>String</target_type>
  2748 + <target_format/>
  2749 + <target_length>-1</target_length>
  2750 + <target_precision>-1</target_precision>
  2751 + <target_decimal_symbol/>
  2752 + <target_grouping_symbol/>
  2753 + <target_currency_symbol/>
  2754 + <target_null_string/>
  2755 + <target_aggregation_type>-</target_aggregation_type>
  2756 + </field>
  2757 + <field>
  2758 + <field_name>isfb</field_name>
  2759 + <key_value>18</key_value>
  2760 + <target_name>fcno18_isfb</target_name>
1845 2761 <target_type>String</target_type>
1846 2762 <target_format/>
1847 2763 <target_length>-1</target_length>
... ... @@ -1854,8 +2770,8 @@
1854 2770 </field>
1855 2771 <field>
1856 2772 <field_name>id</field_name>
1857   - <key_value>17</key_value>
1858   - <target_name>fcno17_id</target_name>
  2773 + <key_value>19</key_value>
  2774 + <target_name>fcno19_id</target_name>
1859 2775 <target_type>String</target_type>
1860 2776 <target_format/>
1861 2777 <target_length>-1</target_length>
... ... @@ -1868,8 +2784,204 @@
1868 2784 </field>
1869 2785 <field>
1870 2786 <field_name>fcsj</field_name>
1871   - <key_value>17</key_value>
1872   - <target_name>fcno17_fcsj</target_name>
  2787 + <key_value>19</key_value>
  2788 + <target_name>fcno19_fcsj</target_name>
  2789 + <target_type>String</target_type>
  2790 + <target_format/>
  2791 + <target_length>-1</target_length>
  2792 + <target_precision>-1</target_precision>
  2793 + <target_decimal_symbol/>
  2794 + <target_grouping_symbol/>
  2795 + <target_currency_symbol/>
  2796 + <target_null_string/>
  2797 + <target_aggregation_type>-</target_aggregation_type>
  2798 + </field>
  2799 + <field>
  2800 + <field_name>fczdName</field_name>
  2801 + <key_value>19</key_value>
  2802 + <target_name>fcno19_zdname</target_name>
  2803 + <target_type>String</target_type>
  2804 + <target_format/>
  2805 + <target_length>-1</target_length>
  2806 + <target_precision>-1</target_precision>
  2807 + <target_decimal_symbol/>
  2808 + <target_grouping_symbol/>
  2809 + <target_currency_symbol/>
  2810 + <target_null_string/>
  2811 + <target_aggregation_type>-</target_aggregation_type>
  2812 + </field>
  2813 + <field>
  2814 + <field_name>bc_type</field_name>
  2815 + <key_value>19</key_value>
  2816 + <target_name>fcno19_bctype</target_name>
  2817 + <target_type>String</target_type>
  2818 + <target_format/>
  2819 + <target_length>-1</target_length>
  2820 + <target_precision>-1</target_precision>
  2821 + <target_decimal_symbol/>
  2822 + <target_grouping_symbol/>
  2823 + <target_currency_symbol/>
  2824 + <target_null_string/>
  2825 + <target_aggregation_type>-</target_aggregation_type>
  2826 + </field>
  2827 + <field>
  2828 + <field_name>xl_dir</field_name>
  2829 + <key_value>19</key_value>
  2830 + <target_name>fcno19_xldir</target_name>
  2831 + <target_type>String</target_type>
  2832 + <target_format/>
  2833 + <target_length>-1</target_length>
  2834 + <target_precision>-1</target_precision>
  2835 + <target_decimal_symbol/>
  2836 + <target_grouping_symbol/>
  2837 + <target_currency_symbol/>
  2838 + <target_null_string/>
  2839 + <target_aggregation_type>-</target_aggregation_type>
  2840 + </field>
  2841 + <field>
  2842 + <field_name>isfb</field_name>
  2843 + <key_value>19</key_value>
  2844 + <target_name>fcno19_isfb</target_name>
  2845 + <target_type>String</target_type>
  2846 + <target_format/>
  2847 + <target_length>-1</target_length>
  2848 + <target_precision>-1</target_precision>
  2849 + <target_decimal_symbol/>
  2850 + <target_grouping_symbol/>
  2851 + <target_currency_symbol/>
  2852 + <target_null_string/>
  2853 + <target_aggregation_type>-</target_aggregation_type>
  2854 + </field>
  2855 + <field>
  2856 + <field_name>id</field_name>
  2857 + <key_value>20</key_value>
  2858 + <target_name>fcno20_id</target_name>
  2859 + <target_type>String</target_type>
  2860 + <target_format/>
  2861 + <target_length>-1</target_length>
  2862 + <target_precision>-1</target_precision>
  2863 + <target_decimal_symbol/>
  2864 + <target_grouping_symbol/>
  2865 + <target_currency_symbol/>
  2866 + <target_null_string/>
  2867 + <target_aggregation_type>-</target_aggregation_type>
  2868 + </field>
  2869 + <field>
  2870 + <field_name>fcsj</field_name>
  2871 + <key_value>20</key_value>
  2872 + <target_name>fcno20_fcsj</target_name>
  2873 + <target_type>String</target_type>
  2874 + <target_format/>
  2875 + <target_length>-1</target_length>
  2876 + <target_precision>-1</target_precision>
  2877 + <target_decimal_symbol/>
  2878 + <target_grouping_symbol/>
  2879 + <target_currency_symbol/>
  2880 + <target_null_string/>
  2881 + <target_aggregation_type>-</target_aggregation_type>
  2882 + </field>
  2883 + <field>
  2884 + <field_name>fczdName</field_name>
  2885 + <key_value>20</key_value>
  2886 + <target_name>fcno20_zdname</target_name>
  2887 + <target_type>String</target_type>
  2888 + <target_format/>
  2889 + <target_length>-1</target_length>
  2890 + <target_precision>-1</target_precision>
  2891 + <target_decimal_symbol/>
  2892 + <target_grouping_symbol/>
  2893 + <target_currency_symbol/>
  2894 + <target_null_string/>
  2895 + <target_aggregation_type>-</target_aggregation_type>
  2896 + </field>
  2897 + <field>
  2898 + <field_name>bc_type</field_name>
  2899 + <key_value>20</key_value>
  2900 + <target_name>fcno20_bctype</target_name>
  2901 + <target_type>String</target_type>
  2902 + <target_format/>
  2903 + <target_length>-1</target_length>
  2904 + <target_precision>-1</target_precision>
  2905 + <target_decimal_symbol/>
  2906 + <target_grouping_symbol/>
  2907 + <target_currency_symbol/>
  2908 + <target_null_string/>
  2909 + <target_aggregation_type>-</target_aggregation_type>
  2910 + </field>
  2911 + <field>
  2912 + <field_name>xl_dir</field_name>
  2913 + <key_value>20</key_value>
  2914 + <target_name>fcno20_xldir</target_name>
  2915 + <target_type>String</target_type>
  2916 + <target_format/>
  2917 + <target_length>-1</target_length>
  2918 + <target_precision>-1</target_precision>
  2919 + <target_decimal_symbol/>
  2920 + <target_grouping_symbol/>
  2921 + <target_currency_symbol/>
  2922 + <target_null_string/>
  2923 + <target_aggregation_type>-</target_aggregation_type>
  2924 + </field>
  2925 + <field>
  2926 + <field_name>isfb</field_name>
  2927 + <key_value>20</key_value>
  2928 + <target_name>fcno20_isfb</target_name>
  2929 + <target_type>String</target_type>
  2930 + <target_format/>
  2931 + <target_length>-1</target_length>
  2932 + <target_precision>-1</target_precision>
  2933 + <target_decimal_symbol/>
  2934 + <target_grouping_symbol/>
  2935 + <target_currency_symbol/>
  2936 + <target_null_string/>
  2937 + <target_aggregation_type>-</target_aggregation_type>
  2938 + </field>
  2939 + <field>
  2940 + <field_name>id</field_name>
  2941 + <key_value>21</key_value>
  2942 + <target_name>fcno21_id</target_name>
  2943 + <target_type>String</target_type>
  2944 + <target_format/>
  2945 + <target_length>-1</target_length>
  2946 + <target_precision>-1</target_precision>
  2947 + <target_decimal_symbol/>
  2948 + <target_grouping_symbol/>
  2949 + <target_currency_symbol/>
  2950 + <target_null_string/>
  2951 + <target_aggregation_type>-</target_aggregation_type>
  2952 + </field>
  2953 + <field>
  2954 + <field_name>fcsj</field_name>
  2955 + <key_value>21</key_value>
  2956 + <target_name>fcno21_fcsj</target_name>
  2957 + <target_type>String</target_type>
  2958 + <target_format/>
  2959 + <target_length>-1</target_length>
  2960 + <target_precision>-1</target_precision>
  2961 + <target_decimal_symbol/>
  2962 + <target_grouping_symbol/>
  2963 + <target_currency_symbol/>
  2964 + <target_null_string/>
  2965 + <target_aggregation_type>-</target_aggregation_type>
  2966 + </field>
  2967 + <field>
  2968 + <field_name>fczdName</field_name>
  2969 + <key_value>21</key_value>
  2970 + <target_name>fcno21_zdname</target_name>
  2971 + <target_type>String</target_type>
  2972 + <target_format/>
  2973 + <target_length>-1</target_length>
  2974 + <target_precision>-1</target_precision>
  2975 + <target_decimal_symbol/>
  2976 + <target_grouping_symbol/>
  2977 + <target_currency_symbol/>
  2978 + <target_null_string/>
  2979 + <target_aggregation_type>-</target_aggregation_type>
  2980 + </field>
  2981 + <field>
  2982 + <field_name>bc_type</field_name>
  2983 + <key_value>21</key_value>
  2984 + <target_name>fcno21_bctype</target_name>
1873 2985 <target_type>String</target_type>
1874 2986 <target_format/>
1875 2987 <target_length>-1</target_length>
... ... @@ -1881,9 +2993,9 @@
1881 2993 <target_aggregation_type>-</target_aggregation_type>
1882 2994 </field>
1883 2995 <field>
1884   - <field_name>fczdName</field_name>
1885   - <key_value>17</key_value>
1886   - <target_name>fcno17_zdname</target_name>
  2996 + <field_name>xl_dir</field_name>
  2997 + <key_value>21</key_value>
  2998 + <target_name>fcno21_xldir</target_name>
1887 2999 <target_type>String</target_type>
1888 3000 <target_format/>
1889 3001 <target_length>-1</target_length>
... ... @@ -1895,9 +3007,9 @@
1895 3007 <target_aggregation_type>-</target_aggregation_type>
1896 3008 </field>
1897 3009 <field>
1898   - <field_name>bc_type</field_name>
1899   - <key_value>17</key_value>
1900   - <target_name>fcno17_bctype</target_name>
  3010 + <field_name>isfb</field_name>
  3011 + <key_value>21</key_value>
  3012 + <target_name>fcno21_isfb</target_name>
1901 3013 <target_type>String</target_type>
1902 3014 <target_format/>
1903 3015 <target_length>-1</target_length>
... ... @@ -1910,8 +3022,8 @@
1910 3022 </field>
1911 3023 <field>
1912 3024 <field_name>id</field_name>
1913   - <key_value>18</key_value>
1914   - <target_name>fcno18_id</target_name>
  3025 + <key_value>22</key_value>
  3026 + <target_name>fcno22_id</target_name>
1915 3027 <target_type>String</target_type>
1916 3028 <target_format/>
1917 3029 <target_length>-1</target_length>
... ... @@ -1924,8 +3036,8 @@
1924 3036 </field>
1925 3037 <field>
1926 3038 <field_name>fcsj</field_name>
1927   - <key_value>18</key_value>
1928   - <target_name>fcno18_fcsj</target_name>
  3039 + <key_value>22</key_value>
  3040 + <target_name>fcno22_fcsj</target_name>
1929 3041 <target_type>String</target_type>
1930 3042 <target_format/>
1931 3043 <target_length>-1</target_length>
... ... @@ -1938,8 +3050,8 @@
1938 3050 </field>
1939 3051 <field>
1940 3052 <field_name>fczdName</field_name>
1941   - <key_value>18</key_value>
1942   - <target_name>fcno18_zdname</target_name>
  3053 + <key_value>22</key_value>
  3054 + <target_name>fcno22_zdname</target_name>
1943 3055 <target_type>String</target_type>
1944 3056 <target_format/>
1945 3057 <target_length>-1</target_length>
... ... @@ -1952,8 +3064,8 @@
1952 3064 </field>
1953 3065 <field>
1954 3066 <field_name>bc_type</field_name>
1955   - <key_value>18</key_value>
1956   - <target_name>fcno18_bctype</target_name>
  3067 + <key_value>22</key_value>
  3068 + <target_name>fcno22_bctype</target_name>
1957 3069 <target_type>String</target_type>
1958 3070 <target_format/>
1959 3071 <target_length>-1</target_length>
... ... @@ -1965,9 +3077,9 @@
1965 3077 <target_aggregation_type>-</target_aggregation_type>
1966 3078 </field>
1967 3079 <field>
1968   - <field_name>id</field_name>
1969   - <key_value>19</key_value>
1970   - <target_name>fcno19_id</target_name>
  3080 + <field_name>xl_dir</field_name>
  3081 + <key_value>22</key_value>
  3082 + <target_name>fcno22_xldir</target_name>
1971 3083 <target_type>String</target_type>
1972 3084 <target_format/>
1973 3085 <target_length>-1</target_length>
... ... @@ -1979,9 +3091,9 @@
1979 3091 <target_aggregation_type>-</target_aggregation_type>
1980 3092 </field>
1981 3093 <field>
1982   - <field_name>fcsj</field_name>
1983   - <key_value>19</key_value>
1984   - <target_name>fcno19_fcsj</target_name>
  3094 + <field_name>isfb</field_name>
  3095 + <key_value>22</key_value>
  3096 + <target_name>fcno22_isfb</target_name>
1985 3097 <target_type>String</target_type>
1986 3098 <target_format/>
1987 3099 <target_length>-1</target_length>
... ... @@ -1993,9 +3105,9 @@
1993 3105 <target_aggregation_type>-</target_aggregation_type>
1994 3106 </field>
1995 3107 <field>
1996   - <field_name>fczdName</field_name>
1997   - <key_value>19</key_value>
1998   - <target_name>fcno19_zdname</target_name>
  3108 + <field_name>id</field_name>
  3109 + <key_value>23</key_value>
  3110 + <target_name>fcno23_id</target_name>
1999 3111 <target_type>String</target_type>
2000 3112 <target_format/>
2001 3113 <target_length>-1</target_length>
... ... @@ -2007,9 +3119,9 @@
2007 3119 <target_aggregation_type>-</target_aggregation_type>
2008 3120 </field>
2009 3121 <field>
2010   - <field_name>bc_type</field_name>
2011   - <key_value>19</key_value>
2012   - <target_name>fcno19_bctype</target_name>
  3122 + <field_name>fcsj</field_name>
  3123 + <key_value>23</key_value>
  3124 + <target_name>fcno23_fcsj</target_name>
2013 3125 <target_type>String</target_type>
2014 3126 <target_format/>
2015 3127 <target_length>-1</target_length>
... ... @@ -2021,9 +3133,9 @@
2021 3133 <target_aggregation_type>-</target_aggregation_type>
2022 3134 </field>
2023 3135 <field>
2024   - <field_name>id</field_name>
2025   - <key_value>20</key_value>
2026   - <target_name>fcno20_id</target_name>
  3136 + <field_name>fczdName</field_name>
  3137 + <key_value>23</key_value>
  3138 + <target_name>fcno23_zdname</target_name>
2027 3139 <target_type>String</target_type>
2028 3140 <target_format/>
2029 3141 <target_length>-1</target_length>
... ... @@ -2035,9 +3147,9 @@
2035 3147 <target_aggregation_type>-</target_aggregation_type>
2036 3148 </field>
2037 3149 <field>
2038   - <field_name>fcsj</field_name>
2039   - <key_value>20</key_value>
2040   - <target_name>fcno20_fcsj</target_name>
  3150 + <field_name>bc_type</field_name>
  3151 + <key_value>23</key_value>
  3152 + <target_name>fcno23_bctype</target_name>
2041 3153 <target_type>String</target_type>
2042 3154 <target_format/>
2043 3155 <target_length>-1</target_length>
... ... @@ -2049,9 +3161,9 @@
2049 3161 <target_aggregation_type>-</target_aggregation_type>
2050 3162 </field>
2051 3163 <field>
2052   - <field_name>fczdName</field_name>
2053   - <key_value>20</key_value>
2054   - <target_name>fcno20_zdname</target_name>
  3164 + <field_name>xl_dir</field_name>
  3165 + <key_value>23</key_value>
  3166 + <target_name>fcno23_xldir</target_name>
2055 3167 <target_type>String</target_type>
2056 3168 <target_format/>
2057 3169 <target_length>-1</target_length>
... ... @@ -2063,9 +3175,9 @@
2063 3175 <target_aggregation_type>-</target_aggregation_type>
2064 3176 </field>
2065 3177 <field>
2066   - <field_name>bc_type</field_name>
2067   - <key_value>20</key_value>
2068   - <target_name>fcno20_bctype</target_name>
  3178 + <field_name>isfb</field_name>
  3179 + <key_value>23</key_value>
  3180 + <target_name>fcno23_isfb</target_name>
2069 3181 <target_type>String</target_type>
2070 3182 <target_format/>
2071 3183 <target_length>-1</target_length>
... ... @@ -2078,8 +3190,8 @@
2078 3190 </field>
2079 3191 <field>
2080 3192 <field_name>id</field_name>
2081   - <key_value>21</key_value>
2082   - <target_name>fcno21_id</target_name>
  3193 + <key_value>24</key_value>
  3194 + <target_name>fcno24_id</target_name>
2083 3195 <target_type>String</target_type>
2084 3196 <target_format/>
2085 3197 <target_length>-1</target_length>
... ... @@ -2092,8 +3204,8 @@
2092 3204 </field>
2093 3205 <field>
2094 3206 <field_name>fcsj</field_name>
2095   - <key_value>21</key_value>
2096   - <target_name>fcno21_fcsj</target_name>
  3207 + <key_value>24</key_value>
  3208 + <target_name>fcno24_fcsj</target_name>
2097 3209 <target_type>String</target_type>
2098 3210 <target_format/>
2099 3211 <target_length>-1</target_length>
... ... @@ -2106,8 +3218,8 @@
2106 3218 </field>
2107 3219 <field>
2108 3220 <field_name>fczdName</field_name>
2109   - <key_value>21</key_value>
2110   - <target_name>fcno21_zdname</target_name>
  3221 + <key_value>24</key_value>
  3222 + <target_name>fcno24_zdname</target_name>
2111 3223 <target_type>String</target_type>
2112 3224 <target_format/>
2113 3225 <target_length>-1</target_length>
... ... @@ -2120,8 +3232,8 @@
2120 3232 </field>
2121 3233 <field>
2122 3234 <field_name>bc_type</field_name>
2123   - <key_value>21</key_value>
2124   - <target_name>fcno21_bctype</target_name>
  3235 + <key_value>24</key_value>
  3236 + <target_name>fcno24_bctype</target_name>
2125 3237 <target_type>String</target_type>
2126 3238 <target_format/>
2127 3239 <target_length>-1</target_length>
... ... @@ -2133,9 +3245,9 @@
2133 3245 <target_aggregation_type>-</target_aggregation_type>
2134 3246 </field>
2135 3247 <field>
2136   - <field_name>id</field_name>
2137   - <key_value>22</key_value>
2138   - <target_name>fcno22_id</target_name>
  3248 + <field_name>xl_dir</field_name>
  3249 + <key_value>24</key_value>
  3250 + <target_name>fcno24_xldir</target_name>
2139 3251 <target_type>String</target_type>
2140 3252 <target_format/>
2141 3253 <target_length>-1</target_length>
... ... @@ -2147,9 +3259,9 @@
2147 3259 <target_aggregation_type>-</target_aggregation_type>
2148 3260 </field>
2149 3261 <field>
2150   - <field_name>fcsj</field_name>
2151   - <key_value>22</key_value>
2152   - <target_name>fcno22_fcsj</target_name>
  3262 + <field_name>isfb</field_name>
  3263 + <key_value>24</key_value>
  3264 + <target_name>fcno24_isfb</target_name>
2153 3265 <target_type>String</target_type>
2154 3266 <target_format/>
2155 3267 <target_length>-1</target_length>
... ... @@ -2161,9 +3273,9 @@
2161 3273 <target_aggregation_type>-</target_aggregation_type>
2162 3274 </field>
2163 3275 <field>
2164   - <field_name>fczdName</field_name>
2165   - <key_value>22</key_value>
2166   - <target_name>fcno22_zdname</target_name>
  3276 + <field_name>id</field_name>
  3277 + <key_value>25</key_value>
  3278 + <target_name>fcno25_id</target_name>
2167 3279 <target_type>String</target_type>
2168 3280 <target_format/>
2169 3281 <target_length>-1</target_length>
... ... @@ -2175,9 +3287,9 @@
2175 3287 <target_aggregation_type>-</target_aggregation_type>
2176 3288 </field>
2177 3289 <field>
2178   - <field_name>bc_type</field_name>
2179   - <key_value>22</key_value>
2180   - <target_name>fcno22_bctype</target_name>
  3290 + <field_name>fcsj</field_name>
  3291 + <key_value>25</key_value>
  3292 + <target_name>fcno25_fcsj</target_name>
2181 3293 <target_type>String</target_type>
2182 3294 <target_format/>
2183 3295 <target_length>-1</target_length>
... ... @@ -2189,9 +3301,9 @@
2189 3301 <target_aggregation_type>-</target_aggregation_type>
2190 3302 </field>
2191 3303 <field>
2192   - <field_name>id</field_name>
2193   - <key_value>23</key_value>
2194   - <target_name>fcno23_id</target_name>
  3304 + <field_name>fczdName</field_name>
  3305 + <key_value>25</key_value>
  3306 + <target_name>fcno25_zdname</target_name>
2195 3307 <target_type>String</target_type>
2196 3308 <target_format/>
2197 3309 <target_length>-1</target_length>
... ... @@ -2203,9 +3315,9 @@
2203 3315 <target_aggregation_type>-</target_aggregation_type>
2204 3316 </field>
2205 3317 <field>
2206   - <field_name>fcsj</field_name>
2207   - <key_value>23</key_value>
2208   - <target_name>fcno23_fcsj</target_name>
  3318 + <field_name>bc_type</field_name>
  3319 + <key_value>25</key_value>
  3320 + <target_name>fcno25_bctype</target_name>
2209 3321 <target_type>String</target_type>
2210 3322 <target_format/>
2211 3323 <target_length>-1</target_length>
... ... @@ -2217,9 +3329,9 @@
2217 3329 <target_aggregation_type>-</target_aggregation_type>
2218 3330 </field>
2219 3331 <field>
2220   - <field_name>fczdName</field_name>
2221   - <key_value>23</key_value>
2222   - <target_name>fcno23_zdname</target_name>
  3332 + <field_name>xl_dir</field_name>
  3333 + <key_value>25</key_value>
  3334 + <target_name>fcno25_xldir</target_name>
2223 3335 <target_type>String</target_type>
2224 3336 <target_format/>
2225 3337 <target_length>-1</target_length>
... ... @@ -2231,9 +3343,9 @@
2231 3343 <target_aggregation_type>-</target_aggregation_type>
2232 3344 </field>
2233 3345 <field>
2234   - <field_name>bc_type</field_name>
2235   - <key_value>23</key_value>
2236   - <target_name>fcno23_bctype</target_name>
  3346 + <field_name>isfb</field_name>
  3347 + <key_value>25</key_value>
  3348 + <target_name>fcno25_isfb</target_name>
2237 3349 <target_type>String</target_type>
2238 3350 <target_format/>
2239 3351 <target_length>-1</target_length>
... ... @@ -2246,8 +3358,8 @@
2246 3358 </field>
2247 3359 <field>
2248 3360 <field_name>id</field_name>
2249   - <key_value>24</key_value>
2250   - <target_name>fcno24_id</target_name>
  3361 + <key_value>26</key_value>
  3362 + <target_name>fcno26_id</target_name>
2251 3363 <target_type>String</target_type>
2252 3364 <target_format/>
2253 3365 <target_length>-1</target_length>
... ... @@ -2260,8 +3372,8 @@
2260 3372 </field>
2261 3373 <field>
2262 3374 <field_name>fcsj</field_name>
2263   - <key_value>24</key_value>
2264   - <target_name>fcno24_fcsj</target_name>
  3375 + <key_value>26</key_value>
  3376 + <target_name>fcno26_fcsj</target_name>
2265 3377 <target_type>String</target_type>
2266 3378 <target_format/>
2267 3379 <target_length>-1</target_length>
... ... @@ -2274,8 +3386,8 @@
2274 3386 </field>
2275 3387 <field>
2276 3388 <field_name>fczdName</field_name>
2277   - <key_value>24</key_value>
2278   - <target_name>fcno24_zdname</target_name>
  3389 + <key_value>26</key_value>
  3390 + <target_name>fcno26_zdname</target_name>
2279 3391 <target_type>String</target_type>
2280 3392 <target_format/>
2281 3393 <target_length>-1</target_length>
... ... @@ -2288,8 +3400,8 @@
2288 3400 </field>
2289 3401 <field>
2290 3402 <field_name>bc_type</field_name>
2291   - <key_value>24</key_value>
2292   - <target_name>fcno24_bctype</target_name>
  3403 + <key_value>26</key_value>
  3404 + <target_name>fcno26_bctype</target_name>
2293 3405 <target_type>String</target_type>
2294 3406 <target_format/>
2295 3407 <target_length>-1</target_length>
... ... @@ -2301,9 +3413,9 @@
2301 3413 <target_aggregation_type>-</target_aggregation_type>
2302 3414 </field>
2303 3415 <field>
2304   - <field_name>id</field_name>
2305   - <key_value>25</key_value>
2306   - <target_name>fcno25_id</target_name>
  3416 + <field_name>xl_dir</field_name>
  3417 + <key_value>26</key_value>
  3418 + <target_name>fcno26_xldir</target_name>
2307 3419 <target_type>String</target_type>
2308 3420 <target_format/>
2309 3421 <target_length>-1</target_length>
... ... @@ -2315,9 +3427,9 @@
2315 3427 <target_aggregation_type>-</target_aggregation_type>
2316 3428 </field>
2317 3429 <field>
2318   - <field_name>fcsj</field_name>
2319   - <key_value>25</key_value>
2320   - <target_name>fcno25_fcsj</target_name>
  3430 + <field_name>isfb</field_name>
  3431 + <key_value>26</key_value>
  3432 + <target_name>fcno26_isfb</target_name>
2321 3433 <target_type>String</target_type>
2322 3434 <target_format/>
2323 3435 <target_length>-1</target_length>
... ... @@ -2329,9 +3441,9 @@
2329 3441 <target_aggregation_type>-</target_aggregation_type>
2330 3442 </field>
2331 3443 <field>
2332   - <field_name>fczdName</field_name>
2333   - <key_value>25</key_value>
2334   - <target_name>fcno25_zdname</target_name>
  3444 + <field_name>id</field_name>
  3445 + <key_value>27</key_value>
  3446 + <target_name>fcno27_id</target_name>
2335 3447 <target_type>String</target_type>
2336 3448 <target_format/>
2337 3449 <target_length>-1</target_length>
... ... @@ -2343,9 +3455,9 @@
2343 3455 <target_aggregation_type>-</target_aggregation_type>
2344 3456 </field>
2345 3457 <field>
2346   - <field_name>bc_type</field_name>
2347   - <key_value>25</key_value>
2348   - <target_name>fcno25_bctype</target_name>
  3458 + <field_name>fcsj</field_name>
  3459 + <key_value>27</key_value>
  3460 + <target_name>fcno27_fcsj</target_name>
2349 3461 <target_type>String</target_type>
2350 3462 <target_format/>
2351 3463 <target_length>-1</target_length>
... ... @@ -2357,9 +3469,9 @@
2357 3469 <target_aggregation_type>-</target_aggregation_type>
2358 3470 </field>
2359 3471 <field>
2360   - <field_name>id</field_name>
2361   - <key_value>26</key_value>
2362   - <target_name>fcno26_id</target_name>
  3472 + <field_name>fczdName</field_name>
  3473 + <key_value>27</key_value>
  3474 + <target_name>fcno27_zdname</target_name>
2363 3475 <target_type>String</target_type>
2364 3476 <target_format/>
2365 3477 <target_length>-1</target_length>
... ... @@ -2371,9 +3483,9 @@
2371 3483 <target_aggregation_type>-</target_aggregation_type>
2372 3484 </field>
2373 3485 <field>
2374   - <field_name>fcsj</field_name>
2375   - <key_value>26</key_value>
2376   - <target_name>fcno26_fcsj</target_name>
  3486 + <field_name>bc_type</field_name>
  3487 + <key_value>27</key_value>
  3488 + <target_name>fcno27_bctype</target_name>
2377 3489 <target_type>String</target_type>
2378 3490 <target_format/>
2379 3491 <target_length>-1</target_length>
... ... @@ -2385,9 +3497,9 @@
2385 3497 <target_aggregation_type>-</target_aggregation_type>
2386 3498 </field>
2387 3499 <field>
2388   - <field_name>fczdName</field_name>
2389   - <key_value>26</key_value>
2390   - <target_name>fcno26_zdname</target_name>
  3500 + <field_name>xl_dir</field_name>
  3501 + <key_value>27</key_value>
  3502 + <target_name>fcno27_xldir</target_name>
2391 3503 <target_type>String</target_type>
2392 3504 <target_format/>
2393 3505 <target_length>-1</target_length>
... ... @@ -2399,9 +3511,9 @@
2399 3511 <target_aggregation_type>-</target_aggregation_type>
2400 3512 </field>
2401 3513 <field>
2402   - <field_name>bc_type</field_name>
2403   - <key_value>26</key_value>
2404   - <target_name>fcno26_bctype</target_name>
  3514 + <field_name>isfb</field_name>
  3515 + <key_value>27</key_value>
  3516 + <target_name>fcno27_isfb</target_name>
2405 3517 <target_type>String</target_type>
2406 3518 <target_format/>
2407 3519 <target_length>-1</target_length>
... ... @@ -2414,8 +3526,8 @@
2414 3526 </field>
2415 3527 <field>
2416 3528 <field_name>id</field_name>
2417   - <key_value>27</key_value>
2418   - <target_name>fcno27_id</target_name>
  3529 + <key_value>28</key_value>
  3530 + <target_name>fcno28_id</target_name>
2419 3531 <target_type>String</target_type>
2420 3532 <target_format/>
2421 3533 <target_length>-1</target_length>
... ... @@ -2428,8 +3540,8 @@
2428 3540 </field>
2429 3541 <field>
2430 3542 <field_name>fcsj</field_name>
2431   - <key_value>27</key_value>
2432   - <target_name>fcno27_fcsj</target_name>
  3543 + <key_value>28</key_value>
  3544 + <target_name>fcno28_fcsj</target_name>
2433 3545 <target_type>String</target_type>
2434 3546 <target_format/>
2435 3547 <target_length>-1</target_length>
... ... @@ -2442,8 +3554,8 @@
2442 3554 </field>
2443 3555 <field>
2444 3556 <field_name>fczdName</field_name>
2445   - <key_value>27</key_value>
2446   - <target_name>fcno27_zdname</target_name>
  3557 + <key_value>28</key_value>
  3558 + <target_name>fcno28_zdname</target_name>
2447 3559 <target_type>String</target_type>
2448 3560 <target_format/>
2449 3561 <target_length>-1</target_length>
... ... @@ -2456,8 +3568,8 @@
2456 3568 </field>
2457 3569 <field>
2458 3570 <field_name>bc_type</field_name>
2459   - <key_value>27</key_value>
2460   - <target_name>fcno27_bctype</target_name>
  3571 + <key_value>28</key_value>
  3572 + <target_name>fcno28_bctype</target_name>
2461 3573 <target_type>String</target_type>
2462 3574 <target_format/>
2463 3575 <target_length>-1</target_length>
... ... @@ -2469,9 +3581,9 @@
2469 3581 <target_aggregation_type>-</target_aggregation_type>
2470 3582 </field>
2471 3583 <field>
2472   - <field_name>id</field_name>
  3584 + <field_name>xl_dir</field_name>
2473 3585 <key_value>28</key_value>
2474   - <target_name>fcno28_id</target_name>
  3586 + <target_name>fcno28_xldir</target_name>
2475 3587 <target_type>String</target_type>
2476 3588 <target_format/>
2477 3589 <target_length>-1</target_length>
... ... @@ -2483,9 +3595,9 @@
2483 3595 <target_aggregation_type>-</target_aggregation_type>
2484 3596 </field>
2485 3597 <field>
2486   - <field_name>fcsj</field_name>
  3598 + <field_name>isfb</field_name>
2487 3599 <key_value>28</key_value>
2488   - <target_name>fcno28_fcsj</target_name>
  3600 + <target_name>fcno28_isfb</target_name>
2489 3601 <target_type>String</target_type>
2490 3602 <target_format/>
2491 3603 <target_length>-1</target_length>
... ... @@ -2497,9 +3609,9 @@
2497 3609 <target_aggregation_type>-</target_aggregation_type>
2498 3610 </field>
2499 3611 <field>
2500   - <field_name>fczdName</field_name>
2501   - <key_value>28</key_value>
2502   - <target_name>fcno28_zdname</target_name>
  3612 + <field_name>id</field_name>
  3613 + <key_value>29</key_value>
  3614 + <target_name>fcno29_id</target_name>
2503 3615 <target_type>String</target_type>
2504 3616 <target_format/>
2505 3617 <target_length>-1</target_length>
... ... @@ -2511,9 +3623,9 @@
2511 3623 <target_aggregation_type>-</target_aggregation_type>
2512 3624 </field>
2513 3625 <field>
2514   - <field_name>bc_type</field_name>
2515   - <key_value>28</key_value>
2516   - <target_name>fcno28_bctype</target_name>
  3626 + <field_name>fcsj</field_name>
  3627 + <key_value>29</key_value>
  3628 + <target_name>fcno29_fcsj</target_name>
2517 3629 <target_type>String</target_type>
2518 3630 <target_format/>
2519 3631 <target_length>-1</target_length>
... ... @@ -2525,9 +3637,9 @@
2525 3637 <target_aggregation_type>-</target_aggregation_type>
2526 3638 </field>
2527 3639 <field>
2528   - <field_name>id</field_name>
  3640 + <field_name>fczdName</field_name>
2529 3641 <key_value>29</key_value>
2530   - <target_name>fcno29_id</target_name>
  3642 + <target_name>fcno29_zdname</target_name>
2531 3643 <target_type>String</target_type>
2532 3644 <target_format/>
2533 3645 <target_length>-1</target_length>
... ... @@ -2539,9 +3651,9 @@
2539 3651 <target_aggregation_type>-</target_aggregation_type>
2540 3652 </field>
2541 3653 <field>
2542   - <field_name>fcsj</field_name>
  3654 + <field_name>bc_type</field_name>
2543 3655 <key_value>29</key_value>
2544   - <target_name>fcno29_fcsj</target_name>
  3656 + <target_name>fcno29_bctype</target_name>
2545 3657 <target_type>String</target_type>
2546 3658 <target_format/>
2547 3659 <target_length>-1</target_length>
... ... @@ -2553,9 +3665,9 @@
2553 3665 <target_aggregation_type>-</target_aggregation_type>
2554 3666 </field>
2555 3667 <field>
2556   - <field_name>fczdName</field_name>
  3668 + <field_name>xl_dir</field_name>
2557 3669 <key_value>29</key_value>
2558   - <target_name>fcno29_zdname</target_name>
  3670 + <target_name>fcno29_xldir</target_name>
2559 3671 <target_type>String</target_type>
2560 3672 <target_format/>
2561 3673 <target_length>-1</target_length>
... ... @@ -2567,9 +3679,9 @@
2567 3679 <target_aggregation_type>-</target_aggregation_type>
2568 3680 </field>
2569 3681 <field>
2570   - <field_name>bc_type</field_name>
  3682 + <field_name>isfb</field_name>
2571 3683 <key_value>29</key_value>
2572   - <target_name>fcno29_bctype</target_name>
  3684 + <target_name>fcno29_isfb</target_name>
2573 3685 <target_type>String</target_type>
2574 3686 <target_format/>
2575 3687 <target_length>-1</target_length>
... ... @@ -2636,6 +3748,34 @@
2636 3748 <target_null_string/>
2637 3749 <target_aggregation_type>-</target_aggregation_type>
2638 3750 </field>
  3751 + <field>
  3752 + <field_name>xl_dir</field_name>
  3753 + <key_value>30</key_value>
  3754 + <target_name>fcno30_xldir</target_name>
  3755 + <target_type>String</target_type>
  3756 + <target_format/>
  3757 + <target_length>-1</target_length>
  3758 + <target_precision>-1</target_precision>
  3759 + <target_decimal_symbol/>
  3760 + <target_grouping_symbol/>
  3761 + <target_currency_symbol/>
  3762 + <target_null_string/>
  3763 + <target_aggregation_type>-</target_aggregation_type>
  3764 + </field>
  3765 + <field>
  3766 + <field_name>isfb</field_name>
  3767 + <key_value>30</key_value>
  3768 + <target_name>fcno30_isfb</target_name>
  3769 + <target_type>String</target_type>
  3770 + <target_format/>
  3771 + <target_length>-1</target_length>
  3772 + <target_precision>-1</target_precision>
  3773 + <target_decimal_symbol/>
  3774 + <target_grouping_symbol/>
  3775 + <target_currency_symbol/>
  3776 + <target_null_string/>
  3777 + <target_aggregation_type>-</target_aggregation_type>
  3778 + </field>
2639 3779 </fields>
2640 3780 <cluster_schema/>
2641 3781 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
... ... @@ -2711,6 +3851,14 @@
2711 3851 <rename/>
2712 3852 <length>-2</length>
2713 3853 <precision>-2</precision>
  3854 + </field> <field> <name>xl_dir</name>
  3855 + <rename/>
  3856 + <length>-2</length>
  3857 + <precision>-2</precision>
  3858 + </field> <field> <name>isfb</name>
  3859 + <rename/>
  3860 + <length>-2</length>
  3861 + <precision>-2</precision>
2714 3862 </field> <select_unspecified>N</select_unspecified>
2715 3863 </fields> <cluster_schema/>
2716 3864 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
... ... @@ -2763,6 +3911,14 @@
2763 3911 <rename/>
2764 3912 <length>-2</length>
2765 3913 <precision>-2</precision>
  3914 + </field> <field> <name>xl_dir</name>
  3915 + <rename/>
  3916 + <length>-2</length>
  3917 + <precision>-2</precision>
  3918 + </field> <field> <name>isfb</name>
  3919 + <rename/>
  3920 + <length>-2</length>
  3921 + <precision>-2</precision>
2766 3922 </field> <select_unspecified>N</select_unspecified>
2767 3923 </fields> <cluster_schema/>
2768 3924 <remotesteps> <input> </input> <output> </output> </remotesteps> <GUI>
... ... @@ -3007,7 +4163,7 @@
3007 4163 <schema_name/>
3008 4164 </partitioning>
3009 4165 <connection>bus_control_variable</connection>
3010   - <sql>select &#xa;t.id as id&#xa;, g.lp_name as lp&#xa;, g.xl as xl&#xa;, qdz&#xa;, zdz&#xa;, tcc&#xa;, fcsj&#xa;, bc_type &#xa;, bcs&#xa;, fcno&#xa;, xl_dir&#xa;from bsth_c_s_ttinfo_detail t left join &#xa;bsth_c_s_gbi g on t.lp &#x3d; g.id &#xa;where &#xa;g.xl &#x3d; &#x3f; and&#xa;t.ttinfo &#x3d; &#x3f; &#xa;order by t.bcs asc</sql>
  4166 + <sql>select &#xa;t.id as id&#xa;, g.lp_name as lp&#xa;, g.xl as xl&#xa;, qdz&#xa;, zdz&#xa;, tcc&#xa;, fcsj&#xa;, bc_type &#xa;, bcs&#xa;, fcno&#xa;, xl_dir&#xa;, isfb&#xa;from bsth_c_s_ttinfo_detail t left join &#xa;bsth_c_s_gbi g on t.lp &#x3d; g.id &#xa;where &#xa;g.xl &#x3d; &#x3f; and&#xa;t.ttinfo &#x3d; &#x3f; &#xa;order by t.bcs asc</sql>
3011 4167 <limit>0</limit>
3012 4168 <lookup>&#x83b7;&#x53d6;&#x53d8;&#x91cf;</lookup>
3013 4169 <execute_each_row>N</execute_each_row>
... ...
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/detail_info.html
  View file @a76978b
... ... @@ -38,6 +38,15 @@
38 38 <span class="caption-subject bold uppercase" ng-bind="ctrl.title"></span>
39 39 </div>
40 40 <div class="actions">
  41 + <i class="fa fa-arrow-up" aria-hidden="true"></i>
  42 + <span style="padding-right: 10px;">上行班次</span>
  43 + <i class="fa fa-arrow-down" aria-hidden="true"></i>
  44 + <span style="padding-right: 10px;">下行班次</span>
  45 + <i class="fa fa-circle-o-notch" aria-hidden="true"></i>
  46 + <span style="padding-right: 10px;">区间班次</span>
  47 + <i class="fa fa-adjust" aria-hidden="true"></i>
  48 + <span style="padding-right: 10px;">分班班次</span>
  49 +
41 50 <div class="btn-group">
42 51 <a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">
43 52 <i class="fa fa-share"></i>
... ... @@ -53,7 +62,7 @@
53 62 </li>
54 63 <li class="divider"></li>
55 64 <li>
56   - <a href="javascript:" class="tool-action">
  65 + <a href="javascript:" class="tool-action" ng-click="ctrl.refresh()">
57 66 <i class="fa fa-refresh"></i>
58 67 刷行数据
59 68 </a>
... ... @@ -84,7 +93,14 @@
84 93  
85 94 <div ng-if="cell.ttdid" class="btn-group">
86 95 <a href="javascript:" class="btn blue btn-outline btn-circle" data-toggle="dropdown">
87   - <i class="fa fa-share"></i>
  96 + <!-- 上下行图标 -->
  97 + <i ng-if="cell.xldir == '0'" class="fa fa-arrow-up" aria-hidden="true"></i>
  98 + <i ng-if="cell.xldir == '1'" class="fa fa-arrow-down" aria-hidden="true"></i>
  99 + <!-- 班次类型图标（区间班次） -->
  100 + <i ng-if="cell.bc_type == 'region'" class="fa fa-circle-o-notch" aria-hidden="true"></i>
  101 + <!-- 分班班次 -->
  102 + <i ng-if="cell.isfb == true" class="fa fa-adjust" aria-hidden="true"></i>
  103 +
88 104 <span ng-bind="cell.fcsj"></span>
89 105 <i class="fa fa-angle-down"></i>
90 106 </a>
... ... @@ -96,18 +112,32 @@
96 112 </a>
97 113 </li>
98 114 <li>
99   - <a href="javascript:" class="tool-action" ui-sref="timeTableDetailInfoManage_detail_edit({id: cell.ttdid, xlid: ctrl.xlid, ttid: ctrl.ttid, xlname: ctrl.xlname, ttname: ctrl.ttname})">
100   - <i class="fa fa-file-excel-o"></i>
101   - 分班
  115 + <a href="javascript:" class="tool-action">
  116 + <i class="fa fa-refresh"></i>
  117 + 删除
102 118 </a>
103 119 </li>
104 120 <li class="divider"></li>
105 121 <li>
106   - <a href="javascript:" class="tool-action">
107   - <i class="fa fa-refresh"></i>
108   - 删除
  122 + <a href="javascript:" class="tool-action" ng-click="ctrl.changeDirect(cell)">
  123 + <i class="fa fa-file-excel-o"></i>
  124 + 设置反向
  125 + </a>
  126 + </li>
  127 + <li>
  128 + <a href="javascript:" class="tool-action" ng-click="ctrl.changeFB(cell, true)">
  129 + <i class="fa fa-file-excel-o"></i>
  130 + 设置分班
109 131 </a>
110 132 </li>
  133 + <li>
  134 + <a href="javascript:" class="tool-action" ng-click="ctrl.changeFB(cell, false)">
  135 + <i class="fa fa-file-excel-o"></i>
  136 + 取消分班
  137 + </a>
  138 + </li>
  139 +
  140 +
111 141 </ul>
112 142 </div>
113 143  
... ...
src/main/resources/static/pages/scheduleApp/module/core/timeTableManage/timeTableDetailManage.js
  View file @a76978b
... ... @@ -52,6 +52,67 @@ angular.module(&#39;ScheduleApp&#39;).controller(&#39;TimeTableDetailManageCtrl&#39;, [&#39;TimeTabl
52 52 }
53 53 );
54 54  
  55 + // 刷新数据
  56 + self.refresh = function() {
  57 + timeTableDetailManageService.getEditInfo(self.xlid, self.ttid).then(
  58 + function(result) {
  59 + // TODO；获取数据待展示
  60 + self.detailHeads = result.header;
  61 + self.detailInfos = result.contents;
  62 + },
  63 + function(result) {
  64 + alert("出错啦！");
  65 + }
  66 + );
  67 + };
  68 +
  69 + /**
  70 + * 反向操作。
  71 + * @param cell 明细信息
  72 + */
  73 + self.changeDirect = function(detailInfo) {
  74 + timeTableDetailManageService.getDetail(detailInfo.ttdid).then(
  75 + function(result) {
  76 + result.xlDir = result.xlDir == "0" ? "1" : "0";
  77 + timeTableDetailManageService.saveDetail(result).then(
  78 + function(result) {
  79 + detailInfo.xldir = detailInfo.xldir == "0" ? "1" : "0";
  80 + },
  81 + function(result) {
  82 + alert("出错啦！");
  83 + }
  84 + );
  85 + },
  86 + function(result) {
  87 + alert("出错啦！");
  88 + }
  89 + );
  90 + };
  91 +
  92 + /**
  93 + * 更新分班。
  94 + * @param detailInfo 明细信息
  95 + * @param flag 分班标识
  96 + */
  97 + self.changeFB = function(detailInfo, flag) {
  98 + timeTableDetailManageService.getDetail(detailInfo.ttdid).then(
  99 + function(result) {
  100 + result.isFB = flag;
  101 + timeTableDetailManageService.saveDetail(result).then(
  102 + function(result) {
  103 + detailInfo.isfb = flag;
  104 + },
  105 + function(result) {
  106 + alert("出错啦！");
  107 + }
  108 + );
  109 + },
  110 + function(result) {
  111 + alert("出错啦！");
  112 + }
  113 + );
  114 + };
  115 +
55 116 }]);
56 117  
57 118 angular.module('ScheduleApp').controller('TimeTableDetailManageFormCtrl', ['TimeTableDetailManageService', '$stateParams', '$state', function(timeTableDetailManageService, $stateParams, $state) {
... ...