@things-factory/worksheet-base 5.0.0-alpha.5 → 5.0.0-alpha.52

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

@@ -6,6 +6,7 @@ import { DeliveryInfo } from './delivery-info'
 import { DeliveryOrderInfo } from './delivery-order-info'
 import { DeliveryWorksheet } from './delivery-worksheet'
 import { ExecutingWorksheet } from './executing-worksheet'
+import { FindReleaseOrdersByTaskNo } from './find-release-orders-by-task-no'
 import { GoodsDeliveryNote } from './goods-delivery-note'
 import { InventoryCheckWorksheet } from './inventory-check-worksheet'
 import { LoadedWorksheetDetail } from './loaded-worksheet-detail'
@@ -164,10 +165,26 @@ export const Mutation = /* GraphQL */ `
     worksheetNo: [String!]!
   ): [Worksheet] @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  undoSerialNumberPacking (
+    worksheetDetailName: String!
+    inventoryItemId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   activateBatchPicking (
     worksheetNo: String!
   ): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  undoSerialNumberPicking (
+    worksheetDetailName: String!
+    inventoryItemId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
+  sealTote (
+    sealNo: String!
+    toteNo: String!
+    orderNo: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   unload (
     worksheetDetailName: String!
     inventory: InventoryPatch!
@@ -185,6 +202,12 @@ export const Mutation = /* GraphQL */ `
     inventory: InventoryPatch!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  scanSerialNumberUnload (
+    worksheetDetailName: String!
+    serialNumber: String!
+    inventory: InventoryPatch!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   cycleCountAdjustment (
     cycleCountNo: String!
   ): Boolean @transaction
@@ -195,6 +218,11 @@ export const Mutation = /* GraphQL */ `
     inventoryIds: [String]!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  undoSerialNumberUnload (
+    worksheetDetailName: String!
+    inventoryItemId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   completeUnloadingPartially (
     arrivalNoticeNo: String!
     worksheetDetail: [WorksheetDetailPatch!]
@@ -288,9 +316,10 @@ export const Mutation = /* GraphQL */ `
     palletId: String
     cartonId: String
     locationName: String!
-    releaseQty: Int!
+    releaseQty: Float!
     binLocation: String
     serialNumber: String
+    toteNo: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductPicking (
@@ -300,6 +329,7 @@ export const Mutation = /* GraphQL */ `
     cartonId: String!
     binLocation: String
     serialNumber: String
+    toteNo: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   sortingProduct (
@@ -307,22 +337,28 @@ export const Mutation = /* GraphQL */ `
     releaseGoodNo: String!
     productId: String!
     sortingQty: Float!
+    serialNumber: String
+    toteNo: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductSorting (
     taskNo: String!
     releaseGoodNo: String!
     productBarcode: String!
+    serialNumber: String
+    toteNo: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   packing (
     worksheetDetailName: String!
-    releaseQty: Int!
+    releaseQty: Float!
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductPacking (
     worksheetDetailName: String!
     productBarcode: String!
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   batchPicking (
@@ -331,7 +367,7 @@ export const Mutation = /* GraphQL */ `
     palletId: String!
     locationName: String
     binLocationName: String
-    releaseQty: Int!
+    releaseQty: Float!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductBatchPicking (
@@ -347,7 +383,7 @@ export const Mutation = /* GraphQL */ `
     worksheetDetailName: String!
     worksheetType: String!
     palletId: String!
-    releaseQty: Int!
+    releaseQty: Float!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   inspecting (
@@ -463,7 +499,7 @@ export const Mutation = /* GraphQL */ `
   unpacking (
     worksheetDetailName: String!
     childProductId: String!
-    unpackQty: Int!
+    unpackQty: Float!
     unpackUomValue: Float!
     palletId: String
     locationName: String
@@ -514,7 +550,7 @@ export const Mutation = /* GraphQL */ `
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   assignPickingWorker (
-    worksheetId: String!
+    worksheetId: [String]!
     userId: String!
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
@@ -525,6 +561,10 @@ export const Mutation = /* GraphQL */ `
     refOrderNo: String!
     patches: [OrderVasPatch]
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
+  cancelDraftReleaseOrder (
+    name: String!
+  ): Boolean @transaction
 `
 
 export const Query = /* GraphQL */ `
@@ -655,16 +695,16 @@ export const Query = /* GraphQL */ `
   ): [Inventory] @privilege(category: "worksheet", privilege: "query")
 
   pickingAssignmentStatusByUsers(
-    bizplaceId: String!
-    name: String
-    email: String
+    filters: [Filter],
+    pagination: Pagination,
+    sortings: [Sorting]
   ): [PickingAssignmentStatus] @privilege(category: "worksheet", privilege: "query")
 
   myPickingAssignmentStatus: MyPickingAssignmentStatus @privilege(category: "worksheet", privilege: "query")
   
   recommendPutawayLocation(worksheetDetailName: String!, optCnt: Int): [Location] @privilege(category: "worksheet", privilege: "query")
 
-  findReleaseOrdersByTaskNo(taskNo: String!): [ReleaseGood] @privilege(category: "worksheet", privilege: "query") @transaction
+  findReleaseOrdersByTaskNo(taskNo: String!): FindReleaseOrdersByTaskNo @privilege(category: "worksheet", privilege: "query") @transaction
 `
 
 export const Types = /* GraphQL */ [
@@ -691,5 +731,6 @@ export const Types = /* GraphQL */ [
   ProductApproval,
   WorksheetWithPagination,
   PickingAssignmentStatus,
-  MyPickingAssignmentStatus
+  MyPickingAssignmentStatus,
+  FindReleaseOrdersByTaskNo
 ]

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

@@ -4,5 +4,6 @@ export const LoadedWorksheetDetail = gql`
   input LoadedWorksheetDetail {
     name: String!
     loadedQty: Float!
+    toteName: String
   }
 `

package/server/graphql/types/worksheet/picking-assignment-status.ts

@@ -3,7 +3,7 @@ import { gql } from 'apollo-server-koa'
 export const PickingAssignmentStatus = gql`
   type PickingAssignmentStatus {
     user: User
-    pending: [Worksheet]
-    picking: [Worksheet]
+    pending: String
+    picking: String
   }
 `

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

@@ -18,12 +18,12 @@ export const WorksheetDetailInfo = gql`
     expirationDate: String
     palletQty: Int
     actualPalletQty: Int
-    packQty: Int
-    actualPackQty: Int
+    packQty: Float
+    actualPackQty: Float
     adjustedPalletQty: Int
     adjustedBatchId: String
     sku: String
-    qty: Int
+    qty: Float
     uom: String
     uomValue: Float
     releaseQty: Float
@@ -59,5 +59,10 @@ export const WorksheetDetailInfo = gql`
     releaseGood: ReleaseGood
     actualQty: Int
     actualUomValue: Float
+    manufactureDate: String
+    binRemarks: String
+    isRequireSerialNumberScanningOutbound: Boolean
+    hasMissingInventoryChanges: Boolean
+    toteName: String
   }
 `

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

@@ -2,6 +2,7 @@ import { gql } from 'apollo-server-koa'
 
 export const WorksheetInfo = gql`
   type WorksheetInfo {
+    arrivalNotice: ArrivalNotice
     releaseGood: ReleaseGood
     returnOrder: ReturnOrder
     bizplaceName: String
@@ -11,6 +12,7 @@ export const WorksheetInfo = gql`
     bizplace: Bizplace
     containerNo: String
     airwayBill: String
+    checkedRemarkBy: String
     invoice: String
     shippingProvider: String
     trackingNo: String
@@ -21,6 +23,7 @@ export const WorksheetInfo = gql`
     startedAt: String
     ownCollection: Boolean
     palletId: String
+    status: String
     refNo: String
     refNo2: String
     refNo3: String

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

@@ -11,6 +11,7 @@ export const WorksheetPatch = gql`
     initialBatchId: String
     status: String
     truckNo: String
+    transportDriver: ObjectRef
     palletQty: String
     ownCollection: Boolean
     cuFlag: String

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

@@ -21,6 +21,7 @@ export const Worksheet = gql`
     description: String
     type: String
     worksheetDetails: [WorksheetDetail]
+    orderRemark: Boolean
     assignee: User
     status: String
     startedAt: String

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

@@ -41,13 +41,11 @@ export const Mutation = /* GraphQL */ `
     bizplaceId: String
     locationSortingRules: [Sorting]
     selectedItems: [OrderInventoryPatch]!
-    pickingStrategy: String!
   ): Boolean @transaction
 
   generatePickingWorksheetDetails(
     bizplaceId: String!
     selectedItems: [OrderInventoryPatch]!
-    pickingStrategy: String!
     worksheetNo: String!
     locationSortingRules: [Sorting]
   ): Boolean @transaction

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

@@ -16,8 +16,8 @@ export const InventoryDetail = gql`
     zone: String
     packingType: String
     packingSize: Float
-    qty: Int
-    remainQty: Int
+    qty: Float
+    remainQty: Float
     otherRef: String
     lastSeq: Int
     uomValue: Float
@@ -31,5 +31,8 @@ export const InventoryDetail = gql`
     updater: User
     createdAt: String
     updatedAt: String
+    orderProductRemark: String
+    purchaseOrderNo: String
+    arrivalNoticeRefNo: String
   }
 `

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

@@ -23,6 +23,6 @@ export const WorksheetDetailPatch = gql`
     remark: String
     issue: String
     cuFlag: String
-    actualPackQty: Int
+    actualPackQty: Float
   }
 `

package/server/index.ts

@@ -5,4 +5,9 @@ export * from './entities'
 export * from './graphql'
 export * from './graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet'
 export * from './graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details'
+export * from './graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet'
+export * from './graphql/resolvers/worksheet-detail/generate-release-good-worksheet-details'
+export * from './graphql/resolvers/worksheet/unloading/activate-unloading'
+export * from './graphql/resolvers/worksheet/picking/activate-picking'
 export * from './migrations'
+export * from './controllers'

package/server/routes.ts

@@ -8,7 +8,10 @@ import { renderOrientageDO } from './controllers/render-orientage-do'
 import { renderOrientageGRN } from './controllers/render-orientage-grn'
 import { renderRODO } from './controllers/render-ro-do'
 import { renderSeebuuGRN } from './controllers/render-seebuu-grn'
+import { renderFmGRN } from './controllers/render-fm-grn'
 import { renderInvoices } from './controllers/render-invoices'
+import { renderPO } from './controllers/render-po'
+
 
 process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
   routes.get('/view_document_ro_do/:doNo', async (context, next) => {
@@ -43,6 +46,10 @@ process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
     context.body = await renderSeebuuGRN(context.params, context)
   })
 
+  routes.get('/view_fm_grn/:grnNo/:timezoneOffSet', async (context, next) => {
+    context.body = await renderFmGRN(context.params, context)
+  })
+
   routes.get('/view_job_sheet/:ganNo/:timezoneOffSet', async (context, next) => {
     context.body = await renderJobSheet(context.params, context)
   })
@@ -60,4 +67,14 @@ process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
     context.type = 'application/json'
     context.body = data
   })
+
+  routes.post('/view_purchase_orders/:timezoneOffSet', async (context, next) => {
+    let req = context.request.body || {}
+    let timezoneOffSet = context.params.timezoneOffSet || 0
+
+    let data = await renderPO({ req, timezoneOffSet }, context)
+
+    context.type = 'application/json'
+    context.body = data
+  })
 })

package/server/utils/inventory-util.ts

@@ -265,7 +265,9 @@ export async function inventoriesByStrategy(
     .andWhere('"INV"."packing_size" = :packingSize')
     .andWhere('"INV"."uom" = :uom')
     .andWhere('"INV"."status" = :status', { status: 'STORED' })
-    .andWhere('"LOC"."type" NOT IN (:...locationTypes)', { locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE] })
+    .andWhere('"LOC"."type" NOT IN (:...locationTypes)', {
+      locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
+    })
     .setParameters({
       domainId: domain.id,
       productId,
@@ -289,12 +291,7 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."created_at"', 'ASC')
       if (locationSortingRules) {
         for (const key in locationSortingRules) {
-          if (locIdx === 0) {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          } else {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          }
-          ++locIdx
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
         }
       }
       break
@@ -303,12 +300,7 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."created_at"', 'DESC')
       if (locationSortingRules) {
         for (const key in locationSortingRules) {
-          if (locIdx === 0) {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          } else {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          }
-          ++locIdx
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
         }
       }
       break
@@ -317,12 +309,16 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."expiration_date"', 'ASC')
       if (locationSortingRules) {
         for (const key in locationSortingRules) {
-          if (locIdx === 0) {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          } else {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          }
-          ++locIdx
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
+        }
+      }
+      break
+
+    case 'FMFO':
+      qb.orderBy('"INV"."manufacture_date"', 'ASC')
+      if (locationSortingRules) {
+        for (const key in locationSortingRules) {
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
         }
       }
       break
@@ -338,10 +334,6 @@ export async function inventoriesByStrategy(
           ++locIdx
         }
       } else qb.orderBy('"LOC"."name"', 'DESC')
-      break
-    default:
-      qb.orderBy('"INV"."created_at"', 'ASC')
-
       break
   }
 

package/server/utils/worksheet-no-generator.ts

@@ -1,4 +1,4 @@
-import uuid from 'uuid/v4'
+import { v4 as uuidv4 } from 'uuid'
 import { WORKSHEET_TYPE } from '../constants'
 
 export class WorksheetNoGenerator {
@@ -95,35 +95,35 @@ export class WorksheetNoGenerator {
   }
 
   static unloading() {
-    return `ULD-${uuid()}`
+    return `ULD-${uuidv4()}`
   }
 
   static putaway() {
-    return `PUTAWAY-${uuid()}`
+    return `PUTAWAY-${uuidv4()}`
   }
 
   static loading() {
-    return `LOAD-${uuid()}`
+    return `LOAD-${uuidv4()}`
   }
 
   static return() {
-    return `RETURN-${uuid()}`
+    return `RETURN-${uuidv4()}`
   }
 
   static cycleCount() {
-    return `CC-${uuid()}`
+    return `CC-${uuidv4()}`
   }
 
   static stockTake() {
-    return `ST-${uuid()}`
+    return `ST-${uuidv4()}`
   }
 
   static picking() {
-    return `PICK-${uuid()}`
+    return `PICK-${uuidv4()}`
   }
 
   static packing() {
-    return `PICK-${uuid()}`
+    return `PICK-${uuidv4()}`
   }
 
   static batchPicking() {
@@ -141,66 +141,66 @@ export class WorksheetNoGenerator {
   }
 
   static vas() {
-    return `VAS-${uuid()}`
+    return `VAS-${uuidv4()}`
   }
 
   static unloadingReturn() {
-    return `UR-${uuid()}`
+    return `UR-${uuidv4()}`
   }
 
   static putawayReturn() {
-    return `PR-${uuid()}`
+    return `PR-${uuidv4()}`
   }
 
   static unloadingDetail() {
-    return `ULD-DETAIL-${uuid()}`
+    return `ULD-DETAIL-${uuidv4()}`
   }
 
   static putawayDetail() {
-    return `PUTAWAY-DETAIL-${uuid()}`
+    return `PUTAWAY-DETAIL-${uuidv4()}`
   }
 
   static cycleCountDetail() {
-    return `CC-DETAIL-${uuid()}`
+    return `CC-DETAIL-${uuidv4()}`
   }
 
   static stockTakeDetail() {
-    return `ST-DETAIL-${uuid()}`
+    return `ST-DETAIL-${uuidv4()}`
   }
 
   static sortingDetail() {
-    return `SORT-DETAIL-${uuid()}`
+    return `SORT-DETAIL-${uuidv4()}`
   }
 
   static loadingDetail() {
-    return `LOAD-DETAIL-${uuid()}`
+    return `LOAD-DETAIL-${uuidv4()}`
   }
 
   static returnDetail() {
-    return `RETURN-DETAIL-${uuid()}`
+    return `RETURN-DETAIL-${uuidv4()}`
   }
 
   static pickingDetail() {
-    return `PICK-DETAIL-${uuid()}`
+    return `PICK-DETAIL-${uuidv4()}`
   }
 
   static packingDetail() {
-    return `PACK-DETAIL-${uuid()}`
+    return `PACK-DETAIL-${uuidv4()}`
   }
 
   static batchPickingDetail() {
-    return `BP-DETAIL-${uuid()}`
+    return `BP-DETAIL-${uuidv4()}`
   }
 
   static vasDetail() {
-    return `VAS-DETAIL-${uuid()}`
+    return `VAS-DETAIL-${uuidv4()}`
   }
 
   static unloadingReturnDetail() {
-    return `UR-DETAIL-${uuid()}`
+    return `UR-DETAIL-${uuidv4()}`
   }
 
   static putawayReturnDetail() {
-    return `PR-DETAIL-${uuid()}`
+    return `PR-DETAIL-${uuidv4()}`
   }
 }