Merge branch 'newMater' of http://114.115.138.98:8900/cheng/swiftMx2Mt into newMater

swiftCore/src/main/resources/xsd/camt05300108.xsd

@@ -67,8 +67,8 @@
     <xs:complexType name="AccountStatement9">
         <xs:sequence>
             <xs:element name="Id" type="Max35Text"/>
-            <xs:element name="StmtPgntn" type="Pagination1"/>
-            <xs:element name="ElctrncSeqNb" type="Number"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="StmtPgntn" type="Pagination1"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="ElctrncSeqNb" type="Number"/>
             <xs:element maxOccurs="1" minOccurs="0" name="RptgSeq" type="SequenceRange1Choice"/>
             <xs:element maxOccurs="1" minOccurs="0" name="LglSeqNb" type="Number"/>
             <xs:element maxOccurs="1" minOccurs="0" name="CreDtTm" type="ISODateTime"/>
@@ -213,11 +213,13 @@
     <xs:complexType name="BalanceSubType1Choice">
         <xs:choice>
             <xs:element name="Cd" type="ExternalBalanceSubType1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
         </xs:choice>
     </xs:complexType>
     <xs:complexType name="BalanceType10Choice">
         <xs:choice>
             <xs:element name="Cd" type="ExternalBalanceType1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
         </xs:choice>
     </xs:complexType>
     <xs:complexType name="BalanceType13">
@@ -400,11 +402,29 @@
     <xs:complexType name="EntryTransaction10">
         <xs:sequence>
             <xs:element maxOccurs="1" minOccurs="0" name="Refs" type="TransactionReferences6"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Amt" type="ActiveOrHistoricCurrencyAndAmount"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="CdtDbtInd" type="CreditDebitCode"/>
+            <xs:element maxOccurs="unbounded" minOccurs="0" name="Avlbty" type="CashAvailability1"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="BkTxCd" type="BankTransactionCodeStructure4"/>
             <xs:element maxOccurs="1" minOccurs="0" name="RltdPties" type="TransactionParties6"/>
             <xs:element maxOccurs="1" minOccurs="0" name="RltdAgts" type="TransactionAgents5"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="LclInstrm" type="LocalInstrument2Choice"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="Purp" type="Purpose2Choice"/>
             <xs:element maxOccurs="1" minOccurs="0" name="AddtlTxInf" type="Max500Text"/>
         </xs:sequence>
     </xs:complexType>
+    <xs:complexType name="Purpose2Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalPurpose1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="LocalInstrument2Choice">
+        <xs:choice>
+            <xs:element name="Cd" type="ExternalLocalInstrument1Code"/>
+            <xs:element name="Prtry" type="Max35Text"/>
+        </xs:choice>
+    </xs:complexType>
     <xs:complexType name="TransactionReferences6">
         <xs:sequence>
             <xs:element maxOccurs="1" minOccurs="0" name="MsgId" type="Max35Text"/>
@@ -451,10 +471,10 @@
     </xs:complexType>
 
     <xs:complexType name="Party40Choice">
-        <xs:sequence>
+        <xs:choice>
             <xs:element name="Pty" type="PartyIdentification135"/>
             <xs:element name="Agt" type="BranchAndFinancialInstitutionIdentification6"/>
-        </xs:sequence>
+        </xs:choice>
     </xs:complexType>
     <xs:simpleType name="ExternalBalanceSubType1Code">
         <xs:restriction base="xs:string">
@@ -657,6 +677,18 @@
             <xs:maxLength value="4"/>
         </xs:restriction>
     </xs:simpleType>
+    <xs:simpleType name="ExternalPurpose1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ExternalLocalInstrument1Code">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+            <xs:maxLength value="35"/>
+        </xs:restriction>
+    </xs:simpleType>
     <xs:complexType name="PersonIdentification13">
         <xs:sequence>
             <xs:element maxOccurs="1" minOccurs="0" name="DtAndPlcOfBirth" type="DateAndPlaceOfBirth1"/>
@@ -882,7 +914,6 @@
             <xs:maxLength value="4"/>
         </xs:restriction>
     </xs:simpleType>
-
     <xs:complexType name="MessageIdentification2">
         <xs:sequence>
             <xs:element maxOccurs="1" minOccurs="0" name="MsgNmId" type="Max35Text"/>
@@ -891,7 +922,7 @@
     </xs:complexType>
     <xs:complexType name="TotalTransactions6">
         <xs:sequence>
-            <xs:element name="TtlNtries" type="NumberAndSumOfTransactions4"/>
+            <xs:element maxOccurs="1" minOccurs="0" name="TtlNtries" type="NumberAndSumOfTransactions4"/>
             <xs:element maxOccurs="1" minOccurs="0" name="TtlCdtNtries" type="NumberAndSumOfTransactions1"/>
             <xs:element maxOccurs="1" minOccurs="0" name="TtlDbtNtries" type="NumberAndSumOfTransactions1"/>
         </xs:sequence>