x

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

@@ -76,12 +76,15 @@ public class PrformaInvoiceServiceImpl implements PrformaInvoiceService {
 			}
 			if(partnerList != null) {
 				for(HEADER_PARTNER_DATA HEADER_PARTNER_DATA : partnerList) {
-					if("AG".equals(HEADER_PARTNER_DATA.getPARVW())) {
+					String PARVW = HEADER_PARTNER_DATA.getPARVW();
+					if("AG".equals(PARVW)) {
 						headMap.put("PARTNER_PARVW1", HEADER_PARTNER_DATA.getPARVW());
 						headMap.put("PARTNER_PARTN1", HEADER_PARTNER_DATA.getPARTN());
-					} else if("WE".equals(HEADER_PARTNER_DATA.getPARVW())) {
+					} else if("WE".equals(PARVW)) {
 						headMap.put("PARTNER_PARVW2", HEADER_PARTNER_DATA.getPARVW());
 						headMap.put("PARTNER_PARTN2", HEADER_PARTNER_DATA.getPARTN());
+					} else {
+						throw new XRException("Partner type undefined [" + PARVW + "] in HEADER_PARTNER_DATA");
 					}
 				}
 			}

src/main/java/com/egolm/sso/services/shipping_notfirmation/ShippingNotificationServiceImpl.java

@@ -65,7 +65,6 @@ public class ShippingNotificationServiceImpl implements ShippingNotificationServ
 			header.put("DELIVERY_GEWEI", HEADER_DELIVERY.getGEWEI());
 			header.put("DELIVERY_CMGST", HEADER_DELIVERY.getCMGST());
 			header.put("DELIVERY_VKORG", HEADER_DELIVERY.getVKORG());
-			
 			List<HEADER_PARTNER> HEADER_PARTNERs = HEADER_DELIVERY.getHEADER_PARTNER();
 			for(int i=0; i<HEADER_PARTNERs.size(); i++) {
 				HEADER_PARTNER HEADER_PARTNER = HEADER_PARTNERs.get(i);
@@ -75,23 +74,22 @@ public class ShippingNotificationServiceImpl implements ShippingNotificationServ
 				String NAME2 = HEADER_PARTNER.getNAME2();
 				String POSTL_COD1 = HEADER_PARTNER.getPOSTL_COD1();
 				String CITY1 = HEADER_PARTNER.getCITY1();
-				if(PARTNER_Q!=null) {
-					header.put("PARTNER_Q"+(i+1), PARTNER_Q);
-				}
-				if(PARTNER_ID!=null) {
-					header.put("PARTNER_ID"+(i+1), PARTNER_ID);
-				}
-				if(NAME1!=null) {
-					header.put("PARTNER_NAME1_"+(i+1), NAME1);
-				}
-				if(NAME2!=null) {
-					header.put("PARTNER_NAME2_"+(i+1), NAME2);
-				}
-				if(POSTL_COD1!=null) {
-					header.put("PARTNER_POSTLCOD1_"+(i+1), POSTL_COD1);
-				}
-				if(CITY1!=null) {
-					header.put("PARTNER_CITY1_"+(i+1), CITY1);
+				if("AG".equals(PARTNER_Q)) {
+					header.put("PARTNER_Q1", PARTNER_Q);
+					header.put("PARTNER_ID1", PARTNER_ID);
+					header.put("PARTNER_NAME1_1", NAME1);
+					header.put("PARTNER_NAME2_1", NAME2);
+					header.put("PARTNER_POSTLCOD1_1", POSTL_COD1);
+					header.put("PARTNER_CITY1_1", CITY1);
+				} else if("WE".equals(PARTNER_Q)) {
+					header.put("PARTNER_Q2", PARTNER_Q);
+					header.put("PARTNER_ID2", PARTNER_ID);
+					header.put("PARTNER_NAME1_2", NAME1);
+					header.put("PARTNER_NAME2_2", NAME2);
+					header.put("PARTNER_POSTLCOD1_2", POSTL_COD1);
+					header.put("PARTNER_CITY1_2", CITY1);
+				} else {
+					throw new XRException("Partner type undefined [" + PARTNER_Q + "] in HEADER_PARTNER");
 				}
 			}
 			List<HEADER_DATE> HEADER_DATEs= HEADER_DELIVERY.getHEADER_DATE();