@things-factory/worksheet-base 5.0.13 → 6.0.0-alpha.1

package/server/controllers/inbound/unloading-worksheet-controller.ts

@@ -1,16 +1,8 @@
-import {
-  Equal,
-  In,
-  Not,
-  SelectQueryBuilder,
-} from 'typeorm';
-
-import { Bizplace } from '@things-factory/biz-base';
-import { generateId } from '@things-factory/id-rule-base';
-import {
-  Product,
-  ProductDetail,
-} from '@things-factory/product-base';
+import { Equal, In, Not, SelectQueryBuilder } from 'typeorm'
+
+import { Bizplace } from '@things-factory/biz-base'
+import { generateId } from '@things-factory/id-rule-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import {
   ArrivalNotice,
   ORDER_PRODUCT_STATUS,
@@ -25,13 +17,10 @@ import {
   ReturnOrder,
   Vas,
   VAS_TARGET_TYPES,
-  VAS_TYPES,
-} from '@things-factory/sales-base';
-import {
-  PartnerSetting,
-  Setting,
-} from '@things-factory/setting-base';
-import { Domain } from '@things-factory/shell';
+  VAS_TYPES
+} from '@things-factory/sales-base'
+import { PartnerSetting, Setting } from '@things-factory/setting-base'
+import { Domain } from '@things-factory/shell'
 import {
   Inventory,
   INVENTORY_ITEM_SOURCE,
@@ -42,23 +31,13 @@ import {
   InventoryNoGenerator,
   Location,
   Pallet,
-  Warehouse,
-} from '@things-factory/warehouse-base';
+  Warehouse
+} from '@things-factory/warehouse-base'
 
-import {
-  RULE_TYPE,
-  WORKSHEET_STATUS,
-  WORKSHEET_TYPE,
-} from '../../constants';
-import {
-  Worksheet,
-  WorksheetDetail,
-} from '../../entities';
-import {
-  DateGenerator,
-  generateInventoryHistory,
-} from '../../utils';
-import { VasWorksheetController } from '../vas/vas-worksheet-controller';
+import { RULE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
+import { Worksheet, WorksheetDetail } from '../../entities'
+import { DateGenerator, generateInventoryHistory } from '../../utils'
+import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export type UnloadingWorksheetDetail = Partial<WorksheetDetail> & {
   palletizingVasId: string
@@ -68,33 +47,37 @@ export type UnloadingWorksheetDetail = Partial<WorksheetDetail> & {
 
 export class UnloadingWorksheetController extends VasWorksheetController {
   async generateUnloadingWorksheet(arrivalNoticeNo: string, bufferLocationId: string): Promise<Worksheet> {
-    let arrivalNotice: ArrivalNotice = await this.findRefOrder(
-      ArrivalNotice,
-      {
-        domain: this.domain,
-        name: arrivalNoticeNo,
-        status: ORDER_STATUS.ARRIVED
-      },
-      ['bizplace', 'orderProducts', 'orderVass']
-    )
-    const orderProducts: OrderProduct[] = arrivalNotice.orderProducts
-    const orderVASs: OrderVas[] = arrivalNotice.orderVass
-    const bufferLocation: Location = await this.trxMgr.getRepository(Location).findOne(bufferLocationId)
-
-    const worksheet: Worksheet = await this.generateWorksheet(
-      WORKSHEET_TYPE.UNLOADING,
-      arrivalNotice,
-      orderProducts,
-      ORDER_STATUS.READY_TO_UNLOAD,
-      ORDER_PRODUCT_STATUS.READY_TO_UNLOAD,
-      { bufferLocation }
-    )
+    try {
+      let arrivalNotice: ArrivalNotice = await this.findRefOrder(
+        ArrivalNotice,
+        {
+          domain: this.domain,
+          name: arrivalNoticeNo,
+          status: ORDER_STATUS.ARRIVED
+        },
+        ['bizplace', 'orderProducts', 'orderVass']
+      )
+      const orderProducts: OrderProduct[] = arrivalNotice.orderProducts
+      const orderVASs: OrderVas[] = arrivalNotice.orderVass
+      const bufferLocation: Location = await this.trxMgr.getRepository(Location).findOneBy({ id: bufferLocationId })
 
-    if (orderVASs?.length > 0) {
-      await this.generateVasWorksheet(arrivalNotice)
-    }
+      const worksheet: Worksheet = await this.generateWorksheet(
+        WORKSHEET_TYPE.UNLOADING,
+        arrivalNotice,
+        orderProducts,
+        ORDER_STATUS.READY_TO_UNLOAD,
+        ORDER_PRODUCT_STATUS.READY_TO_UNLOAD,
+        { bufferLocation }
+      )
 
-    return worksheet
+      if (orderVASs?.length > 0) {
+        await this.generateVasWorksheet(arrivalNotice)
+      }
+
+      return worksheet
+    } catch (e) {
+      throw new Error(e)
+    }
   }
 
   async unload(worksheetDetailName: string, inventory: Partial<Inventory>, productBarcode: string): Promise<string> {
@@ -226,7 +209,9 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     newInventory.refOrderId = orderId
     newInventory.unitCost = unitCost
     if (inventory.reusablePallet?.id) {
-      newInventory.reusablePallet = await this.trxMgr.getRepository(Pallet).findOne(inventory.reusablePallet.id)
+      newInventory.reusablePallet = await this.trxMgr
+        .getRepository(Pallet)
+        .findOneBy({ id: inventory.reusablePallet.id })
     }
     if (arrivalNotice) {
       newInventory.manufactureDate = manufactureDate
@@ -393,7 +378,9 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       newInventory.refOrderId = orderId
       newInventory.unitCost = unitCost
       if (inventory.reusablePallet?.id) {
-        newInventory.reusablePallet = await this.trxMgr.getRepository(Pallet).findOne(inventory.reusablePallet.id)
+        newInventory.reusablePallet = await this.trxMgr
+          .getRepository(Pallet)
+          .findOneBy({ id: inventory.reusablePallet.id })
       }
       newInventory.orderProductId = Boolean(arrivalNotice) ? targetProduct.id : null
       newInventory.orderInventoryId = Boolean(returnOrder) ? targetInventory.id : null
@@ -419,7 +406,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       foundInventory = await this.trxMgr.getRepository(Inventory).save(newInventory)
     } else {
       const updatedQty: number = foundInventory.qty + qty
-      foundInventory.expirationDate = new Date(foundInventory.expirationDate)
+      foundInventory.expirationDate = foundInventory.expirationDate ? new Date(foundInventory.expirationDate) : null
       foundInventory.qty = updatedQty
       foundInventory.uomValue +=
         Math.round(
@@ -610,7 +597,9 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       newInventory.refOrderId = orderId
       newInventory.unitCost = unitCost
       if (inventory.reusablePallet?.id) {
-        newInventory.reusablePallet = await this.trxMgr.getRepository(Pallet).findOne(inventory.reusablePallet.id)
+        newInventory.reusablePallet = await this.trxMgr
+          .getRepository(Pallet)
+          .findOneBy({ id: inventory.reusablePallet.id })
       }
       newInventory.orderProductId = Boolean(arrivalNotice) ? targetProduct.id : null
       newInventory.orderInventoryId = Boolean(returnOrder) ? targetInventory.id : null
@@ -636,7 +625,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       await this.trxMgr.getRepository(Inventory).save(newInventory)
     } else {
       const updatedQty: number = foundInventory.qty + qty
-      foundInventory.expirationDate = new Date(foundInventory.expirationDate)
+      foundInventory.expirationDate = foundInventory.expirationDate ? new Date(foundInventory.expirationDate) : null
       foundInventory.qty = updatedQty
       foundInventory.uomValue +=
         Math.round(

package/server/controllers/inspect/cycle-count-worksheet-controller.ts

@@ -25,7 +25,7 @@ export class CycleCountWorksheetController extends WorksheetController {
     limit: number
   ): Promise<Worksheet> {
     // Find out warehouse and customer bizplace
-    const customerBizplace: Bizplace = await this.trxMgr.getRepository(Bizplace).findOne(customerId)
+    const customerBizplace: Bizplace = await this.trxMgr.getRepository(Bizplace).findOneBy({ id: customerId })
     let foundCycleCountWorksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
       where: {
         domain: this.domain,

package/server/controllers/outbound/packing-worksheet-controller.ts

@@ -25,7 +25,9 @@ export class PackingWorksheetController extends VasWorksheetController {
       },
       ['orderInventories', 'orderInventories.inventory']
     )
-    let orderInventories: OrderInventory[] = releaseGood.orderInventories
+    let orderInventories: OrderInventory[] = releaseGood.orderInventories.filter(oi => {
+      return oi.inventory.status !== 'MISSING'
+    })
 
     const existingPackingWorksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
       where: { domain: this.domain, releaseGood, type: WORKSHEET_TYPE.PACKING, status: WORKSHEET_STATUS.DEACTIVATED }
@@ -191,15 +193,17 @@ export class PackingWorksheetController extends VasWorksheetController {
         'targetInventory.inventory',
         'targetInventory.inventory.product',
         'targetInventory.inventory.product.productDetails',
+        'targetInventory.inventory.product.productDetails.childProductDetail',
         'targetInventory.inventory.location'
       ]
     )
     const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
     const product: Product = worksheetDetail.targetInventory.inventory.product
+    const filterProductDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
     let targetInventory: OrderInventory = worksheetDetail.targetInventory
     let inventory: Inventory = targetInventory.inventory
     let packedQty: number = 1
-    const pickedQty: number = targetInventory.releaseQty
+    let pickedQty: number = targetInventory.releaseQty
 
     // search for matching product barcode
     const productDetail: ProductDetail = product?.productDetails
@@ -210,7 +214,24 @@ export class PackingWorksheetController extends VasWorksheetController {
           detail.packingType === inventory.packingType &&
           detail.packingSize === inventory.packingSize
       )
-    if (!productDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+
+    if (!productDetail && !product?.isRequireSerialNumberScanningOutbound) {
+      let roProductDetail: ProductDetail = product?.productDetails.find(
+        (parentDetail: ProductDetail) =>
+          parentDetail.packingType === inventory.packingType && parentDetail.packingSize == inventory.packingSize
+      )
+
+      roProductDetail.product = product
+
+      let childQty = await this.getChildQty(filterProductDetails, productBarcode, roProductDetail)
+      packedQty *= childQty
+    } else if (!productDetail) {
+      throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+    }
+
+    if (packedQty + targetInventory.packedQty > pickedQty) {
+      throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
+    }
 
     // Serial Number scanning for batch picking
     if (targetInventory?.refWorksheetId) {
@@ -384,7 +405,7 @@ export class PackingWorksheetController extends VasWorksheetController {
         {
           status: INVENTORY_STATUS.STORED,
           outboundOrderId: null,
-          updater: this.user
+          updater: this.user as any
         }
       )
     }