@things-factory/worksheet-base 4.0.11 → 4.0.12

package/server/graphql/resolvers/worksheet/unloading-return-worksheet.ts

@@ -1,10 +1,12 @@
+import { getRepository } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
+import { OrderInventory, ReturnOrder } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
-import { fetchExecutingWorksheet } from '../../../utils'
-import { ReturnOrder, OrderInventory } from '@things-factory/sales-base'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { fetchExecutingWorksheet } from '../../../utils'
 
 export const unloadingReturnWorksheetResolver = {
   async unloadingReturnWorksheet(_: any, { returnOrderNo }, context: any) {
@@ -59,7 +61,7 @@ export const unloadingReturnWorksheetResolver = {
           description: productWSD.description,
           targetName: targetInventory.name,
           packingType: targetInventory.packingType,
-          packingSize: targetInventory.packingSize,
+          packingSize: targetInventory.inventory.packingSize,
           palletQty: targetInventory.palletQty,
           actualPalletQty: targetInventory.actualPalletQty,
           packQty: targetInventory.returnQty,

package/server/graphql/types/index.ts

@@ -1,10 +1,9 @@
-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, Pallet.Mutation]
+export const mutations = [Worksheet.Mutation, WorksheetDetail.Mutation, WorksheetMovement.Mutation]
 
 export const types = [...Worksheet.Types, ...WorksheetDetail.Types, ...WorksheetMovement.Types]

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

@@ -290,6 +290,8 @@ export const Mutation = /* GraphQL */ `
     cartonId: String
     locationName: String!
     releaseQty: Int!
+    binLocation: String
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductPicking (
@@ -298,6 +300,7 @@ export const Mutation = /* GraphQL */ `
     productBarcode: String!
     cartonId: String!
     binLocation: String
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   sortingProduct (
@@ -515,6 +518,9 @@ export const Mutation = /* GraphQL */ `
     worksheetId: String!
     userId: String!
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
+
+  fetchAndAssignPickingTask     
+  : ExecutingWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
   
   palletizingPallets (
     refOrderNo: String!
@@ -588,7 +594,7 @@ export const Query = /* GraphQL */ `
 
   pickingWorksheet (
     releaseGoodNo: String!, locationSortingRules: [Sorting]
-  ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
+  ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query") @transaction
 
   sortingWorksheet (
     releaseGoodNo: String!
@@ -662,7 +668,7 @@ export const Query = /* GraphQL */ `
   findReleaseOrdersByTaskNo(taskNo: String!): [ReleaseGood] @privilege(category: "worksheet", privilege: "query") @transaction
 `
 
-export const Types = /* GraphQL */ [
+export const Types = /* GraphQL */[
   Worksheet,
   AirwayBill,
   NewWorksheet,

package/server/routes.ts

@@ -2,6 +2,7 @@ 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 { renderManifest } from './controllers/render-manifest'
 import { renderManualDO } from './controllers/render-manual-do'
 import { renderOrientageDO } from './controllers/render-orientage-do'
 import { renderOrientageGRN } from './controllers/render-orientage-grn'
@@ -44,4 +45,8 @@ process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
   routes.get('/view_job_sheet/:ganNo/:timezoneOffSet', async (context, next) => {
     context.body = await renderJobSheet(context.params, context)
   })
+
+  routes.get('/view_manifest/:manifestNo', async (context, next) => {
+    context.body = await renderManifest(context.params, context)
+  })
 })

package/server/utils/inventory-util.ts

@@ -1,8 +1,4 @@
-import {
-  EntityManager,
-  getRepository,
-  Repository
-} from 'typeorm'
+import { EntityManager, getRepository, Repository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
@@ -63,10 +59,36 @@ export async function generateInventoryHistory(
       palletId: inventory.palletId,
       seq: seq - 1
     })
+
     openingQty = lastInvHistory.openingQty + lastInvHistory.qty
     openingUomValue = lastInvHistory.openingUomValue + lastInvHistory.uomValue
   }
 
+  if (transactionType == 'PICKING' || transactionType == 'UNLOADING') {
+    const [findSameOrderHistory, total]: InventoryHistory = await invHistoryRepo.findAndCount({
+      domain: inventory.domain,
+      palletId: inventory.palletId,
+      refOrderId: refOrder.id
+    })
+
+    if (findSameOrderHistory) {
+      let prevTotalQty = 0
+      let prevTotalUomValue = 0
+      for (let oh of findSameOrderHistory) {
+        prevTotalQty += oh.qty
+        prevTotalUomValue += oh.uomValue
+      }
+      qty -= prevTotalQty
+      uomValue -= prevTotalUomValue
+    }
+  } else if (transactionType == 'UNDO_UNLOADING' || transactionType == 'RETURN') {
+    qty = qty
+    uomValue = uomValue
+  } else {
+    qty = 0
+    uomValue = 0
+  }
+
   let inventoryHistory: InventoryHistory = new InventoryHistory()
   inventoryHistory.name = InventoryNoGenerator.inventoryHistoryName()
   inventoryHistory.description = inventory.description
@@ -93,8 +115,6 @@ export async function generateInventoryHistory(
   inventoryHistory.uom = inventory.uom
   inventoryHistory.qty = qty
   inventoryHistory.openingQty = openingQty
-  inventoryHistory.weight = 0
-  inventoryHistory.openingWeight = 0
   inventoryHistory.uomValue = uomValue
   inventoryHistory.openingUomValue = openingUomValue
   inventoryHistory.unitCost = inventory.unitCost
@@ -221,7 +241,7 @@ export async function checkPalletIdenticallity(
  * @param trxMgr
  */
 export async function inventoriesByStrategy(
-  { worksheetId, batchId, bizplaceId, productId, packingType, packingSize, pickingStrategy, locationSortingRules },
+  { worksheetId, batchId, bizplaceId, productId, packingType, packingSize, uom, pickingStrategy, locationSortingRules },
   domain: Domain,
   trxMgr: EntityManager
 ) {
@@ -248,12 +268,14 @@ export async function inventoriesByStrategy(
     .andWhere('"PROD"."id" = :productId')
     .andWhere('"INV"."packing_type" = :packingType')
     .andWhere('"INV"."packing_size" = :packingSize')
+    .andWhere('"INV"."uom" = :uom')
     .andWhere('"INV"."status" = :status', { status: 'STORED' })
     .setParameters({
       domainId: domain.id,
       productId,
       packingType,
-      packingSize
+      packingSize,
+      uom
     })
 
   if (batchId !== '') {

package/dist-server/graphql/types/pallet/index.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Mutation = void 0;
-exports.Mutation = `
-  palletOutbound(
-    refOrderNo: String!
-    patches: [PalletPatch]!
-  ): Boolean @transaction
-`;
-//# sourceMappingURL=index.js.map

package/dist-server/graphql/types/pallet/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/pallet/index.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAiB;;;;;CAKrC,CAAA"}

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

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