x

src/main/java/com/egolm/sso/services/prforma_invoice/PrformaInvoiceServiceImpl.java

@@ -68,7 +68,7 @@ public class PrformaInvoiceServiceImpl implements PrformaInvoiceService {
 			HEADER_DOCU_DATE HEADER_DOCU_DATE = Z_DT_SD_005_PERFORM_INVOICE.getHEADER_DOCU_DATE();
 			HEADER_REFERENCE_DATA HEADER_REFERENCE_DATA = Z_DT_SD_005_PERFORM_INVOICE.getHEADER_REFERENCE_DATA();
 			HEADER_BANK_DATA HEADER_BANK_DATA = Z_DT_SD_005_PERFORM_INVOICE.getHEADER_BANK_DATA();
-			HEADER_ORGANIZATIONAL_DATA HEADER_ORGANIZATIONAL_DATA = Z_DT_SD_005_PERFORM_INVOICE.getHEADER_ORGANIZATIONAL_DATA();
+			List<HEADER_ORGANIZATIONAL_DATA> HEADER_ORGANIZATIONAL_DATA_LIST = Z_DT_SD_005_PERFORM_INVOICE.getHEADER_ORGANIZATIONAL_DATA();
 			List<SUMMARY_GENERAL> summaryList = Z_DT_SD_005_PERFORM_INVOICE.getSUMMARY_GENERAL();
 			List<ITEM_DATA> itemList = Z_DT_SD_005_PERFORM_INVOICE.getITEM_DATA();
 			Long headerId = Long.valueOf(now.getTime() + "" + StringUtil.format(common.getNextval("T_PERFORM_INVOICE_HEADER_ID"), "00000"));
@@ -108,31 +108,26 @@ public class PrformaInvoiceServiceImpl implements PrformaInvoiceService {
 			if(HEADER_BANK_DATA != null) {
 				headMap.put("BANK_ACNUM", HEADER_BANK_DATA.getACNUM());
 			}
-			if(HEADER_ORGANIZATIONAL_DATA != null) {
-				List<String> QUALF_LIST = HEADER_ORGANIZATIONAL_DATA.getQUALF();
-				List<String> ORGID_LIST = HEADER_ORGANIZATIONAL_DATA.getORGID();
-				if(QUALF_LIST != null && ORGID_LIST != null && QUALF_LIST.size() == ORGID_LIST.size()) {
-					for(int i = 0; i < QUALF_LIST.size(); i++) {
-						String QUALF = QUALF_LIST.get(i);
-						String ORGID = ORGID_LIST.get(i);
-						if("008".equals(QUALF)) {
-							headMap.put("ORGANIZATIONAL_QUALF1", QUALF);
-							headMap.put("ORGANIZATIONAL_ORGID1", ORGID);
-						} else if("007".equals(QUALF)) {
-							headMap.put("ORGANIZATIONAL_QUALF2", QUALF);
-							headMap.put("ORGANIZATIONAL_ORGID2", ORGID);
-						} else if("006".equals(QUALF)) {
-							headMap.put("ORGANIZATIONAL_QUALF3", QUALF);
-							headMap.put("ORGANIZATIONAL_ORGID3", ORGID);
-						} else if("015".equals(QUALF)) {
-							headMap.put("ORGANIZATIONAL_QUALF4", QUALF);
-							headMap.put("ORGANIZATIONAL_ORGID4", ORGID);
-						} else {
-							throw new XRException("Organizational identity undefined [" + QUALF + "] in HEADER_ORGANIZATIONAL_DATA");
-						}
+			
+			if(HEADER_ORGANIZATIONAL_DATA_LIST != null) {
+				for(HEADER_ORGANIZATIONAL_DATA HEADER_ORGANIZATIONAL_DATA : HEADER_ORGANIZATIONAL_DATA_LIST) {
+					String QUALF = HEADER_ORGANIZATIONAL_DATA.getQUALF();
+					String ORGID = HEADER_ORGANIZATIONAL_DATA.getORGID();
+					if("008".equals(QUALF)) {
+						headMap.put("ORGANIZATIONAL_QUALF1", QUALF);
+						headMap.put("ORGANIZATIONAL_ORGID1", ORGID);
+					} else if("007".equals(QUALF)) {
+						headMap.put("ORGANIZATIONAL_QUALF2", QUALF);
+						headMap.put("ORGANIZATIONAL_ORGID2", ORGID);
+					} else if("006".equals(QUALF)) {
+						headMap.put("ORGANIZATIONAL_QUALF3", QUALF);
+						headMap.put("ORGANIZATIONAL_ORGID3", ORGID);
+					} else if("015".equals(QUALF)) {
+						headMap.put("ORGANIZATIONAL_QUALF4", QUALF);
+						headMap.put("ORGANIZATIONAL_ORGID4", ORGID);
+					} else {
+						throw new XRException("Organizational identity undefined [" + QUALF + "] in HEADER_ORGANIZATIONAL_DATA");
 					}
-				} else {
-					throw new XRException("The number of ORGID and QUALF does not match");
 				}
 			}
 			if(summaryList != null) {

src/main/java/com/egolm/sso/services/prforma_invoice/Z_MT_SD_005_PERFORM_INVOICE.java

@@ -30,7 +30,7 @@ public class Z_MT_SD_005_PERFORM_INVOICE {
 		@XmlElement(required = false, nillable=true)
 		HEADER_BANK_DATA HEADER_BANK_DATA;
 		@XmlElement(required = false, nillable=true)
-		HEADER_ORGANIZATIONAL_DATA HEADER_ORGANIZATIONAL_DATA;
+		List<HEADER_ORGANIZATIONAL_DATA> HEADER_ORGANIZATIONAL_DATA;
 		@XmlElement(required = false, nillable=true)
 		List<ITEM_DATA> ITEM_DATA;
 		@XmlElement(required = false, nillable=true)
@@ -76,14 +76,6 @@ public class Z_MT_SD_005_PERFORM_INVOICE {
 			HEADER_BANK_DATA = hEADER_BANK_DATA;
 		}
 
-		public HEADER_ORGANIZATIONAL_DATA getHEADER_ORGANIZATIONAL_DATA() {
-			return HEADER_ORGANIZATIONAL_DATA;
-		}
-
-		public void setHEADER_ORGANIZATIONAL_DATA(HEADER_ORGANIZATIONAL_DATA hEADER_ORGANIZATIONAL_DATA) {
-			HEADER_ORGANIZATIONAL_DATA = hEADER_ORGANIZATIONAL_DATA;
-		}
-
 		public List<SUMMARY_GENERAL> getSUMMARY_GENERAL() {
 			return SUMMARY_GENERAL;
 		}
@@ -99,6 +91,14 @@ public class Z_MT_SD_005_PERFORM_INVOICE {
 		public void setITEM_DATA(List<ITEM_DATA> iTEM_DATA) {
 			ITEM_DATA = iTEM_DATA;
 		}
+
+		public List<HEADER_ORGANIZATIONAL_DATA> getHEADER_ORGANIZATIONAL_DATA() {
+			return HEADER_ORGANIZATIONAL_DATA;
+		}
+
+		public void setHEADER_ORGANIZATIONAL_DATA(List<HEADER_ORGANIZATIONAL_DATA> hEADER_ORGANIZATIONAL_DATA) {
+			HEADER_ORGANIZATIONAL_DATA = hEADER_ORGANIZATIONAL_DATA;
+		}
 	}
 
 	@XmlType(name = "HEADER_GENERAL_DATA")
@@ -230,19 +230,19 @@ public class Z_MT_SD_005_PERFORM_INVOICE {
 	@XmlAccessorType(XmlAccessType.FIELD)
 	public static class HEADER_ORGANIZATIONAL_DATA {
 		@XmlElement(required = false, nillable=true)
-		List<String> QUALF;
+		String QUALF;
 		@XmlElement(required = false, nillable=true)
-		List<String> ORGID;
-		public List<String> getQUALF() {
+		String ORGID;
+		public String getQUALF() {
 			return QUALF;
 		}
-		public void setQUALF(List<String> qUALF) {
+		public void setQUALF(String qUALF) {
 			QUALF = qUALF;
 		}
-		public List<String> getORGID() {
+		public String getORGID() {
 			return ORGID;
 		}
-		public void setORGID(List<String> oRGID) {
+		public void setORGID(String oRGID) {
 			ORGID = oRGID;
 		}
 	}