@things-factory/worksheet-base 4.0.10 → 4.0.14

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

@@ -81,8 +81,6 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       },
       relations: [
         'bizplace',
-        'bizplace.company',
-        'bizplace.company.domain',
         'worksheet',
         'worksheet.arrivalNotice',
         'worksheet.returnOrder',
@@ -90,9 +88,13 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         'worksheet.bufferLocation.warehouse',
         'targetProduct',
         'targetProduct.product',
+        'targetProduct.product.productDetails',
+        'targetProduct.product.productDetails.childProductDetail',
         'targetInventory',
+        'targetInventory.inventory',
         'targetInventory.product',
-        'targetInventory.inventory'
+        'targetInventory.product.productDetails',
+        'targetInventory.product.productDetails.childProductDetail'
       ]
     })
     if (!worksheetDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
@@ -111,13 +113,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     const product: Product = Boolean(arrivalNotice) ? targetProduct.product : targetInventory.product
     const packingType: string = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType
     const packingSize: number = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize
-    const uom: string = Boolean(arrivalNotice) ? targetProduct.uom : originInventory.uom
     const remark: string = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark
     const manufactureYear: number = Boolean(arrivalNotice) ? targetProduct.manufactureYear : null
-    const qty: number = inventory.qty
-    const uomValue: number = Boolean(arrivalNotice)
-      ? Math.round(qty * targetProduct.uomValue * 100) / 100
-      : targetInventory.returnUomValue
+    let qty: number = inventory.qty
+    let uom: string = Boolean(arrivalNotice) ? targetProduct.uom : targetInventory.uom
     const location: Location = worksheet.bufferLocation
     const warehouse: Warehouse = location.warehouse
     const zone: string = location.zone
@@ -144,14 +143,46 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     }
 
     if (productBarcode) {
-      const scannedProductDetail: ProductDetail = await this.trxMgr.getRepository(ProductDetail).findOne({
-        where: { domain: companyDomain, gtin: productBarcode, packingType, packingSize, product }
-      })
+      const productDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
+      const isMatchingBarcode: boolean = productDetails.map(detail => detail.gtin).includes(productBarcode)
+      if (!isMatchingBarcode) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+
+      const foundProductDetail: ProductDetail = productDetails.find(
+        (detail: ProductDetail) =>
+          detail.gtin === productBarcode && detail.packingType === packingType && detail.packingSize == packingSize
+      )
 
-      if (!scannedProductDetail)
-        throw new Error(this.ERROR_MSG.PRODUCT.BARCODE_NOT_EXIST(productBarcode, packingType, packingSize))
+      if (!foundProductDetail) {
+        const orderProductDetail: ProductDetail = productDetails.find(
+          (parentDetail: ProductDetail) =>
+            parentDetail.packingType === packingType && parentDetail.packingSize == packingSize
+        )
+        if (!orderProductDetail)
+          throw new Error(
+            this.ERROR_MSG.FIND.NO_RESULT(`Packing Type ( ${packingType}) or Packing Size (${packingSize})`)
+          )
+
+        if (arrivalNotice) {
+          uom = targetProduct.uom
+        } else {
+          uom = orderProductDetail.uom
+        }
+        qty = (await this.getChildQty(productDetails, productBarcode, orderProductDetail)) * qty
+      } else {
+        uom = foundProductDetail.uom
+        qty
+      }
     }
 
+    const uomValue: number =
+      Math.round(
+        qty *
+          (Boolean(arrivalNotice)
+            ? targetProduct.uomValue
+            : targetInventory.returnUomValue / targetInventory.returnQty) *
+          100
+      ) / 100
+
     let newInventory: Partial<Inventory> = new Inventory()
     newInventory.bizplace = bizplace
     newInventory.name = InventoryNoGenerator.inventoryName()
@@ -173,10 +204,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     if (arrivalNotice) {
       newInventory.manufactureYear = manufactureYear
       newInventory.batchIdRef = batchIdRef
-      newInventory.orderProductId = targetProduct.id
+      newInventory.orderProductId = targetProduct?.id
     } else if (returnOrder) {
-      newInventory.orderInventoryId = targetInventory.id
-      newInventory.refInventory = inventory.id
+      newInventory.orderInventoryId = targetInventory?.id
+      newInventory.refInventory = targetInventory?.inventory
     }
     newInventory.warehouse = warehouse
     newInventory.location = location
@@ -257,7 +288,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     const packingSize: number = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize
     const batchId: string = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId
     let qty: number = 0
-
+    let uom: string = Boolean(arrivalNotice) ? targetProduct.uom : targetInventory.uom
     const cartonId: string = inventory.cartonId
     const orderId: string = Boolean(arrivalNotice) ? arrivalNotice.id : returnOrder.id
     await this.checkCartonDuplication(cartonId, orderId)
@@ -283,8 +314,14 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           this.ERROR_MSG.FIND.NO_RESULT(`Packing Type ( ${packingType}) or Packing Size (${packingSize})`)
         )
 
+      if (arrivalNotice) {
+        uom = targetProduct.uom
+      } else {
+        uom = orderProductDetail.uom
+      }
       qty = await this.getChildQty(productDetails, productBarcode, orderProductDetail)
     } else {
+      uom = foundProductDetail.uom
       qty++
     }
 
@@ -313,7 +350,6 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     let foundInventory: Inventory = await invQb.getOne()
 
     const batchIdRef: string = Boolean(arrivalNotice) ? targetProduct.batchIdRef : null
-    const uom: string = Boolean(arrivalNotice) ? targetProduct.uom : targetInventory.uom
     const remark: string = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark
     const manufactureYear: number = Boolean(arrivalNotice) ? targetProduct.manufactureYear : null
     const location: Location = worksheet.bufferLocation
@@ -342,9 +378,14 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       newInventory.uom = uom
       newInventory.remark = remark
       newInventory.qty = qty
-      newInventory.uomValue = Boolean(arrivalNotice)
-        ? Math.round(qty * targetProduct.uomValue * 100) / 100
-        : targetInventory.returnUomValue
+      newInventory.uomValue =
+        Math.round(
+          qty *
+            (Boolean(arrivalNotice)
+              ? targetProduct.uomValue
+              : targetInventory.returnUomValue / targetInventory.returnQty) *
+            100
+        ) / 100
       newInventory.manufactureYear = manufactureYear
       newInventory.refOrderId = orderId
       newInventory.unitCost = unitCost
@@ -368,17 +409,23 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         targetProduct.actualPackQty = Boolean(targetProduct.actualPackQty) ? targetProduct.actualPackQty + qty : qty
       } else if (returnOrder) {
         targetInventory.actualPalletQty++
-        targetInventory.actualPackQty += Boolean(targetInventory.actualPackQty)
+        targetInventory.actualPackQty = Boolean(targetInventory.actualPackQty)
           ? targetInventory.actualPackQty + qty
           : qty
       }
       await this.trxMgr.getRepository(Inventory).save(newInventory)
     } else {
       const updatedQty: number = foundInventory.qty + qty
+      foundInventory.expirationDate = new Date(foundInventory.expirationDate)
       foundInventory.qty = updatedQty
-      foundInventory.uomValue = Boolean(arrivalNotice)
-        ? Math.round(qty * targetProduct.uomValue * 100) / 100
-        : targetInventory.returnUomValue
+      foundInventory.uomValue +=
+        Math.round(
+          qty *
+            (Boolean(arrivalNotice)
+              ? targetProduct.uomValue
+              : targetInventory.returnUomValue / targetInventory.returnQty) *
+            100
+        ) / 100
       if (arrivalNotice) targetProduct.actualPackQty = targetProduct.actualPackQty + qty
       else if (returnOrder) targetInventory.actualPackQty = targetInventory.actualPackQty + qty
       await this.trxMgr.getRepository(Inventory).save(foundInventory)
@@ -499,6 +546,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       let targetProduct: OrderProduct = worksheetDetail.targetProduct
       targetProduct.actualPackQty -= qty
       targetProduct.actualPalletQty--
+      targetProduct.remark = null
+      targetProduct.issue = null
       targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
       targetProduct.updater = this.user
       await this.updateOrderTargets([targetProduct])
@@ -511,6 +560,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       await this.updateOrderTargets([targetInventory])
     }
 
+    worksheetDetail.issue = null
     worksheetDetail.status = WORKSHEET_STATUS.EXECUTING
     worksheetDetail.updater = this.user
     await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
@@ -595,19 +645,23 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       targetInventory.updater = this.user
     }
 
-    worksheetDetail.status = WORKSHEET_STATUS.EXECUTING
-    worksheetDetail.updater = this.user
-    await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
-
     foundInventory.qty--
     foundInventory.uomValue =
       Math.round(
         foundInventory.qty * (Boolean(arrivalNotice) ? targetProduct.uomValue : targetInventory.returnUomValue) * 100
       ) / 100
     foundInventory.updater = this.user
+
+    worksheetDetail.issue = foundInventory.qty == 0 && worksheetDetail.issue ? null : worksheetDetail.issue
+    worksheetDetail.status = WORKSHEET_STATUS.EXECUTING
+    worksheetDetail.updater = this.user
+    await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
+
     if (foundInventory.qty == 0) {
       if (arrivalNotice) {
         targetProduct.actualPalletQty--
+        targetProduct.issue = null
+        targetProduct.remark = null
         await this.updateOrderTargets([targetProduct])
       } else if (returnOrder) {
         targetInventory.actualPalletQty--

package/server/controllers/index.ts

@@ -7,6 +7,7 @@ export * from './render-kimeda-grn'
 export * from './render-orientage-grn'
 export * from './render-orientage-do'
 export * from './render-seebuu-grn'
+export * from './render-manifest'
 
 /* Worksheet Controllers */
 export * from './worksheet-controller'

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

@@ -34,6 +34,26 @@ export class LoadingWorksheetController extends VasWorksheetController {
     )
   }
 
+  async updateLoadingWorksheet(
+    releaseGoodNo: string,
+    targetInventories: Partial<OrderInventory>[],
+    worksheet: Worksheet
+  ): Promise<Worksheet> {
+    const releaseGood: ReleaseGood = await this.findRefOrder(
+      ReleaseGood,
+      { domain: this.domain, name: releaseGoodNo },
+      ['bizplace']
+    )
+    return await this.updateWorksheet(
+      WORKSHEET_TYPE.LOADING,
+      releaseGood,
+      worksheet,
+      targetInventories,
+      ORDER_STATUS.LOADING,
+      ORDER_INVENTORY_STATUS.LOADING
+    )
+  }
+
   async activateLoading(worksheetNo: string, loadingWorksheetDetails: Partial<WorksheetDetail>[]): Promise<Worksheet> {
     const worksheet: Worksheet = await this.findActivatableWorksheet(worksheetNo, WORKSHEET_TYPE.LOADING, [
       'releaseGood',

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

@@ -19,11 +19,9 @@ export class PackingWorksheetController extends VasWorksheetController {
     )
     const orderInventories: OrderInventory[] = releaseGood.orderInventories
 
-    const existingPackingWorksheet: Worksheet = await this.trxMgr
-      .getRepository(Worksheet)
-      .findOne({
-        where: { domain: this.domain, releaseGood, type: WORKSHEET_TYPE.PACKING, status: WORKSHEET_STATUS.DEACTIVATED }
-      })
+    const existingPackingWorksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
+      where: { domain: this.domain, releaseGood, type: WORKSHEET_TYPE.PACKING, status: WORKSHEET_STATUS.DEACTIVATED }
+    })
 
     if (existingPackingWorksheet) throw new Error('There is existing packing worksheet that has been generated')
     let worksheet: Worksheet = await this.createWorksheet(releaseGood, WORKSHEET_TYPE.PACKING)