Projects >> platform >>d37d77c208221802b9bacab1ebc4429f4fac0f5e

Chunk
Conflicting content 
	
	@Override
	public String toString() {
<<<<<<< HEAD
		String inventory = "transactionCode : " + transactionCode
=======
		return  "idocNumber : " + idocNumber
				+ "\nreference UID : " + refUID
				+ "\ntransactionCode : " + transactionCode
>>>>>>> 3cc6c5e0adad218a2999606d71d973163abd104d
				+ "\narticleId : " + articleId
				+ "\nissuingSite : " + issuingSite
				+ "\nreceivingSite : " + receivingSite
Solution content 
	
	@Override
	public String toString() {
		String inventory = "transactionCode : " + transactionCode
				+ "\narticleId : " + articleId
				+ "\nissuingSite : " + issuingSite
				+ "\nreceivingSite : " + receivingSite
File
InventoryTO.java
Developer's decision
Version 1
Kind of conflict
Attribute
Return statement
Variable
Chunk
Conflicting content 
			List sapInventoryAckList = inventoryIdoc.getIDOC().getZTINLADLVRY();
			for (ZTINLADLVRY sapInventoryAck : sapInventoryAckList) {
				InventoryTO inventoryTo = new InventoryTO();
<<<<<<< HEAD
				//inventoryTo.setIdocNumber(inventoryIdoc.getIDOC().getEDIDC40().getDOCNUM());
				//inventoryTo.setRefUID(inventoryIdoc.getIDOC().getEDIDC40().getMATDOC());
=======
				inventoryTo.setIdocNumber(inventoryIdoc.getIDOC().getEDIDC40().getDOCNUM());
				inventoryTo.setRefUID(sapInventoryAck.getMATDOC());
>>>>>>> 3cc6c5e0adad218a2999606d71d973163abd104d
				inventoryTo.setArticleId(sapInventoryAck.getMATNR());
				inventoryTo.setIssuingSite(sapInventoryAck.getIWERKS());
				inventoryTo.setIssuingStorageLoc(sapInventoryAck.getILGORT());
Solution content 
			List sapInventoryAckList = inventoryIdoc.getIDOC().getZTINLADLVRY();
			for (ZTINLADLVRY sapInventoryAck : sapInventoryAckList) {
				InventoryTO inventoryTo = new InventoryTO();
				//inventoryTo.setIdocNumber(inventoryIdoc.getIDOC().getEDIDC40().getDOCNUM());
				//inventoryTo.setRefUID(inventoryIdoc.getIDOC().getEDIDC40().getMATDOC());
				inventoryTo.setArticleId(sapInventoryAck.getMATNR());
				inventoryTo.setIssuingSite(sapInventoryAck.getIWERKS());
				inventoryTo.setIssuingStorageLoc(sapInventoryAck.getILGORT());
File
DeliveryInventoryIDocHandler.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
			List sapInventoryAckList = inventoryIdoc.getIDOC().getZTINLASEGDLVR();
			for (ZTINLASEGDLVR sapInventoryAck : sapInventoryAckList) {
				InventoryTO inventoryTo = new InventoryTO();
<<<<<<< HEAD
				//inventoryTo.setIdocNumber(inventoryIdoc.getIDOC().getEDIDC40().getDOCNUM());
				//inventoryTo.setRefUID(inventoryIdoc.getIDOC().getEDIDC40().getMATDOC());
=======
				inventoryTo.setIdocNumber(inventoryIdoc.getIDOC().getEDIDC40().getDOCNUM());
				inventoryTo.setRefUID(sapInventoryAck.getMATDOC());
>>>>>>> 3cc6c5e0adad218a2999606d71d973163abd104d
				inventoryTo.setArticleId(sapInventoryAck.getMATNR());
				inventoryTo.setIssuingSite(sapInventoryAck.getIWERKS());
				inventoryTo.setIssuingStorageLoc(sapInventoryAck.getILGORT());
Solution content 
			List sapInventoryAckList = inventoryIdoc.getIDOC().getZTINLASEGDLVR();
			for (ZTINLASEGDLVR sapInventoryAck : sapInventoryAckList) {
				InventoryTO inventoryTo = new InventoryTO();
				//inventoryTo.setIdocNumber(inventoryIdoc.getIDOC().getEDIDC40().getDOCNUM());
				//inventoryTo.setRefUID(inventoryIdoc.getIDOC().getEDIDC40().getMATDOC());
				inventoryTo.setArticleId(sapInventoryAck.getMATNR());
				inventoryTo.setIssuingSite(sapInventoryAck.getIWERKS());
				inventoryTo.setIssuingStorageLoc(sapInventoryAck.getILGORT());
File
InventoryIDocHandler.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
    public void setSEGMENT(int value) {
        this.segment = value;
    }
<<<<<<< HEAD

=======
    
>>>>>>> 3cc6c5e0adad218a2999606d71d973163abd104d
}
Solution content 
    public void setSEGMENT(int value) {
        this.segment = value;
    }
}
File
EDIDC40.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
    public void setSEGMENT(int value) {
        this.segment = value;
    }
<<<<<<< HEAD

=======
    
>>>>>>> 3cc6c5e0adad218a2999606d71d973163abd104d
}
Solution content 
    public void setSEGMENT(int value) {
        this.segment = value;
    }
}
File
EDIDC40.java
Developer's decision
Version 1
Kind of conflict
Blank