fixed #63: Packing list import tool updates existing shipment items i…

…n other shipments when pallet name is not provided

grails-app/domain/org/pih/warehouse/shipping/Shipment.groovy

@@ -409,6 +409,21 @@ class Shipment implements Comparable, Serializable {
  return pallet
  }
 
+ ShipmentItem findShipmentItem(InventoryItem inventoryItem, Container container) {
+ ShipmentItem shipmentItem = ShipmentItem.withCriteria(uniqueResult: true) {
+ eq('shipment', this)
+ if (container) {
+ eq('container', container)
+ }
+ else {
+ isNull('container')
+ }
+ eq('inventoryItem', inventoryItem)
+ }
+ return shipmentItem
+ }
+
+
  Collection findShipmentItemsByContainer(container) {
  return ShipmentItem?.findAllByShipmentAndContainer(this, container)
  }
@@ -437,10 +452,6 @@ class Shipment implements Comparable, Serializable {
  return null
  }
 
- ShipmentItem findShipmentItem(InventoryItem inventoryItem, Container container) {
- return ShipmentItem.findByInventoryItemAndContainer(inventoryItem, container)
- }
-
  Date dateScheduled() {
  Event event = events.find { Event event -> event?.eventType?.eventCode == EventCode.SCHEDULED }
  return event?.eventDate ?: dateCreated