@things-factory/worksheet-base 4.1.31 → 4.1.35

package/dist-server/graphql/types/worksheet/worksheet-detail-info.js

@@ -61,6 +61,7 @@ exports.WorksheetDetailInfo = (0, apollo_server_koa_1.gql) `
     releaseGood: ReleaseGood
     actualQty: Int
     actualUomValue: Float
+    manufactureDate: String
   }
 `;
 //# sourceMappingURL=worksheet-detail-info.js.map

package/dist-server/graphql/types/worksheet/worksheet-detail-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"worksheet-detail-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-detail-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,mBAAmB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4DrC,CAAA"}
+{"version":3,"file":"worksheet-detail-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-detail-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,mBAAmB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6DrC,CAAA"}

package/dist-server/graphql/types/worksheet/worksheet-info.js

@@ -4,6 +4,7 @@ exports.WorksheetInfo = void 0;
 const apollo_server_koa_1 = require("apollo-server-koa");
 exports.WorksheetInfo = (0, apollo_server_koa_1.gql) `
   type WorksheetInfo {
+    arrivalNotice: ArrivalNotice
     releaseGood: ReleaseGood
     returnOrder: ReturnOrder
     bizplaceName: String

package/dist-server/graphql/types/worksheet/worksheet-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"worksheet-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,aAAa,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2B/B,CAAA"}
+{"version":3,"file":"worksheet-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,aAAa,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4B/B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.1.31",
+  "version": "4.1.35",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -29,16 +29,16 @@
     "@things-factory/document-template-base": "^4.1.28",
     "@things-factory/id-rule-base": "^4.1.28",
     "@things-factory/integration-lmd": "^4.1.28",
-    "@things-factory/integration-marketplace": "^4.1.31",
-    "@things-factory/integration-sellercraft": "^4.1.31",
+    "@things-factory/integration-marketplace": "^4.1.35",
+    "@things-factory/integration-sellercraft": "^4.1.35",
     "@things-factory/integration-sftp": "^4.1.28",
-    "@things-factory/marketplace-base": "^4.1.31",
+    "@things-factory/marketplace-base": "^4.1.35",
     "@things-factory/notification": "^4.1.28",
-    "@things-factory/sales-base": "^4.1.31",
+    "@things-factory/sales-base": "^4.1.35",
     "@things-factory/setting-base": "^4.1.28",
     "@things-factory/shell": "^4.1.28",
     "@things-factory/transport-base": "^4.1.28",
-    "@things-factory/warehouse-base": "^4.1.31"
+    "@things-factory/warehouse-base": "^4.1.35"
   },
-  "gitHead": "87a1ee9d97613f76b7b06bbbc59a16e1029e4dc9"
+  "gitHead": "a7e4a62c6ab05d18879ab945ac0f10be440a5f34"
 }

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

@@ -22,9 +22,11 @@ import {
 import { Domain } from '@things-factory/shell'
 import {
   Inventory,
+  INVENTORY_ITEM_SOURCE,
   INVENTORY_STATUS,
   INVENTORY_TRANSACTION_TYPE,
   InventoryHistory,
+  InventoryItem,
   InventoryNoGenerator,
   Location,
   Pallet,
@@ -33,7 +35,7 @@ import {
 
 import { RULE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
-import { DateGenerator } from '../../utils'
+import { DateGenerator, generateInventoryHistory } from '../../utils'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export type UnloadingWorksheetDetail = Partial<WorksheetDetail> & {
@@ -241,6 +243,189 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     }
   }
 
+  async scanSerialNumberUnload(
+    worksheetDetailName: string,
+    serialNumber: string,
+    inventory: Partial<Inventory>
+  ): Promise<void> {
+    const worksheetDetail: WorksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).findOne({
+      where: {
+        name: worksheetDetailName,
+        status: Not(Equal(WORKSHEET_STATUS.DEACTIVATED))
+      },
+      relations: [
+        'bizplace',
+        'worksheet',
+        'worksheet.arrivalNotice',
+        'worksheet.returnOrder',
+        'worksheet.bufferLocation',
+        'worksheet.bufferLocation.warehouse',
+        'targetProduct',
+        'targetProduct.product',
+        'targetProduct.product.productDetails',
+        'targetProduct.product.productDetails.childProductDetail',
+        'targetInventory',
+        'targetInventory.product',
+        'targetInventory.product.productDetails',
+        'targetInventory.product.productDetails.childProductDetail'
+      ]
+    })
+    if (!worksheetDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
+
+    if (!inventory?.palletId)
+      inventory.palletId = await generateId({
+        domain: this.domain,
+        type: RULE_TYPE.LOT_NUMBER_ID,
+        seed: { date: DateGenerator.generateDate() }
+      })
+
+    const bizplace: Bizplace = worksheetDetail.bizplace
+    const worksheet: Worksheet = worksheetDetail.worksheet
+    const arrivalNotice: ArrivalNotice = worksheet.arrivalNotice
+    const returnOrder: ReturnOrder = worksheet.returnOrder
+    const targetProduct: OrderProduct = worksheetDetail.targetProduct
+    const targetInventory: OrderInventory = worksheetDetail.targetInventory
+    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 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.checkSerialNumberDuplication(serialNumber, product)
+
+    qty++
+
+    const invQb: SelectQueryBuilder<Inventory> = await this.trxMgr
+      .getRepository(Inventory)
+      .createQueryBuilder('INV')
+      .where('INV.domain_id = :domainId', { domainId: this.domain.id })
+      .andWhere('INV.bizplace_id = :bizplaceId', { bizplaceId: bizplace.id })
+      .andWhere('INV.product_id = :productId', { productId: product.id })
+      .andWhere('INV.batch_id = :batchId', { batchId: batchId })
+      .andWhere('INV.packing_type = :packingType', { packingType: packingType })
+      .andWhere('INV.packing_size = :packingSize', { packingSize: packingSize })
+
+    if (arrivalNotice) invQb.andWhere('INV.ref_order_id = :arrivalNoticeId', { arrivalNoticeId: arrivalNotice.id })
+    else if (returnOrder) invQb.andWhere('INV.ref_order_id = :returnOrderId', { returnOrderId: returnOrder.id })
+
+    if (inventory?.expirationDate) {
+      invQb.andWhere('INV.expiration_date = :expirationDate', {
+        expirationDate: inventory.expirationDate
+      })
+    }
+
+    if (inventory?.cartonId) invQb.andWhere('INV.carton_id = :cartonId', { cartonId: inventory.cartonId })
+    else invQb.andWhere('INV.pallet_id = :palletId', { palletId: inventory.palletId })
+
+    let foundInventory: Inventory = await invQb.getOne()
+
+    const batchIdRef: string = Boolean(arrivalNotice) ? targetProduct.batchIdRef : null
+    const remark: string = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark
+    const manufactureDate: number = Boolean(arrivalNotice) ? targetProduct.manufactureDate : null
+    const location: Location = worksheet.bufferLocation
+    const warehouse: Warehouse = location.warehouse
+    const zone: string = location.zone
+    const unitCost: number = Boolean(arrivalNotice)
+      ? targetProduct?.unitPrice
+        ? ((targetProduct.packQty * targetProduct.unitPrice + targetProduct.miscAmt - targetProduct.discountAmt) *
+            (1 + targetProduct.taxRate / 100)) /
+          targetProduct.packQty
+        : 0
+      : null
+
+    if (!foundInventory) {
+      let newInventory: Partial<Inventory> = new Inventory()
+      newInventory.bizplace = bizplace
+      newInventory.domain = this.domain
+      newInventory.name = InventoryNoGenerator.inventoryName()
+      newInventory.palletId = inventory.palletId
+      newInventory.cartonId = inventory.cartonId
+      newInventory.batchId = batchId
+      newInventory.batchIdRef = batchIdRef
+      newInventory.product = product
+      newInventory.packingType = packingType
+      newInventory.packingSize = packingSize
+      newInventory.uom = uom
+      newInventory.remark = remark
+      newInventory.qty = qty
+      newInventory.uomValue =
+        Math.round(
+          qty *
+            (Boolean(arrivalNotice)
+              ? targetProduct.uomValue
+              : targetInventory.returnUomValue / targetInventory.returnQty) *
+            100
+        ) / 100
+      newInventory.manufactureDate = manufactureDate
+      newInventory.refOrderId = orderId
+      newInventory.unitCost = unitCost
+      if (inventory.reusablePallet?.id) {
+        newInventory.reusablePallet = await this.trxMgr.getRepository(Pallet).findOne(inventory.reusablePallet.id)
+      }
+      newInventory.orderProductId = Boolean(arrivalNotice) ? targetProduct.id : null
+      newInventory.orderInventoryId = Boolean(returnOrder) ? targetInventory.id : null
+      newInventory.warehouse = warehouse
+      newInventory.location = location
+      newInventory.zone = zone
+      newInventory.status = INVENTORY_STATUS.CHECKED
+      newInventory.creator = this.user
+
+      if (inventory?.expirationDate) {
+        newInventory.expirationDate = new Date(inventory.expirationDate)
+      }
+
+      if (arrivalNotice) {
+        targetProduct.actualPalletQty++
+        targetProduct.actualPackQty = Boolean(targetProduct.actualPackQty) ? targetProduct.actualPackQty + qty : qty
+      } else if (returnOrder) {
+        targetInventory.actualPalletQty++
+        targetInventory.actualPackQty = Boolean(targetInventory.actualPackQty)
+          ? targetInventory.actualPackQty + qty
+          : qty
+      }
+      foundInventory = 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 +=
+        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
+      foundInventory = await this.trxMgr.getRepository(Inventory).save(foundInventory)
+    }
+
+    let inventoryItem: InventoryItem = new InventoryItem()
+    inventoryItem.name = InventoryNoGenerator.inventoryItemName()
+    inventoryItem.serialNumber = serialNumber
+    inventoryItem.status = foundInventory.status
+    inventoryItem.inboundOrderId = foundInventory.refOrderId
+    inventoryItem.product = product
+    inventoryItem.inventory = foundInventory
+    inventoryItem.source = INVENTORY_ITEM_SOURCE.INBOUND
+    inventoryItem.domain = this.domain
+    inventoryItem.creator = this.user
+    inventoryItem.updater = this.user
+
+    await this.trxMgr.getRepository(InventoryItem).save(inventoryItem)
+
+    if (arrivalNotice) {
+      targetProduct.updater = this.user
+      this.updateOrderTargets([targetProduct])
+    } else if (returnOrder) {
+      targetInventory.updater = this.user
+      this.updateOrderTargets([targetInventory])
+    }
+  }
+
   async scanProductUnload(
     worksheetDetailName: string,
     productBarcode: string,
@@ -656,6 +841,60 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     }
   }
 
+  async undoSerialNumberUnload(worksheetDetailName: string, inventoryItemId: string): Promise<void> {
+    const worksheetDetail: WorksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).findOne({
+      where: { name: worksheetDetailName, domain: this.domain, status: Not(Equal(WORKSHEET_STATUS.DEACTIVATED)) },
+      relations: [
+        'worksheet',
+        'worksheet.arrivalNotice',
+        'worksheet.returnOrder',
+        'targetProduct',
+        'targetProduct.product'
+      ]
+    })
+
+    let worksheet: Worksheet = worksheetDetail.worksheet
+    let arrivalNotice: ArrivalNotice = worksheet.arrivalNotice
+    let returnOrder: ReturnOrder = worksheet.returnOrder
+    let targetInventory: OrderInventory = worksheetDetail.targetInventory
+    let targetProduct: OrderProduct = worksheetDetail.targetProduct
+    let inventoryItem: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
+      where: { domain: this.domain, id: inventoryItemId },
+      relations: ['inventory', 'product']
+    })
+    let inventory: Inventory = inventoryItem.inventory
+
+    await this.trxMgr.getRepository(InventoryItem).delete(inventoryItem.id)
+
+    inventory.qty--
+    inventory.uomValue =
+      Math.round(
+        inventory.qty *
+          (Boolean(arrivalNotice)
+            ? targetProduct.uomValue
+            : targetInventory.returnUomValue / targetInventory.returnQty) *
+          100
+      ) / 100
+    await this.trxMgr
+      .getRepository(Inventory)
+      .update({ id: inventory.id }, { qty: inventory.qty, uomValue: inventory.uomValue })
+
+    targetProduct.actualPackQty--
+
+    const inventoryItems: InventoryItem[] = await this.trxMgr.getRepository(InventoryItem).find({
+      where: { domain: this.domain, inboundOrderId: arrivalNotice.id, inventory }
+    })
+
+    if (inventoryItems?.length == 0) {
+      await this.trxMgr.getRepository(Inventory).delete(inventory.id)
+
+      targetProduct.actualPalletQty--
+    }
+
+    targetProduct.updater = this.user
+    await this.updateOrderTargets([targetProduct])
+  }
+
   async activateUnloading(
     worksheetNo: string,
     unloadingWorksheetDetails: UnloadingWorksheetDetail[]
@@ -785,6 +1024,43 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       await this.completeWorksheet(worksheet)
     }
 
+    const inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
+      where: {
+        domain: this.domain,
+        refOrderId: arrivalNotice.id,
+        status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED])
+      },
+      relations: ['domain', 'bizplace', 'product', 'warehouse', 'location']
+    })
+
+    for (let inventory of inventories) {
+      let inventoryItems: InventoryItem[] = await this.trxMgr.getRepository(InventoryItem).find({
+        where: { domain: this.domain, inventory }
+      })
+
+      if (inventoryItems?.length) {
+        inventory.status = INVENTORY_STATUS.STORED
+
+        await Promise.all(
+          inventoryItems.map(async inventoryItem => {
+            await this.trxMgr
+              .getRepository(InventoryItem)
+              .update({ id: inventoryItem.id }, { status: INVENTORY_STATUS.STORED })
+          })
+        )
+
+        await generateInventoryHistory(
+          inventory,
+          arrivalNotice,
+          INVENTORY_TRANSACTION_TYPE.UNLOADING,
+          inventory.qty,
+          inventory.uomValue,
+          this.user,
+          this.trxMgr
+        )
+      }
+    }
+
     let vasWorksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
       where: {
         arrivalNotice,