@things-factory/worksheet-base 4.3.185 → 4.3.187

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.185",
+  "version": "4.3.187",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,19 +26,19 @@
     "@things-factory/auth-base": "^4.3.179",
     "@things-factory/biz-base": "^4.3.179",
     "@things-factory/document-template-base": "^4.3.179",
-    "@things-factory/id-rule-base": "^4.3.179",
-    "@things-factory/integration-accounting": "^4.3.179",
-    "@things-factory/integration-lmd": "^4.3.179",
-    "@things-factory/integration-marketplace": "^4.3.179",
-    "@things-factory/integration-sellercraft": "^4.3.179",
-    "@things-factory/integration-sftp": "^4.3.179",
-    "@things-factory/marketplace-base": "^4.3.180",
-    "@things-factory/notification": "^4.3.179",
-    "@things-factory/sales-base": "^4.3.184",
-    "@things-factory/setting-base": "^4.3.179",
+    "@things-factory/id-rule-base": "^4.3.187",
+    "@things-factory/integration-accounting": "^4.3.186",
+    "@things-factory/integration-lmd": "^4.3.186",
+    "@things-factory/integration-marketplace": "^4.3.186",
+    "@things-factory/integration-sellercraft": "^4.3.186",
+    "@things-factory/integration-sftp": "^4.3.186",
+    "@things-factory/marketplace-base": "^4.3.186",
+    "@things-factory/notification": "^4.3.186",
+    "@things-factory/sales-base": "^4.3.187",
+    "@things-factory/setting-base": "^4.3.186",
     "@things-factory/shell": "^4.3.179",
     "@things-factory/transport-base": "^4.3.179",
-    "@things-factory/warehouse-base": "^4.3.183"
+    "@things-factory/warehouse-base": "^4.3.187"
   },
-  "gitHead": "c7cd806b0057f8c112417716216dc7a740fb0431"
+  "gitHead": "a6192bef4662aafeb4e9d4e715dca07aa1459b2d"
 }

package/server/constants/worksheet.ts

@@ -11,7 +11,9 @@ export const WORKSHEET_TYPE = {
   CYCLE_COUNT_RECHECK: 'CYCLE_COUNT_RECHECK',
   WAREHOUSE_RETURN: 'WAREHOUSE_RETURN',
   UNLOADING_RETURN: 'UNLOADING_RETURN',
-  PUTAWAY_RETURN: 'PUTAWAY_RETURN'
+  PUTAWAY_RETURN: 'PUTAWAY_RETURN',
+  PICKING_REPLENISHMENT: 'PICKING_REPLENISHMENT',
+  PUTAWAY_REPLENISHMENT: 'PUTAWAY_REPLENISHMENT'
 }
 
 export const WORKSHEET_STATUS = {

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

@@ -232,7 +232,7 @@ export class EcommerceController extends WorksheetController {
       ? marketplaceOrderShipping.ownTransporter
       : marketplaceOrderShipping.transporter
 
-    const orderPackage: OrderPackage = {
+    let orderPackage: OrderPackage = {
       name: OrderNoGenerator.orderPackage(),
       packageId: null,
       trackingNo,
@@ -262,5 +262,8 @@ export class EcommerceController extends WorksheetController {
     })
 
     await tx.getRepository(OrderPackageItem).save(orderPackageItems)
+    orderPackage.orderPackageItems = orderPackageItems
+    releaseGood.orderPackages = [orderPackage]
+    return releaseGood
   }
 }

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

@@ -336,12 +336,26 @@ export class SellercraftController extends WorksheetController {
               .filter(op => op?.marketRtsCallSuccess == undefined)
               .map(async op => {
                 if (!op?.packageId) throw new Error('Order package id is not found')
+                if (releaseGood.lmdOption && !op?.parcelId) return
 
-                const orderInformation: any = {
+                let orderInformation: any = {
                   accountId: sellercraft.accountId,
                   orderId: releaseGood.refNo2,
                   packageId: op.packageId
                 }
+                if (releaseGood.lmdOption) {
+                  let releaseGoodQuery: ReleaseGood = await getRepository(ReleaseGood).findOne({
+                    where: { id: releaseGood.id },
+                    relations: ['lastMileDelivery']
+                  })
+                  orderInformation = {
+                    ...orderInformation,
+                    awb: op.airwayBill,
+                    trackingNo: op.trackingNo,
+                    lmdOption: releaseGood.lmdOption,
+                    shipperName: releaseGoodQuery.lastMileDelivery.platform
+                  }
+                }
 
                 try {
                   await SellercraftAPI.initiateOrderShipment(sellercraft, {

package/server/controllers/index.ts

@@ -11,7 +11,6 @@ export * from './render-fm-grn'
 export * from './render-manifest'
 export * from './render-po'
 
-
 /* Worksheet Controllers */
 export * from './worksheet-controller'
 export * from './ecommerce'
@@ -19,3 +18,4 @@ export * from './inbound'
 export * from './inspect'
 export * from './outbound'
 export * from './vas'
+export * from './replenishment'

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

@@ -2,7 +2,6 @@ import { EntityManager, Equal, getConnection, getManager, In, IsNull, Not } from
 
 import { ApplicationType } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import { logger } from '@things-factory/env'
 import { generateId } from '@things-factory/id-rule-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { Product, ProductBarcode, ProductDetail } from '@things-factory/product-base'
@@ -18,7 +17,8 @@ import {
   OrderToteItem,
   OrderToteSeal,
   OrderVas,
-  ReleaseGood
+  ReleaseGood,
+  Replenishment
 } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import {
@@ -40,6 +40,7 @@ import { SellercraftController } from '../../controllers'
 import { Worksheet, WorksheetDetail } from '../../entities'
 import { isInventoryObsolete, WorksheetNoGenerator } from '../../utils'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
+import { logger } from '@things-factory/env'
 
 export class PickingWorksheetController extends VasWorksheetController {
   async generatePickingWorksheet(releaseGoodNo: string, currentStatus: string = null): Promise<Worksheet> {
@@ -187,7 +188,13 @@ export class PickingWorksheetController extends VasWorksheetController {
     let worksheet: Worksheet = await this.findActivatableWorksheet(worksheetNo, WORKSHEET_TYPE.PICKING, [
       'releaseGood',
       'releaseGood.bizplace',
+      'releaseGood.domain',
+      'releaseGood.lastMileDelivery',
       'releaseGood.bizplace.domain',
+      'releaseGood.orderPackages',
+      'releaseGood.orderPackages.orderPackageItems',
+      'releaseGood.orderPackages.orderPackageItems.orderProduct',
+      'releaseGood.orderPackages.orderPackageItems.orderProduct.product',
       'domain',
       'bizplace',
       'bizplace.domain',
@@ -203,6 +210,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       let targetInventory: OrderInventory = wsd.targetInventory
       targetInventory.status = ORDER_INVENTORY_STATUS.PICKING
       targetInventory.updater = this.user
+
       return targetInventory
     })
     this.updateOrderTargets(targetInventories)
@@ -274,6 +282,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       'worksheetDetails',
       'worksheetDetails.targetInventory',
       'worksheetDetails.targetInventory.releaseGood',
+      'worksheetDetails.targetInventory.releaseGood.domain',
       'worksheetDetails.targetInventory.product',
       'bizplace',
       'bizplace.domain',
@@ -286,6 +295,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       let targetInventory: OrderInventory = wsd.targetInventory
       targetInventory.status = ORDER_INVENTORY_STATUS.PICKING
       targetInventory.updater = this.user
+
       return targetInventory
     })
     this.updateOrderTargets(targetInventories)
@@ -296,12 +306,16 @@ export class PickingWorksheetController extends VasWorksheetController {
     const pickingOrderInventory: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
       where: { domain: this.domain, refWorksheetId: worksheet.id, status: ORDER_STATUS.PICKING },
       relations: [
-        'releaseGood',
-        'releaseGood.domain',
-        'releaseGood.bizplace',
-        'releaseGood.bizplace.domain',
-        'releaseGood.orderPackages'
-      ]
+      'releaseGood',
+      'releaseGood.domain',
+      'releaseGood.lastMileDelivery', 
+      'releaseGood.bizplace',
+      'releaseGood.bizplace.domain',
+      'releaseGood.orderPackages',
+      'releaseGood.orderPackages.orderPackageItems',
+      'releaseGood.orderPackages.orderPackageItems.orderProduct',
+      'releaseGood.orderPackages.orderPackageItems.orderProduct.product'
+    ]
     })
 
     let releaseGoods: ReleaseGood[] = pickingOrderInventory.reduce((data, oi: OrderInventory) => {
@@ -624,7 +638,10 @@ export class PickingWorksheetController extends VasWorksheetController {
             let releaseGood: ReleaseGood = await this.trxMgr
               .getRepository(ReleaseGood)
               .findOne({ where: { id: foundSerialNumber.outboundOrderId } })
-            throw new Error(`Inventory Item is already picked in ${releaseGood.name}`)
+
+            if (releaseGood) {
+              throw new Error(`Inventory Item is already picked in ${releaseGood.name}`)
+            }
           }
 
           foundSerialNumber.status = INVENTORY_STATUS.PICKING
@@ -851,7 +868,10 @@ export class PickingWorksheetController extends VasWorksheetController {
             let releaseGood: ReleaseGood = await this.trxMgr
               .getRepository(ReleaseGood)
               .findOne({ where: { id: foundSerialNumber.outboundOrderId } })
-            throw new Error(`Inventory Item is already picked in ${releaseGood.name}`)
+
+            if (releaseGood) {
+              throw new Error(`Inventory Item is already picked in ${releaseGood.name}`)
+            }
           }
 
           foundSerialNumber.status = INVENTORY_STATUS.PICKING

package/server/controllers/pos/xilnex-controller.ts

@@ -7,6 +7,7 @@ import {
   DeliveryOrder,
   ORDER_SOURCE_TYPE,
   OrderInventory,
+  OrderProduct,
   ReleaseGood
 } from '@things-factory/sales-base'
 import { Inventory } from '@things-factory/warehouse-base'
@@ -31,14 +32,17 @@ export class XilnexController extends WorksheetController {
         .getRepository(Inventory)
         .createQueryBuilder('iv')
         .select('p.sku', 'productSku')
+        .addSelect('op.ref_item_id', 'refItemId')
         .addSelect('SUM(COALESCE(iv.qty,0))', 'totalQty')
         .addSelect('SUM(COALESCE(iv.unit_cost,0))', 'unitCost')
         .innerJoin('iv.location', 'loc')
         .innerJoin('iv.product', 'p')
+        .leftJoin(OrderProduct, 'op', 'iv.order_product_id::uuid = op.id::uuid')
         .where('"iv"."id" IN (:...inventoryIds)')
         .groupBy('iv.product_id')
         .addGroupBy('p.sku')
         .addGroupBy('iv.batch_id')
+        .addGroupBy('op.ref_item_id')
         .setParameters({
           inventoryIds: inventoryIds
         })
@@ -50,7 +54,8 @@ export class XilnexController extends WorksheetController {
             sku: item.productSku
           },
           actualPackQty: item.totalQty,
-          unitPrice: item.unitCost
+          unitPrice: item.unitCost,
+          refItemId: item.refItemId
         }
       })
 

package/server/controllers/replenishment/index.ts

@@ -0,0 +1 @@
+export * from './replenishment-worksheet-controller'