@things-factory/worksheet-base 4.0.0-alpha.7 → 4.0.0-beta.1

package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.ts

@@ -18,7 +18,7 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
     context: any
   ): Promise<Boolean> {
     const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
-    
+
     try {
       let worksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
         where: { id: worksheetId },
@@ -48,137 +48,135 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
       const inventoryAssignmentSetting: Setting = await tx.getRepository(Setting).findOne({
         where: { domain, name: 'rule-for-inventory-assignment' }
       })
-      const inventoryAssignment = inventoryAssignmentSetting.value
 
       await Promise.all(
         selectedItems.map(async (oi: OrderInventory) => {
-          let selectedIds = JSON.parse(oi.extraJsonData).map(itm => itm.id)
-          let totalReleaseQty = oi.releaseQty
-
-          let pOrderInventories = tx.getRepository(OrderInventory).find({
-            where: { refWorksheetId: worksheet.id, id: In(selectedIds), status: ORDER_INVENTORY_STATUS.PENDING_SPLIT },
-            relations: ['product', 'releaseGood', 'bizplace'],
-            order: {
-              releaseQty: 'DESC'
-            }
-          })
-
-          let inventoryList = await inventoriesByStrategy(
-            { ...oi, worksheetId: worksheet.id, bizplaceId, pickingStrategy, inventoryAssignment },
-            tx
-          )
-
-          if (!(inventoryList.items.length > 0)) return {orderInventory: oi, error_code: 'nos', error_description:'Insufficient stock for allocation'}
-
-          const worksheetDetails = _composeWorksheetDetails(oi, inventoryList.items)
-
-          // Sort all release qty from highest to lowest
-          let prevOrdInvs: OrderInventory[] = await pOrderInventories
-          prevOrdInvs = prevOrdInvs.sort(function (a, b) {
-            return b.releaseQty - a.releaseQty
-          })
-
-          const selectedOrdInvs: OrderInventory[] = worksheetDetails
-            .map((wsd: any) => wsd.targetInventory)
-            .sort(function (a, b) {
-              return b.releaseQty - a.releaseQty
-            })
-
-          let j = 0
-
-          for (var i: number = 0; i < prevOrdInvs.length; i++) {
-            let prevOrdInv: OrderInventory = prevOrdInvs[i] //PENDING_SPLIT
-            let requiredQty: number = prevOrdInv.releaseQty
-            let requiredUomValue: number = prevOrdInv.releaseUomValue
-
-            while (j < selectedOrdInvs.length && requiredQty > 0) {
-              let selectedOrdInv: any = selectedOrdInvs[j]
-              let remainingQty: number = selectedOrdInv.releaseQty
-              let remainingUomValue: number = selectedOrdInv.releaseUomValue
-
-              if (remainingQty == 0) {
-                j = j + 1
-                continue
-              }
-
-              let inventory: Inventory = selectedOrdInv.inventory
-
-              // Negative means fulfilled, positive mean current inventory is insufficient to fulfil all qty
-              const fulfiledQty: number = requiredQty - remainingQty // 2 - 5 || 2 - 2 || 2 - 1
-              const fulfiledUomValue: number = Math.round((requiredUomValue - remainingUomValue) * 100) / 100
-
-              // Create new order inventory with new status -> READY_TO_PICK
-              let newTargetInventory: OrderInventory = new OrderInventory()
-
-              newTargetInventory = {
-                domain: domain,
-                bizplace: prevOrdInv.bizplace,
-                name: OrderNoGenerator.orderInventory(),
-                releaseGood: prevOrdInv.releaseGood,
-                batchId: prevOrdInv.batchId,
-                status: ORDER_INVENTORY_STATUS.READY_TO_PICK,
-                type: selectedOrdInv.type,
-                refWorksheetId: prevOrdInv.refWorksheetId,
-                product: prevOrdInv.product,
-                packingType: prevOrdInv.packingType,
-                packingSize: parseFloat(prevOrdInv.packingSize),
-                creator: user,
-                inventory: inventory,
-                releaseQty: fulfiledQty <= 0 ? requiredQty : remainingQty,
-                releaseUomValue: fulfiledUomValue <= 0 ? requiredUomValue : remainingUomValue
+          try {
+            let pOrderInventories = tx.getRepository(OrderInventory).find({
+              where: {
+                refWorksheetId: worksheet.id,
+                product: { id: oi.productId },
+                batchId: oi.batchId,
+                packingType: oi.packingType,
+                packingSize: oi.packingSize,
+                status: ORDER_INVENTORY_STATUS.PENDING_SPLIT
+              },
+              relations: ['product', 'releaseGood', 'bizplace'],
+              order: {
+                releaseQty: 'DESC'
               }
+            })
 
-              newTargetInventory = await tx.getRepository(OrderInventory).save(newTargetInventory)
-
-              remainingQty = remainingQty - requiredQty
-              remainingUomValue = Math.round((remainingUomValue - requiredUomValue) * 100) / 100
-
-              requiredQty = fulfiledQty <= 0 ? 0 : fulfiledQty
-              requiredUomValue = fulfiledUomValue <= 0 ? 0 : fulfiledUomValue
-
-              let qbInv = tx.getRepository(Inventory).createQueryBuilder("inv")              
-                .update(Inventory)
-                .set({ lockedUomValue: () => `COALESCE(locked_uom_value,0) + ${newTargetInventory.releaseUomValue}`, lockedQty: () => `COALESCE(locked_qty,0) + ${newTargetInventory.releaseQty}` })
-                .where("id = :id", { id: inventory.id })
-              
-              await qbInv.execute()
-
-              // Generate Worksheet Detail
-              let newWorksheetDetail: WorksheetDetail = new WorksheetDetail()
-              newWorksheetDetail = {
-                ...newWorksheetDetail,
-                domain: domain,
-                worksheet: worksheet,
-                bizplace: prevOrdInv.bizplace,
-                name: WorksheetNoGenerator.batchPickingDetail(),
-                targetInventory: newTargetInventory,
-                type: WORKSHEET_TYPE.BATCH_PICKING,
-                status: WORKSHEET_STATUS.DEACTIVATED,
-                creator: user
+            let pInventoryList = inventoriesByStrategy(
+              {
+                ...oi,
+                worksheetId: worksheet.id,
+                bizplaceId,
+                pickingStrategy,
+                locationSortingRules: inventoryAssignmentSetting ? JSON.parse(inventoryAssignmentSetting.value) : false
+              },
+              domain,
+              tx
+            )
+
+            let idx = 0
+            let [orderInventories, inventoryList] = await Promise.all([pOrderInventories, pInventoryList])
+
+            for (let oiIdx = 0; oiIdx < orderInventories.length; oiIdx++) {
+              const orderInventory: OrderInventory = orderInventories[oiIdx]
+
+              let { releaseQty, releaseUomValue } = orderInventory
+
+              while (releaseQty > 0 && idx < inventoryList.items.length) {
+                let targetInventory: Inventory = await tx
+                  .getRepository(Inventory)
+                  .findOne({ where: { id: inventoryList.items[idx].id } })
+
+                let inventoryAvailableQty = targetInventory.qty - (targetInventory?.lockedQty || 0)
+                let inventoryAvailableUomValue = targetInventory.uomValue - (targetInventory?.lockedUomValue || 0)
+
+                if (inventoryAvailableQty > 0) {
+                  let allocatedQty = 0,
+                    allocatedUomValue = 0
+                  if (inventoryAvailableQty < releaseQty) {
+                    idx = idx + 1
+                    allocatedQty = inventoryAvailableQty
+                    allocatedUomValue = inventoryAvailableUomValue
+                  } else {
+                    allocatedQty = releaseQty
+                    allocatedUomValue = releaseUomValue
+                  }
+
+                  releaseQty = releaseQty - allocatedQty
+                  releaseUomValue = releaseUomValue - allocatedUomValue
+
+                  //// Update inventory locked quantity
+                  let qbInv = tx
+                    .getRepository(Inventory)
+                    .createQueryBuilder('inv')
+                    .update(Inventory)
+                    .set({
+                      lockedUomValue: () => `COALESCE(locked_uom_value,0) + ${allocatedUomValue}`,
+                      lockedQty: () => `COALESCE(locked_qty,0) + ${allocatedQty}`
+                    })
+                    .where('id = :id', { id: targetInventory.id })
+                  await qbInv.execute()
+
+                  // Create new order inventory with status -> READY_TO_PICK, type -> RELEASE_OF_GOODS
+                  let newTargetInventory: OrderInventory = new OrderInventory()
+                  newTargetInventory = {
+                    domain: domain,
+                    bizplace: orderInventory.bizplace,
+                    name: OrderNoGenerator.orderInventory(),
+                    releaseGood: orderInventory.releaseGood,
+                    batchId: orderInventory.batchId,
+                    status: ORDER_INVENTORY_STATUS.READY_TO_PICK,
+                    type: ORDER_TYPES.RELEASE_OF_GOODS,
+                    refWorksheetId: orderInventory.refWorksheetId,
+                    product: orderInventory.product,
+                    packingType: orderInventory.packingType,
+                    packingSize: parseFloat(orderInventory.packingSize),
+                    creator: user,
+                    inventory: targetInventory,
+                    releaseQty: allocatedQty,
+                    releaseUomValue: allocatedUomValue
+                  }
+                  newTargetInventory = await tx.getRepository(OrderInventory).save(newTargetInventory)
+
+                  // Generate Worksheet Detail with status -> DEACTIVATED, type -> BATCH_PICKING
+                  let newWorksheetDetail: WorksheetDetail = new WorksheetDetail()
+                  newWorksheetDetail = {
+                    ...newWorksheetDetail,
+                    domain: domain,
+                    worksheet: worksheet,
+                    bizplace: orderInventory.bizplace,
+                    name: WorksheetNoGenerator.batchPickingDetail(),
+                    targetInventory: newTargetInventory,
+                    type: WORKSHEET_TYPE.BATCH_PICKING,
+                    status: WORKSHEET_STATUS.DEACTIVATED,
+                    creator: user
+                  }
+                  await tx.getRepository(WorksheetDetail).save(newWorksheetDetail)
+                } else {
+                  idx = idx + 1
+                }
               }
 
-              await tx.getRepository(WorksheetDetail).save(newWorksheetDetail)
-
-              selectedOrdInv.releaseQty = remainingQty <= 0 ? 0 : remainingQty
-              selectedOrdInv.releaseUomValue = remainingUomValue <= 0 ? 0 : remainingUomValue
-
-              // insufficient qty for current order inventory, use the next inventory qty
-              if (selectedOrdInv.releaseQty == 0) {
-                j = j + 1
-              }
+              //Update Current Order Inventory status -> COMPLETE_SPLIT
+              await tx
+                .getRepository(OrderInventory)
+                .update(
+                  { id: orderInventory.id },
+                  { status: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT, updater: user, updatedAt: new Date() }
+                )
             }
-
-            await tx
-              .getRepository(OrderInventory)
-              .update(
-                { id: prevOrdInvs[i].id },
-                { status: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT, updater: user, updatedAt: new Date() }
-              )
+            return { orderInventory: oi, status: 'success', message: null }
+          } catch (error) {
+            return { orderInventory: oi, status: 'error', message: error }
           }
-          return {orderInventory: oi, error_code: null, error_description:null}
         })
       )
-      
+
       return true
     } catch (error) {
       throw error
@@ -194,50 +192,3 @@ export const generateBatchPickingWorksheetDetailsByBulkResolver = {
     }
   }
 }
-
-function _composeWorksheetDetails(record, inventories) {
-  let leftReleaseQty = record.releaseQty
-  let leftReleaseUomValue = record.releaseUomValue
-  let compReleaseQty = 0
-  let compReleaseUomValue = 0
-
-  let worksheetDetails = []
-  let idx = 0
-  while (compReleaseQty < record.releaseQty && inventories[idx]) {
-    const inv = inventories[idx]
-
-    if (inv.qty > leftReleaseQty) {
-      compReleaseQty += leftReleaseQty
-      compReleaseUomValue += leftReleaseUomValue
-
-      worksheetDetails.push({
-        targetInventory: {
-          inventory: inv,
-          releaseQty: leftReleaseQty,
-          releaseUomValue: leftReleaseUomValue,
-          product: { id: record.productId },
-          type: ORDER_TYPES.RELEASE_OF_GOODS
-        }
-      })
-    } else {
-      compReleaseQty += inv.qty
-      compReleaseUomValue += inv.uomValue
-      leftReleaseQty -= inv.qty
-      leftReleaseUomValue -= inv.uomValue
-
-      worksheetDetails.push({
-        targetInventory: {
-          inventory: inv,
-          releaseQty: inv.qty,
-          releaseUomValue: inv.uomValue,
-          product: { id: record.productId },
-          type: ORDER_TYPES.RELEASE_OF_GOODS
-        }
-      })
-    }
-
-    idx++
-  }
-
-  return worksheetDetails
-}

package/server/graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details.ts

@@ -11,7 +11,7 @@ import { WorksheetNoGenerator } from '../../../utils'
 export const generateReleaseGoodWorksheetDetailsResolver = {
   async generateReleaseGoodWorksheetDetails(
     _: any,
-    { worksheetNo, batchId, productId, packingType, worksheetDetails },
+    { worksheetNo, batchId, productId, packingType, packingSize, worksheetDetails },
     context: any
   ): Promise<void> {
     const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
@@ -59,6 +59,7 @@ export const generateReleaseGoodWorksheetDetailsResolver = {
           status: ORDER_INVENTORY_STATUS.READY_TO_PICK,
           product: await tx.getRepository(Product).findOne(productId),
           packingType,
+          packingSize,
           creator: user,
           updater: user
         })

package/server/graphql/resolvers/worksheet-detail/worksheet-details-by-product-group.ts

@@ -8,7 +8,7 @@ import { Worksheet, WorksheetDetail } from '../../../entities'
 export const worksheetDetailsByProductGroupResolver = {
   async worksheetDetailsByProductGroup(
     _: any,
-    { worksheetNo, batchId, productName, productSku, packingType },
+    { worksheetNo, batchId, productName, productSku, packingType, packingSize },
     context: any
   ) {
     const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
@@ -34,6 +34,7 @@ export const worksheetDetailsByProductGroupResolver = {
       .andWhere('"PROD"."name" = :productName', { productName: productName })
       .andWhere('"PROD"."sku" = :productSku', { productSku: productSku })
       .andWhere('"ORD_INV"."packing_type" = :packingType', { packingType: packingType })
+      .andWhere('"ORD_INV"."packing_size" = :packingSize', { packingSize: packingSize })
 
     if (bizplaceId && releaseGoodId) {
       qb.andWhere('"WSD"."bizplace_id" = :bizplaceId', { bizplaceId: bizplaceId })

package/server/graphql/types/index.ts

@@ -1,9 +1,10 @@
+import * as Pallet from './pallet'
 import * as Worksheet from './worksheet'
 import * as WorksheetDetail from './worksheet-detail'
 import * as WorksheetMovement from './worksheet-movement'
 
 export const queries = [Worksheet.Query, WorksheetDetail.Query, WorksheetMovement.Query]
 
-export const mutations = [Worksheet.Mutation, WorksheetDetail.Mutation, WorksheetMovement.Mutation]
+export const mutations = [Worksheet.Mutation, WorksheetDetail.Mutation, WorksheetMovement.Mutation, Pallet.Mutation]
 
 export const types = [...Worksheet.Types, ...WorksheetDetail.Types, ...WorksheetMovement.Types]

package/server/graphql/types/pallet/index.ts

@@ -0,0 +1,6 @@
+export const Mutation = /* GraphQL */ `
+  palletOutbound(
+    refOrderNo: String!
+    patches: [PalletPatch]!
+  ): Boolean @transaction
+`

package/server/graphql/types/worksheet/airwaybill.ts

@@ -0,0 +1,7 @@
+import { gql } from 'apollo-server-koa'
+
+export const AirwayBill = gql`
+  type AirwayBill {
+    airwayBill: String
+  }
+`

package/server/graphql/types/worksheet/index.ts

@@ -1,3 +1,4 @@
+import { AirwayBill } from './airwaybill'
 import { ArrivalNoticeWorksheet } from './arrival-notice-worksheet'
 import { ContactPointInfo } from './contact-point-info'
 import { CycleCountWorksheet } from './cycle-count-worksheet'
@@ -60,6 +61,10 @@ export const Mutation = /* GraphQL */ `
     releaseGoodNo: String!
   ): ReleaseGoodWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  fetchSellercraftAirwayBill (
+    releaseGoodNo: String!
+  ): AirwayBill @privilege(category: "worksheet_control", privilege: "mutation") @transaction
+
   generateSortingWorksheet (
     worksheetNo: String!
   ): ReleaseGoodWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
@@ -77,6 +82,7 @@ export const Mutation = /* GraphQL */ `
     executionDate: String!
     customerId: String!
     orderInventoryIds: [String]
+    orderInventories: [OrderInventoryPatch]
     limit: Int
   ): CycleCountWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
@@ -138,7 +144,7 @@ export const Mutation = /* GraphQL */ `
   ): Boolean @transaction
 
   worksheetDetailsByProductGroup (
-    worksheetNo: String!, batchId: String!, productName: String!, packingType: String!
+    worksheetNo: String!, batchId: String!, productName: String!, packingType: String!, packingSize: Float!
   ): WorksheetDetailList @transaction
 
   activatePicking (
@@ -502,6 +508,7 @@ export const Mutation = /* GraphQL */ `
     batchId: String!
     productId: String!
     packingType: String!
+    packingSize: Float!
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   assignPickingWorker (
@@ -565,7 +572,7 @@ export const Query = /* GraphQL */ `
 
   packingWorksheet (
     releaseGoodNo: String!
-  ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
+  ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query") @transaction
 
   vasWorksheet (
     orderNo: String!, orderType: String!
@@ -657,6 +664,7 @@ export const Query = /* GraphQL */ `
 
 export const Types = /* GraphQL */ [
   Worksheet,
+  AirwayBill,
   NewWorksheet,
   WorksheetPatch,
   WorksheetList,

package/server/graphql/types/worksheet/worksheet-info.ts

@@ -10,6 +10,8 @@ export const WorksheetInfo = gql`
     customerCompanyDomainId: String
     bizplace: Bizplace
     containerNo: String
+    airwayBill: String
+    invoice: String
     shippingProvider: String
     trackingNo: String
     platform: String

package/server/graphql/types/worksheet-detail/index.ts

@@ -24,6 +24,7 @@ export const Mutation = /* GraphQL */ `
     batchId: String!
     productId: String!
     packingType: String!
+    packingSize: Float!
     worksheetDetails: [NewWorksheetDetail]
   ): Boolean @transaction
 
@@ -51,7 +52,7 @@ export const Query = /* GraphQL */ `
   checkProgressingPallet(palletId: String!): Boolean @transaction
   generatePalletId(targets: [PalletInfo], type: String!): [InventoryDetail] @transaction
   generateCartonId(printQty: Int!, type: String!): [InventoryDetail]
-  worksheetDetailsByProductGroup(worksheetNo: String!, batchId: String!, productName: String!, productSku: String!, packingType: String!): WorksheetDetailList @transaction
+  worksheetDetailsByProductGroup(worksheetNo: String!, batchId: String!, productName: String!, productSku: String!, packingType: String!, packingSize: Float!): WorksheetDetailList @transaction
 `
 
 export const Types = [

package/server/graphql/types/worksheet-detail/inventory-detail.ts

@@ -15,6 +15,7 @@ export const InventoryDetail = gql`
     warehouse: Warehouse
     zone: String
     packingType: String
+    packingSize: Float
     qty: Int
     remainQty: Int
     otherRef: String

package/server/routes.ts

@@ -1,10 +1,12 @@
-import { renderRODO } from './controllers/render-ro-do'
-import { renderManualDO } from './controllers/render-manual-do'
 import { renderElcclGRN } from './controllers/render-elccl-grn'
+import { renderGRN } from './controllers/render-grn'
+import { renderJobSheet } from './controllers/render-job-sheet'
 import { renderKimedaGRN } from './controllers/render-kimeda-grn'
-import { renderOrientageGRN } from './controllers/render-orientage-grn'
+import { renderManualDO } from './controllers/render-manual-do'
 import { renderOrientageDO } from './controllers/render-orientage-do'
-import { renderJobSheet } from './controllers/render-job-sheet'
+import { renderOrientageGRN } from './controllers/render-orientage-grn'
+import { renderRODO } from './controllers/render-ro-do'
+import { renderSeebuuGRN } from './controllers/render-seebuu-grn'
 
 process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
   routes.get('/view_document_ro_do/:doNo', async (context, next) => {
@@ -23,7 +25,11 @@ process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
     context.body = await renderElcclGRN(context.params, context)
   })
 
-  routes.get('/view_kimeda_grn/:grnNo', async (context, next) => {
+  routes.get('/view_grn/:grnNo/:timezoneOffSet', async (context, next) => {
+    context.body = await renderGRN(context.params, context)
+  })
+
+  routes.get('/view_kimeda_grn/:grnNo/:timezoneOffSet', async (context, next) => {
     context.body = await renderKimedaGRN(context.params, context)
   })
 
@@ -31,6 +37,10 @@ process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
     context.body = await renderOrientageGRN(context.params, context)
   })
 
+  routes.get('/view_seebuu_grn/:grnNo', async (context, next) => {
+    context.body = await renderSeebuuGRN(context.params, context)
+  })
+
   routes.get('/view_job_sheet/:ganNo/:timezoneOffSet', async (context, next) => {
     context.body = await renderJobSheet(context.params, context)
   })