@things-factory/worksheet-base 3.7.15 → 3.8.3

package/server/controllers/worksheet-controller.ts

@@ -387,7 +387,7 @@ export class WorksheetController {
     type: string,
     additionalProps: Partial<Worksheet> = {}
   ): Promise<Worksheet> {
-    let refOrderType: string = this.getRefOrderField(refOrder)
+    let refOrderType: string = await this.getRefOrderField(refOrder)
     const bizplace: Bizplace = await this.extractBizplaceFromRefOrder(refOrder)
 
     const worksheet: Partial<Worksheet> = {
@@ -562,7 +562,7 @@ export class WorksheetController {
     worksheet: Worksheet,
     orderTargets: OrderTargetTypes[],
     refOrderStatus: string,
-    orderTargetStatus: string,
+    orderTargetStatus: string
   ): Promise<Worksheet> {
     let newOrderTarget = []
 
@@ -676,7 +676,7 @@ export class WorksheetController {
       'worksheetDetails.targetVas'
     ])
 
-    const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
+    let worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
 
     worksheetDetails
       .filter((wsd: WorksheetDetail) => wsd.status !== ORDER_INVENTORY_STATUS.REPLACED)
@@ -687,7 +687,7 @@ export class WorksheetController {
     await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetails)
 
     if (worksheetType === WORKSHEET_TYPE.UNLOADING) {
-      const targetProducts: OrderProduct[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
+      let targetProducts: OrderProduct[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
         let targetProduct: OrderProduct = wsd.targetProduct
         targetProduct.status = ORDER_PRODUCT_STATUS.TERMINATED
         targetProduct.updater = this.user
@@ -696,7 +696,7 @@ export class WorksheetController {
 
       await this.updateOrderTargets(targetProducts)
     } else if (worksheetType === WORKSHEET_TYPE.VAS) {
-      const targetVASs: OrderVas[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
+      let targetVASs: OrderVas[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
         let targetVAS: OrderVas = wsd.targetVas
         targetVAS.status = ORDER_VAS_STATUS.TERMINATED
         targetVAS.updater = this.user
@@ -707,11 +707,12 @@ export class WorksheetController {
     } else if (
       worksheetType === WORKSHEET_TYPE.PUTAWAY ||
       worksheetType === WORKSHEET_TYPE.PICKING ||
+      worksheetType === WORKSHEET_TYPE.PACKING ||
       worksheetType === WORKSHEET_TYPE.LOADING ||
       worksheetType === WORKSHEET_TYPE.WAREHOUSE_RETURN ||
       worksheetType === WORKSHEET_TYPE.UNLOADING_RETURN
     ) {
-      const targetInventories: OrderInventory[] = worksheet.worksheetDetails
+      let targetInventories: OrderInventory[] = worksheet.worksheetDetails
         .filter((wsd: WorksheetDetail) => wsd.status !== ORDER_INVENTORY_STATUS.REPLACED)
         .map((wsd: WorksheetDetail) => {
           let targetInventory: OrderInventory = wsd.targetInventory

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

@@ -1,7 +1,9 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { PickingWorksheetController } from '../../../../controllers/'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 

package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts

@@ -1,10 +1,10 @@
-import { buildQuery, buildCondition } from '@things-factory/shell'
-import { Domain } from '@things-factory/shell'
-import { getRepository, SelectQueryBuilder, Brackets } from 'typeorm'
+import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { Inventory } from '@things-factory/warehouse-base'
 import { ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
-import { User } from '@things-factory/auth-base'
+import { buildCondition, buildQuery, Domain } from '@things-factory/shell'
+import { Inventory, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
 export const inventoriesByPalletResolver = {
   async inventoriesByPallet(_: any, { filters, pagination, sortings, locationSortingRules }, context: any) {
@@ -41,6 +41,7 @@ export const inventoriesByPalletResolver = {
       .andWhere('iv.qty > 0')
       .andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
       .andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
+      .andWhere(`location.type NOT IN ('${LOCATION_TYPE.QUARANTINE}', '${LOCATION_TYPE.RESERVE}')`)
       .andWhere(
         `(iv.batch_id, product.name, iv.packing_type, product.brand) NOT IN (
         SELECT 

package/server/graphql/resolvers/worksheet/picking/activate-picking.ts

@@ -7,7 +7,7 @@ import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import { ORDER_STATUS, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 
-import { EcommerceController, PickingWorksheetController, SellercraftController } from '../../../../controllers'
+import { EcommerceController, PickingWorksheetController } from '../../../../controllers'
 import { Worksheet } from '../../../../entities'
 
 export const activatePickingResolver = {
@@ -40,11 +40,6 @@ export async function activatePicking(
       .getRepository(Sellercraft)
       .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
 
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
-    }
-
     if (marketplaceStores?.length && !sellercraft) {
       if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
         const worksheetDetails = worksheet.worksheetDetails

package/server/graphql/resolvers/worksheet/picking/complete-picking.ts

@@ -7,6 +7,7 @@ import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integr
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
 import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
+import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'
@@ -19,7 +20,6 @@ import {
 import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
-import { Setting, PartnerSetting } from '@things-factory/setting-base'
 
 export const completePickingResolver = {
   async completePicking(_: any, { releaseGoodNo }, context: any) {
@@ -45,7 +45,7 @@ export async function completePicking(
   releaseGoodNo: string
 ): Promise<void> {
   const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
-  const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+  let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
     where: { domain, name: releaseGoodNo },
     relations: [
       'bizplace',
@@ -53,6 +53,7 @@ export async function completePicking(
       'bizplace.company',
       'bizplace.company.domain',
       'orderInventories',
+      'orderInventories.inventory',
       'orderInventories.product'
     ]
   })
@@ -84,6 +85,7 @@ export async function completePicking(
 
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+      releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
       await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
     } else {
       const companyDomain: Domain = releaseGood.bizplace.company.domain
@@ -192,23 +194,22 @@ export async function completePicking(
     const directActivatePackingWorksheet: Setting = await tx.getRepository(Setting).findOne({
       where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
     })
-    const partnerDirectActivatePackingWorksheetSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
-      where: { setting: directActivatePackingWorksheet, domain: domain, partnerDomain: releaseGood.bizplace?.domain }
-    })
+    const partnerDirectActivatePackingWorksheetSetting: PartnerSetting = await tx
+      .getRepository(PartnerSetting)
+      .findOne({
+        where: { setting: directActivatePackingWorksheet, domain: domain, partnerDomain: releaseGood.bizplace?.domain }
+      })
 
     let packingWorksheet: Worksheet = await packingWSCtrl.generatePackingWorksheet(releaseGoodNo)
 
-    if (
-      directActivatePackingWorksheet != undefined && (directActivatePackingWorksheet.value).toLowerCase() == 'true'
-    ) {
+    if (directActivatePackingWorksheet != undefined && directActivatePackingWorksheet.value.toLowerCase() == 'true') {
       if (partnerDirectActivatePackingWorksheetSetting != undefined) {
-        if ((partnerDirectActivatePackingWorksheetSetting.value).toLowerCase() == 'true')
+        if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
           await packingWSCtrl.activatePacking(packingWorksheet.name)
       } else {
         await packingWSCtrl.activatePacking(packingWorksheet.name)
       }
     }
-
   } else {
     // Find Existing Loading Worksheet if any
     let existLoadingWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
@@ -232,8 +233,7 @@ export async function completePicking(
 
       const loadingWorksheetDetails: WorksheetDetail[] = loadingWorksheet.worksheetDetails
       await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)
-    }
-    else {
+    } else {
       const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)
       let loadingWorksheet: Worksheet = await loadingWSCtrl.updateLoadingWorksheet(
         releaseGoodNo,

package/server/graphql/resolvers/worksheet/recommend-putway-location.ts

@@ -1,8 +1,10 @@
+import { getRepository, In } from 'typeorm'
+
 import { ArrivalNotice, ReturnOrder } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Location, LOCATION_STATUS, LOCATION_TYPE, Warehouse } from '@things-factory/warehouse-base'
-import { In, getRepository, Not } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 
@@ -69,7 +71,7 @@ export async function recommendLocationLevel1(
       domain,
       warehouse,
       status: LOCATION_STATUS.EMPTY,
-      type: Not(In([LOCATION_TYPE.BUFFER, LOCATION_TYPE.BIN]))
+      type: In([LOCATION_TYPE.SHELF, LOCATION_TYPE.FLOOR]) // should only recommend these types
     },
     order,
     take: optCnt

package/server/graphql/resolvers/worksheet/unloaded-inventories.ts

@@ -32,7 +32,7 @@ export const unloadedInventories = {
     const returnOrder: ReturnOrder = foundWorksheetDetails[0].worksheet.returnOrder
     const customerBizplace: Bizplace = foundWorksheetDetails[0].bizplace
     if (arrivalNotice) {
-      return await getRepository(Inventory).find({
+      let foundInv = await getRepository(Inventory).find({
         where: {
           domain,
           bizplace: customerBizplace,
@@ -44,6 +44,15 @@ export const unloadedInventories = {
         },
         relations: ['reusablePallet', 'product', 'bizplace']
       })
+      const items = foundInv.map((inv: Inventory) => {
+        const expirationDate: Date = inv.expirationDate ? new Date(inv.expirationDate) : null
+        return {
+          ...inv,
+          expirationDate: expirationDate
+        }
+      })
+
+      return items
     }
 
     if (returnOrder) {

package/server/utils/inventory-util.ts

@@ -115,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