Improved: Used createIncomingShipment service to create shipment with…

… items instead of doing multiple calls for creating/adding shipment and items. Also used the common flow for shipment, return and po to import the json file and processing the item receiving at backend. (#402)

src/locales/en.json

@@ -79,6 +79,7 @@
   "Purchase Order": "Purchase Order",
   "Purchase Order Details": "Purchase Order Details",
   "Purchase Orders": "Purchase Orders",
+  "Purchase order received successfully" : "Purchase order received successfully {orderId}",
   "Qty": "Qty",
   "Receive": "Receive",
   "Receive All": "Receive All",

src/services/OrderService.ts

@@ -24,6 +24,14 @@ const createPurchaseShipment = async (payload: any): Promise<any> => {
   })
 }
 
+const createIncomingShipment = async (payload: any): Promise<any> => {
+  return api({
+    url: "/service/createIncomingShipment",
+    method: "POST",
+    data: payload
+  })
+}
+
 const fetchPOHistory = async (payload: any): Promise<any> => {
   return api({
     url: "/performFind",
@@ -43,6 +51,7 @@ const updatePOItemStatus = async (payload: any): Promise<any> => {
 export const OrderService = {
   fetchPurchaseOrders,
   fetchPODetail,
+  createIncomingShipment,
   createPurchaseShipment,
   fetchPOHistory,
   updatePOItemStatus

src/store/modules/order/actions.ts

@@ -164,6 +164,50 @@ const actions: ActionTree<OrderState, RootState> = {
     return resp;
   },
 
+  async createAndReceiveIncomingShipment({ commit }, payload) {
+    let resp;
+    try {
+      payload.items.map((item: any, index: number) => {
+        item.itemSeqId = `1000${index+1}`
+        item.quantity = item.quantityAccepted
+      })
+
+      const params = {
+        orderId: payload.orderId,
+        destinationFacilityId: this.state.user.currentFacility.facilityId,
+        "type": "PURCHASE_SHIPMENT",
+        "status": "PURCH_SHIP_CREATED",
+        "items": payload.items
+      }
+      resp = await OrderService.createIncomingShipment({"payload": params})
+
+      if (resp.status === 200 && !hasError(resp) && resp.data.shipmentId) {
+        const facilityLocations = await this.dispatch('user/getFacilityLocations', this.state.user.currentFacility.facilityId);
+        if (facilityLocations.length){
+          const locationSeqId = facilityLocations[0].locationSeqId
+          payload.items.map((item: any) => {
+            item.locationSeqId = locationSeqId
+            item.quantityReceived = item.quantityAccepted ? Number(item.quantityAccepted) : 0
+          })
+        } else {
+          showToast(translate("Facility locations were not found corresponding to destination facility of PO. Please add facility locations to avoid receive PO failure."))
+        }
+        const poShipment = {
+          shipmentId : resp.data.shipmentId,
+          items: payload.items,
+          isMultiReceivingEnabled: true
+        }
+        return await this.dispatch('shipment/receiveShipmentJson', poShipment).catch((err) => console.error(err))
+      } else {
+        showToast(translate("Something went wrong"));
+      }
+    } catch(error){
+      console.error(error)
+      showToast(translate("Something went wrong"));
+    }
+    return false;
+  },
+
   async getPOHistory({ commit, state }, payload) {
     let resp;
     const current = state.current as any;
@@ -175,7 +219,8 @@ const actions: ActionTree<OrderState, RootState> = {
         },
         "entityName": "ShipmentReceiptAndItem",
         "fieldList": ["datetimeReceived", "productId", "quantityAccepted", "quantityRejected", "receivedByUserLoginId", "shipmentId", 'locationSeqId'],
-        "orderBy": 'datetimeReceived DESC'
+        "orderBy": 'datetimeReceived DESC',
+        "viewSize": "250"
       }
       const facilityLocations = await this.dispatch('user/getFacilityLocations', this.state.user.currentFacility.facilityId);
       const locationSeqId = facilityLocations.length > 0 ? facilityLocations[0].locationSeqId : "";

src/store/modules/return/actions.ts

@@ -90,6 +90,7 @@ const actions: ActionTree<ReturnState, RootState> = {
           const locationSeqId = facilityLocations[0].locationSeqId
           resp.data.items.map((item: any) => {
             item.locationSeqId = locationSeqId;
+            item.quantityReceived = item.quantityAccepted ? Number(item.quantityAccepted) : 0
           });
         } else {
           showToast(translate("Facility locations were not found corresponding to destination facility of return shipment. Please add facility locations to avoid receive return shipment failure."))

src/store/modules/shipment/actions.ts

@@ -192,7 +192,6 @@ const actions: ActionTree<ShipmentState, RootState> = {
               "statusId": "PURCH_SHIP_RECEIVED"
             })
             if (resp.status == 200 && !hasError(resp)) {
-              showToast(translate("Shipment received successfully", { shipmentId: payload.shipmentId }))
               return true;
             } else {
               throw resp.data;
@@ -205,7 +204,6 @@ const actions: ActionTree<ShipmentState, RootState> = {
         throw resp.data;
       }
     } catch (err) {
-      await dispatch('setCurrent', { shipmentId: payload.shipmentId })
       showToast(translate("Something went wrong, please try again"));
     }
     emitter.emit("dismissLoader");

src/views/PurchaseOrderDetail.vue

@@ -361,9 +361,14 @@ export default defineComponent({
     },
     async createShipment() {
       const eligibleItems = this.order.items.filter((item: any) => item.quantityAccepted > 0)
-      const resp = await this.store.dispatch('order/createPurchaseShipment', { items: eligibleItems, orderId: this.order.orderId })
-      if (resp.status === 200 && !hasError(resp)) {
+      const isShipmentReceived = await this.store.dispatch('order/createAndReceiveIncomingShipment', { items: eligibleItems, orderId: this.order.orderId })
+      if (isShipmentReceived) {
+        showToast(translate("Purchase order received successfully", { orderId: this.order.orderId }))
         this.router.push('/purchase-orders')
+      } else {
+        this.store.dispatch("order/getOrderDetail", { orderId: this.$route.params.slug }).then(() => {
+          this.store.dispatch('order/getPOHistory', { orderId: this.order.orderId })
+        })
       }
     },
     isEligibileForCreatingShipment() {

src/views/ReturnDetails.vue

@@ -55,17 +55,17 @@
             </div>
 
             <div class="product-count">
-              <ion-item v-if="isReturnReceivable(current.statusId)">
+              <ion-item v-if="isReturnReceivable(current.statusId) && item.quantityReceived === 0">
                 <ion-input :label="translate('Qty')" :disabled="isForceScanEnabled" label-placement="floating" type="number" min="0" v-model="item.quantityAccepted" />
               </ion-item>
-              <ion-item v-if="!isReturnReceivable(current.statusId)" lines="none">
+              <ion-item v-else lines="none">
                 <ion-label>{{ item.quantityAccepted }} {{ translate("received") }}</ion-label>
               </ion-item>
             </div>
           </div>
 
           <ion-item lines="none" class="border-top" v-if="item.quantityOrdered > 0">
-            <ion-button v-if="isReturnReceivable(current.statusId)" :disabled="isForceScanEnabled" @click="receiveAll(item)" slot="start" fill="outline">
+            <ion-button v-if="isReturnReceivable(current.statusId) && item.quantityReceived === 0" :disabled="isForceScanEnabled" @click="receiveAll(item)" slot="start" fill="outline">
               {{ translate("Receive All") }}
             </ion-button>
             <ion-progress-bar :color="getRcvdToOrdrdFraction(item) === 1 ? 'success' : getRcvdToOrdrdFraction(item) > 1 ? 'danger' : 'primary'" :value="getRcvdToOrdrdFraction(item)" />
@@ -228,9 +228,13 @@ export default defineComponent({
     async receiveReturn() {
       const eligibleItems = this.current.items.filter((item: any) => item.quantityAccepted > 0)
       const shipmentId = this.current.shipment ? this.current.shipment.shipmentId : this.current.shipmentId 
-      let resp = await this.store.dispatch('return/receiveReturn', { items: eligibleItems, shipmentId });
-      if(resp.status === 200 && !hasError(resp)) {
+      let isReturnReceived = await this.store.dispatch('shipment/receiveShipmentJson', { items: eligibleItems, shipmentId });
+      if (isReturnReceived) {
+        showToast(translate("Return received successfully", { shipmentId: shipmentId }))
         this.router.push('/returns');
+      } else {
+        showToast(translate('Something went wrong'));
+        await this.store.dispatch('return/setCurrent', { shipmentId: this.$route.params.id })
       }
     },
     isEligibleForReceivingReturns() {

src/views/ShipmentDetails.vue

@@ -227,6 +227,7 @@ export default defineComponent({
       const shipmentId = this.current.shipment ? this.current.shipment.shipmentId : this.current.shipmentId 
       const isShipmentReceived = await this.store.dispatch('shipment/receiveShipmentJson', { items: eligibleItems, shipmentId })
       if (isShipmentReceived) {
+        showToast(translate("Shipment received successfully", { shipmentId: shipmentId }))
         this.router.push('/shipments');
       } else {
         showToast(translate("Failed to receive shipment"))