Merge pull request #967 from NSSuresh11/OLE-9094

OLE-9094 : Order import profile: cannot data map copy number
openlibraryenvironment · Jan 13, 2017 · 9560589 · 9560589
2 parents 8047baf + 5052e52
commit 9560589
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 3 deletions.
diff --git a/...app/olefs/src/main/java/org/kuali/ole/oleng/service/impl/OleNGRequisitionServiceImpl.java b/...app/olefs/src/main/java/org/kuali/ole/oleng/service/impl/OleNGRequisitionServiceImpl.java
@@ -169,7 +169,7 @@ protected RequisitionItem createRequisitionItem(OleOrderRecord oleOrderRecord, i
         setItemDescription(oleOrderRecord, item);
         item.setItemTypeCode(oleTxRecord.getItemType());
         item.setItemListPrice(new KualiDecimal(oleTxRecord.getListPrice()));
-
+        item.setSingleCopyNumber(oleTxRecord.getSingleCopyNumber());
         setDiscountAndItemUnitPrice(item, oleTxRecord);
 
         if (ObjectUtils.isNotNull(oleBibRecord.getBibUUID())) {

diff --git a/ole-app/olefs/src/main/java/org/kuali/ole/select/businessobject/OleCopies.java b/ole-app/olefs/src/main/java/org/kuali/ole/select/businessobject/OleCopies.java
@@ -60,5 +60,9 @@ public interface OleCopies extends PersistableBusinessObject {
 
     public void setCaption(String caption);
 
+    public void setSingleCopyNumber(KualiInteger singleCopyNumber);
+
+    public KualiInteger getSingleCopyNumber();
+
 
 }
diff --git a/ole-app/olefs/src/main/java/org/kuali/ole/select/businessobject/OleRequisitionCopies.java b/ole-app/olefs/src/main/java/org/kuali/ole/select/businessobject/OleRequisitionCopies.java
@@ -39,6 +39,7 @@ public class OleRequisitionCopies extends PersistableBusinessObjectBase implemen
     private String volumeNumber;
 
     private PurApItem purapItem;
+    private KualiInteger singleCopyNumber;
 
     /**
      * Constructs a OleRequisitionNotesBase.java.
@@ -159,6 +160,14 @@ public void setStartingCopyNumber(KualiInteger startingCopyNumber) {
         this.startingCopyNumber = startingCopyNumber;
     }
 
+    @Override
+    public void setSingleCopyNumber(KualiInteger singleCopyNumber){
+        this.singleCopyNumber=singleCopyNumber;
+    }
+
+    public KualiInteger getSingleCopyNumber(){
+        return singleCopyNumber;
+    }
     /*@Override
     public String getInstanceId() {
         return instanceId;

diff --git a/ole-app/olefs/src/main/java/org/kuali/ole/select/document/OleRequisitionDocument.java b/ole-app/olefs/src/main/java/org/kuali/ole/select/document/OleRequisitionDocument.java
@@ -606,6 +606,7 @@ private List<OleCopy> getCopyList(OleRequisitionItem singleItem) {
                 oleRequisitionCopies.setVolumeNumber(singleItem.getOleOrderRecord().getOleTxRecord().getVolumeNumber());
             }
         }
+        oleRequisitionCopies.setSingleCopyNumber(singleItem.getSingleCopyNumber()!=null?new KualiInteger(singleItem.getSingleCopyNumber()):null);
         itemCopies.add(oleRequisitionCopies);
         List<OleCopy> oleCopyList = getOleCopyHelperService().setCopyValuesForList(itemCopies, singleItem.getItemTitleId(), singleItem.getBibTree(),singleItem.getOleERSIdentifier());
         if (oleCopyList != null && oleCopyList.size() > 0) {

diff --git a/...fs/src/main/java/org/kuali/ole/select/document/service/impl/OleCopyHelperServiceImpl.java b/...fs/src/main/java/org/kuali/ole/select/document/service/impl/OleCopyHelperServiceImpl.java
@@ -287,7 +287,11 @@ public List<OleCopy> setCopyValuesForList(List<OleCopies> itemCopies, String bib
                     volNum = volChar.size()>enumCount ? volChar.get(enumCount):"";
                     oleCopy.setEnumeration(caption + " " + volNum);
                     oleCopy.setReceiptStatus(OLEConstants.OleLineItemReceiving.NOT_RECEIVED_STATUS);
-                    oleCopy.setCopyNumber(copyNum!=null?copyNum.toString():null);
+                    if(itemCopy.getSingleCopyNumber()!=null){
+                        oleCopy.setCopyNumber(itemCopy.getSingleCopyNumber().toString());
+                    }else {
+                        oleCopy.setCopyNumber(copyNum != null ? copyNum.toString() : null);
+                    }
                     oleCopy.setPartNumber(partNumCount + "");
                     oleCopy.setBibId(bibId);
                     if (oleERSIdentifier != null) {

diff --git a/ole-app/olefs/src/main/webapp/batchFramework/controllers/olengProfileDropDownValues.js b/ole-app/olefs/src/main/webapp/batchFramework/controllers/olengProfileDropDownValues.js
@@ -645,7 +645,8 @@ var orderFields = [
     {id: 'vendorNumber', name: 'Vendor Number'},
     {id: 'vendorProfileCode', name: 'Vendor Profile Code'},
     {id: 'vendorItemIdentifier', name: 'Vendor Item Identifier'},
-    {id: 'volumeNumber', name: 'Volume Number'}
+    {id: 'volumeNumber', name: 'Volume Number'},
+    {id: 'Single Copy Number', name: 'singleCopyNumber'}
 ];
 
 var discountTypes = [