@things-factory/worksheet-base 4.0.24 → 4.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.0.24",
+  "version": "4.0.28",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,20 +24,20 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^4.0.24",
-    "@things-factory/biz-base": "^4.0.24",
-    "@things-factory/document-template-base": "^4.0.24",
-    "@things-factory/id-rule-base": "^4.0.24",
-    "@things-factory/integration-lmd": "^4.0.24",
-    "@things-factory/integration-marketplace": "^4.0.24",
-    "@things-factory/integration-sellercraft": "^4.0.24",
-    "@things-factory/marketplace-base": "^4.0.24",
-    "@things-factory/notification": "^4.0.24",
-    "@things-factory/sales-base": "^4.0.24",
-    "@things-factory/setting-base": "^4.0.24",
-    "@things-factory/shell": "^4.0.24",
-    "@things-factory/transport-base": "^4.0.24",
-    "@things-factory/warehouse-base": "^4.0.24"
+    "@things-factory/auth-base": "^4.0.28",
+    "@things-factory/biz-base": "^4.0.28",
+    "@things-factory/document-template-base": "^4.0.28",
+    "@things-factory/id-rule-base": "^4.0.28",
+    "@things-factory/integration-lmd": "^4.0.28",
+    "@things-factory/integration-marketplace": "^4.0.28",
+    "@things-factory/integration-sellercraft": "^4.0.28",
+    "@things-factory/marketplace-base": "^4.0.28",
+    "@things-factory/notification": "^4.0.28",
+    "@things-factory/sales-base": "^4.0.28",
+    "@things-factory/setting-base": "^4.0.28",
+    "@things-factory/shell": "^4.0.28",
+    "@things-factory/transport-base": "^4.0.28",
+    "@things-factory/warehouse-base": "^4.0.28"
   },
-  "gitHead": "ba94f3effd113a235e78a34391dbcd259ed410b0"
+  "gitHead": "fc526e27ae290a6fa3f001ce7ee75a2904b1d363"
 }

package/server/controllers/ecommerce/ecommerce-controller.ts

@@ -1,3 +1,5 @@
+import { Equal, Not } from 'typeorm'
+
 import { MarketplaceSetting, MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
 import {
   MarketplaceOrder,
@@ -6,7 +8,7 @@ import {
 } from '@things-factory/marketplace-base'
 import { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { getProductBundleInventory, Inventory } from '@things-factory/warehouse-base'
+import { getProductBundleInventory, Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
 import { WorksheetController } from '../worksheet-controller'
 
@@ -19,10 +21,20 @@ export class EcommerceController extends WorksheetController {
     let inventoryProducts: any[] = await Promise.all(
       orderProducts.map(async orderProduct => {
         const product = orderProduct.product
-        const inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
-          where: { domain: this.domain, product: orderProduct.product }
+        let inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
+          where: {
+            domain: this.domain,
+            product: orderProduct.product,
+            status: Not(Equal(INVENTORY_STATUS.TERMINATED))
+          },
+          relations: ['location']
         })
 
+        inventories = inventories.filter(
+          inventory =>
+            inventory?.location.type !== LOCATION_TYPE.QUARANTINE || inventory?.location.type !== LOCATION_TYPE.RESERVE
+        )
+
         const inventoryQty: number = inventories.reduce((total, currentValue) => {
           total += currentValue.qty
           return total
@@ -74,7 +86,9 @@ export class EcommerceController extends WorksheetController {
           }
 
           let productVariationLocationId = marketplaceProductVariation?.locationId
-          let adjustQty: number = Math.floor(inventoryProduct.qty * (percentageValue / 100))
+          let adjustQty: number = Math.floor(
+            (inventoryProduct.qty - marketplaceProductVariation.reserveQty) * (percentageValue / 100)
+          )
 
           if (marketplaceStore.platform === 'shopify') {
             let locationIds: any[] = JSON.parse(productVariationLocationId)

package/server/controllers/ecommerce/sellercraft-controller.ts

@@ -10,7 +10,7 @@ import {
   ReleaseGood,
   ReturnOrder
 } from '@things-factory/sales-base'
-import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
 import { WorksheetController } from '../worksheet-controller'
 
@@ -113,10 +113,16 @@ export class SellercraftController extends WorksheetController {
   async updateSellercraftStock(sellercraft: Sellercraft, inventory: Inventory): Promise<void> {
     let product: Product = inventory.product
     const productDetails: ProductDetail[] = product.productDetails
-    const inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
-      where: { domain: this.domain, product, status: Not(Equal(INVENTORY_STATUS.TERMINATED)) }
+    let inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
+      where: { domain: this.domain, product, status: Not(Equal(INVENTORY_STATUS.TERMINATED)) },
+      relations: ['location']
     })
 
+    inventories = inventories.filter(
+      inventory =>
+        inventory?.location.type !== LOCATION_TYPE.QUARANTINE || inventory?.location.type !== LOCATION_TYPE.RESERVE
+    )
+
     let defaultProductDetail: ProductDetail
     const sellercraftInvs: any[] = await Promise.all(
       inventories.map(async (inventory: Inventory) => {
@@ -158,7 +164,7 @@ export class SellercraftController extends WorksheetController {
     await SellercraftAPI.updateProduct(sellercraft, { sellercraftInv })
   }
 
-  async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<void> {
+  async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
     const orderInformation: any = {
       accountId: sellercraft.accountId,
       orderId: releaseGood.refNo2,
@@ -179,7 +185,7 @@ export class SellercraftController extends WorksheetController {
     }
     if (dropoffAddress) releaseGood.dropoffAddress = dropoffAddress
     releaseGood.updater = this.user
-    await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
+    return await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
   }
 
   async initiateOrderDocument(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<void> {

package/server/controllers/inbound/putaway-returning-worksheet-controller.ts

@@ -1,11 +1,13 @@
+import { Equal, In, Not } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
 import {
-  OrderInventory,
-  OrderNoGenerator,
   ORDER_INVENTORY_STATUS,
   ORDER_PRODUCT_STATUS,
   ORDER_STATUS,
   ORDER_TYPES,
+  OrderInventory,
+  OrderNoGenerator,
   ReturnOrder
 } from '@things-factory/sales-base'
 import {
@@ -17,7 +19,7 @@ import {
   Pallet,
   Warehouse
 } from '@things-factory/warehouse-base'
-import { Equal, In, Not } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
 import { switchLocationStatus } from '../../utils'
@@ -207,7 +209,13 @@ export class PutawayReturningWorksheetController extends VasWorksheetController
         where: {
           domain: this.domain,
           name: locationName,
-          type: In([LOCATION_TYPE.SHELF, LOCATION_TYPE.BUFFER, LOCATION_TYPE.FLOOR])
+          type: In([
+            LOCATION_TYPE.SHELF,
+            LOCATION_TYPE.BUFFER,
+            LOCATION_TYPE.FLOOR,
+            LOCATION_TYPE.QUARANTINE,
+            LOCATION_TYPE.RESERVED
+          ])
         },
         relations: ['warehouse']
       })
@@ -253,7 +261,14 @@ export class PutawayReturningWorksheetController extends VasWorksheetController
         where: {
           domain: this.domain,
           name: locationName,
-          type: In([LOCATION_TYPE.SHELF, LOCATION_TYPE.BUFFER, LOCATION_TYPE.FLOOR, LOCATION_TYPE.BIN])
+          type: In([
+            LOCATION_TYPE.SHELF,
+            LOCATION_TYPE.BUFFER,
+            LOCATION_TYPE.FLOOR,
+            LOCATION_TYPE.BIN,
+            LOCATION_TYPE.QUARANTINE,
+            LOCATION_TYPE.RESERVED
+          ])
         },
         relations: ['warehouse']
       })
@@ -298,7 +313,14 @@ export class PutawayReturningWorksheetController extends VasWorksheetController
       where: {
         domain: this.domain,
         name: locationName,
-        type: In([LOCATION_TYPE.SHELF, LOCATION_TYPE.FLOOR, LOCATION_TYPE.BIN, LOCATION_TYPE.BUFFER])
+        type: In([
+          LOCATION_TYPE.SHELF,
+          LOCATION_TYPE.FLOOR,
+          LOCATION_TYPE.BIN,
+          LOCATION_TYPE.BUFFER,
+          LOCATION_TYPE.QUARANTINE,
+          LOCATION_TYPE.RESERVED
+        ])
       },
       relations: ['warehouse']
     })

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

@@ -508,170 +508,148 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     )
   }
 
-  async undoUnload(worksheetDetailName: string, palletId: string): Promise<void> {
-    const worksheetDetail: WorksheetDetail = await this.findWorksheetDetailByName(worksheetDetailName, [
-      'targetProduct',
-      'targetInventory',
-      'worksheet',
-      'worksheet.arrivalNotice',
-      'worksheet.returnOrder'
-    ])
-    this.checkRecordValidity(worksheetDetail, {
-      status: (status: string) => {
-        const availableStatus: string[] = [WORKSHEET_STATUS.EXECUTING, WORKSHEET_STATUS.PARTIALLY_UNLOADED]
-        if (availableStatus.indexOf(status) < 0) {
-          throw new Error(
-            this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('status', 'Executing or Partially Unloaded', status)
-          )
-        }
-        return true
-      }
-    })
-
-    const worksheet: Worksheet = worksheetDetail.worksheet
-
-    let arrivalNotice: ArrivalNotice
-    let returnOrder: ReturnOrder
-    if (worksheet?.arrivalNotice) arrivalNotice = worksheet.arrivalNotice
-    else if (worksheet?.returnOrder) returnOrder = worksheet.returnOrder
-
-    let inventory: Inventory = await this.trxMgr.getRepository(Inventory).findOne({
-      where: { domain: this.domain, status: INVENTORY_STATUS.UNLOADED, palletId },
-      relations: ['location']
-    })
-
-    const qty: number = inventory.qty
-
-    if (arrivalNotice) {
-      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])
-    } else if (returnOrder) {
-      let targetInventory: OrderInventory = worksheetDetail.targetInventory
-      targetInventory.actualPackQty -= qty
-      targetInventory.actualPalletQty--
-      targetInventory.status = ORDER_PRODUCT_STATUS.UNLOADING
-      targetInventory.updater = this.user
-      await this.updateOrderTargets([targetInventory])
-    }
-
-    worksheetDetail.issue = null
-    worksheetDetail.status = WORKSHEET_STATUS.EXECUTING
-    worksheetDetail.updater = this.user
-    await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
-
-    inventory.lastSeq++
-    inventory.status = INVENTORY_STATUS.DELETED
-    inventory = await this.transactionInventory(
-      inventory,
-      Boolean(arrivalNotice) ? arrivalNotice : returnOrder,
-      -inventory.qty,
-      -inventory.uomValue,
-      INVENTORY_TRANSACTION_TYPE.UNDO_UNLOADING
-    )
-    inventory.qty = 0
-    inventory.uomValue = 0
-    inventory.updater = this.user
-
-    await this.trxMgr.getRepository(InventoryHistory).update({ inventory }, { inventory: null })
-
-    await this.trxMgr.getRepository(Inventory).delete({ id: inventory.id })
-  }
+  async undoUnload(orderType: string, orderNo: string, inventoryIds: [string]): Promise<void> {
+    for (var i = 0; i < inventoryIds.length; i++) {
+      const inventoryId: string = inventoryIds[i]
+      let inventory: Inventory = await this.trxMgr.getRepository(Inventory).findOne({
+        where: { domain: this.domain, id: inventoryId },
+        relations: ['location', 'product']
+      })
 
-  async undoProductScanUnload(worksheetDetailName: string, palletId: string, cartonId: string): Promise<void> {
-    const worksheetDetail: WorksheetDetail = await this.findWorksheetDetailByName(worksheetDetailName, [
-      'targetProduct',
-      'targetInventory',
-      'bizplace',
-      'targetProduct.product',
-      'targetInventory.product',
-      'worksheet',
-      'worksheet.arrivalNotice',
-      'worksheet.returnOrder'
-    ])
-    this.checkRecordValidity(worksheetDetail, {
-      status: (status: string) => {
-        const availableStatus: string[] = [WORKSHEET_STATUS.EXECUTING, WORKSHEET_STATUS.PARTIALLY_UNLOADED]
-        if (availableStatus.indexOf(status) < 0) {
-          throw new Error(
-            this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('status', 'Executing or Partially Unloaded', status)
-          )
+      this.checkRecordValidity(inventory, {
+        status: (status: string) => {
+          const availableStatus: string[] = [INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED]
+          if (availableStatus.indexOf(status) < 0) {
+            throw new Error(
+              this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE(
+                'status',
+                'Inventory current status unable to undo',
+                status
+              )
+            )
+          }
+          return true
         }
-        return true
-      }
-    })
+      })
 
-    let targetProduct: OrderProduct = worksheetDetail.targetProduct
-    let targetInventory: OrderInventory = worksheetDetail.targetInventory
-    const bizplace: Bizplace = worksheetDetail.bizplace
-    const arrivalNotice: ArrivalNotice = worksheetDetail.worksheet.arrivalNotice
-    const returnOrder: ReturnOrder = worksheetDetail.worksheet.returnOrder
-    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
+      const qty: number = inventory.qty
+
+      let targetProduct: OrderProduct
+      let targetInventory: OrderInventory
+      let arrivalNotice: ArrivalNotice
+      let returnOrder: ReturnOrder
+      let worksheetDetail: WorksheetDetail
+
+      if (orderType === ORDER_TYPES.ARRIVAL_NOTICE) {
+        arrivalNotice = await this.trxMgr.getRepository(ArrivalNotice).findOne({
+          where: { domain: this.domain, name: orderNo },
+          relations: ['orderProducts', 'orderProducts.product']
+        })
+
+        targetProduct = arrivalNotice.orderProducts.find(
+          op =>
+            op.batchId == inventory.batchId &&
+            op.packingType == inventory.packingType &&
+            op.product.id === inventory.product.id
+        )
 
-    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 (inventory.status == INVENTORY_STATUS.UNLOADED) {
+          targetProduct.actualPackQty -= qty
+          targetProduct.actualPalletQty--
+          targetProduct.remark = null
+          targetProduct.issue = null
+          targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
+        } else {
+          targetProduct.actualPackQty--
+        }
+        targetProduct.updater = this.user
+        await this.updateOrderTargets([targetProduct])
 
-    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 })
+        worksheetDetail = await this.trxMgr
+          .getRepository(WorksheetDetail)
+          .findOne({ where: { domain: this.domain, targetProduct } })
+      } else {
+        returnOrder = await this.trxMgr.getRepository(ReturnOrder).findOne({
+          where: { domain: this.domain, name: orderNo },
+          relations: ['orderInventories', 'orderInventories.inventory', 'orderInventories.product']
+        })
+
+        targetInventory = returnOrder.orderInventories.find(
+          oi =>
+            oi.batchId == inventory.batchId &&
+            oi.packingType == inventory.packingType &&
+            oi.product.id == inventory.product.id &&
+            oi.inventory.id == inventory.id
+        )
+        if (inventory.status == INVENTORY_STATUS.UNLOADED) {
+          targetInventory.actualPackQty -= qty
+          targetInventory.actualPalletQty--
+          targetInventory.status = ORDER_PRODUCT_STATUS.UNLOADING
+        } else {
+          targetInventory.actualPackQty--
+        }
+        targetInventory.updater = this.user
+        await this.updateOrderTargets([targetInventory])
 
-    if (cartonId) invQb.andWhere('INV.carton_id = :cartonId', { cartonId: cartonId })
-    else invQb.andWhere('INV.pallet_id = :palletId', { palletId: palletId })
+        worksheetDetail = await this.trxMgr
+          .getRepository(WorksheetDetail)
+          .findOne({ where: { domain: this.domain, targetInventory } })
+      }
 
-    let foundInventory: Inventory = await invQb.getOne()
-    if (!foundInventory) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(foundInventory.palletId))
+      if (inventory.status == INVENTORY_STATUS.CHECKED) {
+        inventory.qty--
+        inventory.uomValue =
+          Math.round(
+            inventory.qty *
+              (Boolean(orderType === ORDER_TYPES.ARRIVAL_NOTICE)
+                ? targetProduct.uomValue
+                : targetInventory.returnUomValue) *
+              100
+          ) / 100
+        inventory.updater = this.user
+        await this.trxMgr.getRepository(Inventory).save(inventory)
+
+        if (inventory == 0) {
+          inventory.lastSeq++
+          inventory.status = INVENTORY_STATUS.DELETED
+          inventory = await this.transactionInventory(
+            inventory,
+            Boolean(orderType === ORDER_TYPES.ARRIVAL_NOTICE) ? arrivalNotice : returnOrder,
+            -inventory.qty,
+            -inventory.uomValue,
+            INVENTORY_TRANSACTION_TYPE.UNDO_UNLOADING
+          )
+          inventory.qty = 0
+          inventory.uomValue = 0
+          inventory.updater = this.user
 
-    if (arrivalNotice) {
-      targetProduct.actualPackQty--
-      targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
-      targetProduct.updater = this.user
-    } else if (returnOrder) {
-      targetInventory.actualPackQty--
-      targetInventory.status = ORDER_PRODUCT_STATUS.UNLOADING
-      targetInventory.updater = this.user
-    }
+          await this.trxMgr.getRepository(InventoryHistory).update({ inventory }, { inventory: null })
 
-    foundInventory.qty--
-    foundInventory.uomValue =
-      Math.round(
-        foundInventory.qty * (Boolean(arrivalNotice) ? targetProduct.uomValue : targetInventory.returnUomValue) * 100
-      ) / 100
-    foundInventory.updater = this.user
+          await this.trxMgr.getRepository(Inventory).delete({ id: inventory.id })
+        }
+      } else {
+        inventory.lastSeq++
+        inventory.status = INVENTORY_STATUS.DELETED
+        inventory = await this.transactionInventory(
+          inventory,
+          Boolean(orderType === ORDER_TYPES.ARRIVAL_NOTICE) ? arrivalNotice : returnOrder,
+          -inventory.qty,
+          -inventory.uomValue,
+          INVENTORY_TRANSACTION_TYPE.UNDO_UNLOADING
+        )
+        inventory.qty = 0
+        inventory.uomValue = 0
+        inventory.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)
+        await this.trxMgr.getRepository(InventoryHistory).update({ inventory }, { inventory: null })
 
-    if (foundInventory.qty == 0) {
-      if (arrivalNotice) {
-        targetProduct.actualPalletQty--
-        targetProduct.issue = null
-        targetProduct.remark = null
-        await this.updateOrderTargets([targetProduct])
-      } else if (returnOrder) {
-        targetInventory.actualPalletQty--
-        await this.updateOrderTargets([targetInventory])
+        await this.trxMgr.getRepository(Inventory).delete({ id: inventory.id })
       }
-      await this.trxMgr.getRepository(Inventory).delete({ id: foundInventory.id })
-    } else {
-      if (arrivalNotice) await this.updateOrderTargets([targetProduct])
-      else if (returnOrder) await this.updateOrderTargets([targetInventory])
-      await this.trxMgr.getRepository(Inventory).save(foundInventory)
+
+      worksheetDetail.issue = inventory.qty == 0 && worksheetDetail?.issue ? null : worksheetDetail.issue
+      worksheetDetail.status = WORKSHEET_STATUS.EXECUTING
+      worksheetDetail.updater = this.user
+      await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
     }
   }
 

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

@@ -12,12 +12,11 @@ export class PackingWorksheetController extends VasWorksheetController {
       ReleaseGood,
       {
         domain: this.domain,
-        name: releaseGoodNo,
-        status: ORDER_STATUS.READY_TO_PACK
+        name: releaseGoodNo
       },
       ['orderInventories', 'orderInventories.inventory']
     )
-    const orderInventories: OrderInventory[] = releaseGood.orderInventories
+    let 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 }
@@ -40,10 +39,6 @@ export class PackingWorksheetController extends VasWorksheetController {
     })
     await this.updateOrderTargets(orderInventories)
 
-    releaseGood.status = ORDER_STATUS.READY_TO_PACK
-    releaseGood.updater = this.user
-    await this.updateRefOrder(releaseGood)
-
     return worksheet
   }
 

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

@@ -823,16 +823,16 @@ export class PickingWorksheetController extends VasWorksheetController {
       status: ORDER_STATUS.PICKING
     })
 
-    const worksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [
+    let worksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [
       'worksheetDetails',
       'worksheetDetails.targetInventory'
     ])
-    this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
+    await this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
 
     let orderStatus: string
     if (releaseGood?.packingOption) {
       orderStatus = ORDER_STATUS.READY_TO_PACK
-    } else if (!releaseGood?.courierOption && !releaseGood?.packingOption) {
+    } else {
       orderStatus = ORDER_STATUS.LOADING
     }
 
@@ -933,7 +933,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         name: 'enable-bin-picking'
       }
     })
-    if (binPickingSetting?.value && binPickingSetting.value.toLowerCase() === 'true') {
+    if (binPickingSetting != undefined && binPickingSetting.value.toLowerCase() == 'true') {
       if (binLocation) {
         const foundBinLocation: Location = await this.trxMgr.getRepository(Location).findOne({
           where: { domain: this.domain, name: binLocation, type: LOCATION_TYPE.BIN }

package/server/controllers/render-grn.ts

@@ -166,9 +166,12 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
     gan_accepted_at: foundGAN.acceptedAt ? DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
     unload_date: DateTimeConverter.date(foundWS.endedAt),
     ref_no: ownRefNo ? `${foundGAN.name} / ${foundGAN.refNo}` : `${foundGAN.name}`,
+    ref_no1: foundGAN.refNo2 ? `${foundGAN.refNo2}` : '',
+    ref_no2: foundGAN.refNo3 ? `${foundGAN.refNo3}` : '',
     received_date: DateTimeConverter.date(foundWS.endedAt),
     truck_no: foundGAN.truckNo || '',
     container_no: foundGAN.containerNo || '',
+    container_size: foundGAN.containerSize || '',
     delivery_order_no: foundGAN.deliveryOrderNo ? foundGAN.deliveryOrderNo : '',
     account_no: foundPartnerCP ? foundPartnerCP.accountNo : '',
     unloaded_by: foundWS ? foundWS.updater.name : '',
@@ -198,8 +201,10 @@ export async function renderGRN({ grnNo, timezoneOffSet }, context: any) {
           Math.round((unloadInvHistory.uomValue || item.uomValue * item.actualPackQty) * 100) / 100
         }`,
         product_uom: `${unloadInvHistory.uom || item.uom}`,
-        expiry_date: unloadInvHistory.expiryDate || ``,
-        reusable_pallet_id: unloadInvHistory.reusablePalletId || ``,
+        product_gross_weight: item.product.grossWeight || null,
+        unit_price: item.unitPrice || null,
+        expiry_date: unloadInvHistory.expiryDate || '',
+        reusable_pallet_id: unloadInvHistory.reusablePalletId || '',
         remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
       }
     })

package/server/controllers/render-manual-do.ts

@@ -1,13 +1,15 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { getRepository } from 'typeorm'
+
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
+import { Product } from '@things-factory/product-base'
 import { DeliveryOrder, OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Product } from '@things-factory/product-base'
-import FormData from 'form-data'
-import fetch from 'node-fetch'
-import { getRepository } from 'typeorm'
+
 import { TEMPLATE_TYPE } from '../constants'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
@@ -107,6 +109,7 @@ export async function renderManualDO({ doNo }, context: any) {
         product_batch: `${oi.batchId}`,
         product_qty: `${oi.releaseQty}`,
         product_weight: `${oi.releaseWeight}`,
+        product_gross_weight: product.grossWeight,
         product_uom_value: `${oi.releaseUomValue}`,
         product_uom: `${product.primaryUnit || ''}`,
         remark: `${oi.remark}`,

package/server/controllers/render-orientage-do.ts

@@ -1,14 +1,16 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { Equal, getRepository, In } from 'typeorm'
+
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
-import { DeliveryOrder, OrderInventory, ORDER_STATUS, ReleaseGood } from '@things-factory/sales-base'
+import { ProductDetail } from '@things-factory/product-base'
+import { DeliveryOrder, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Product, ProductDetail } from '@things-factory/product-base'
 import { Inventory, Pallet } from '@things-factory/warehouse-base'
-import FormData from 'form-data'
-import fetch from 'node-fetch'
-import { Equal, getRepository, In } from 'typeorm'
+
 import { TEMPLATE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'