@things-factory/worksheet-base 4.3.129 → 4.3.131

package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts

@@ -1,8 +1,8 @@
 import { EntityManager, In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-// import { logger } from '@things-factory/env'
-// import { Account, AccountingAPI } from '@things-factory/integration-accounting'
+import { logger } from '@things-factory/env'
+import { Account, AccountingAPI } from '@things-factory/integration-accounting'
 import {
   DeliveryOrder,
   ORDER_INVENTORY_STATUS,
@@ -30,8 +30,6 @@ export const confirmCancellationReleaseOrder = {
         'orderInventories',
         'orderInventories.inventory',
         'orderInventories.inventory.location',
-        'orderInventories.inventory.product',
-        'orderInventories.inventory.productDetail',
         'orderVass'
       ]
     })
@@ -196,40 +194,38 @@ export const confirmCancellationReleaseOrder = {
     releaseGood.updater = user
     await tx.getRepository(ReleaseGood).save(releaseGood)
 
-    // if (releaseGood?.refNo3 && releaseGood?.type == 'b2c') {
-    //   const account: Account = await tx
-    //     .getRepository(Account)
-    //     .findOne({ domain: releaseGood.bizplace.domain, status: 'active' })
-
-    //   // Xilnex create shipment and create sales return if sales invoice is completed
-    //   const createSalesReturn = async account => {
-    //     if (account) {
-    //       await getManager().transaction(async txMgr => {
-    //         if (account.platform == 'xilnex') {
-    //           try {
-    //             await AccountingAPI.createShipment(account, {
-    //               releaseGood,
-    //               orderProducts: releaseGood.orderProducts
-    //             })
-    //           } catch (error) {
-    //             logger.error(`confirm-cancellation-release-order[createShipment]: ${error}`)
-    //           }
-
-    //           try {
-    //             await AccountingAPI.createSalesReturn(account, {
-    //               releaseGood,
-    //               orderProducts: releaseGood.orderProducts
-    //             })
-    //           } catch (error) {
-    //             logger.error(`confirm-cancellation-release-order[createSalesReturn]: ${error}`)
-    //           }
-    //         }
-    //       })
-    //     }
-    //   }
-
-    //   createSalesReturn(account)
-    // }
+    if (releaseGood?.refNo3 && releaseGood?.type == 'b2c') {
+      const account: Account = await tx
+        .getRepository(Account)
+        .findOne({ domain: releaseGood.bizplace.domain, status: 'active' })
+
+      // Xilnex create shipment and create sales return if sales invoice is completed
+      const createSalesReturn = async account => {
+        if (account) {
+          if (account.platform == 'xilnex') {
+            try {
+              await AccountingAPI.createShipment(account, {
+                releaseGood,
+                orderProducts: releaseGood.orderProducts
+              })
+            } catch (error) {
+              logger.error(`confirm-cancellation-release-order[createShipment]: ${error}`)
+            }
+
+            try {
+              await AccountingAPI.createSalesReturn(account, {
+                releaseGood,
+                orderProducts: releaseGood.orderProducts
+              })
+            } catch (error) {
+              logger.error(`confirm-cancellation-release-order[createSalesReturn]: ${error}`)
+            }
+          }
+        }
+      }
+
+      createSalesReturn(account)
+    }
 
     return
   }

package/server/graphql/resolvers/worksheet/loading/complete-loading.ts

@@ -2,6 +2,7 @@ import { EntityManager } from 'typeorm'
 
 import { ApplicationType, User } from '@things-factory/auth-base'
 import { Bizplace, Company } from '@things-factory/biz-base'
+import { Account } from '@things-factory/integration-accounting'
 import { FulfillmentCenter } from '@things-factory/integration-fulfillment'
 import { Sftp, SftpAPI } from '@things-factory/integration-sftp'
 import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
@@ -10,6 +11,7 @@ import { InventoryItem } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_TYPE } from '../../../../constants'
 import { LoadingWorksheetController, ReturningWorksheetController } from '../../../../controllers'
+import { XilnexController } from '../../../../controllers/pos'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 
 export const completeLoadingResolver = {
@@ -98,6 +100,18 @@ export async function completeLoading(
       }
       break
 
+    case ApplicationType.XILNEX:
+      const xilnex: Account = await tx
+        .getRepository(Account)
+        .findOne({ where: { domain: releaseGood.bizplace.domain, status: 'active', platform: 'xilnex' } })
+
+      if (xilnex) {
+        const xilnexCtrl: XilnexController = new XilnexController(tx, domain, user)
+        await xilnexCtrl.deliveryTransferNote(tx, xilnex, releaseGood.id)
+      }
+
+      break
+
     default:
       break
   }

package/server/graphql/resolvers/worksheet/packing/complete-packing.ts

@@ -2,9 +2,13 @@ import { EntityManager } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getMyBizplace } from '@things-factory/biz-base'
+import { logger } from '@things-factory/env'
+import { Account } from '@things-factory/integration-accounting'
+import { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 
 import { PackingWorksheetController } from '../../../../controllers/'
+import { XilnexController } from '../../../../controllers/pos'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
 
 export const completePackingResolver = {
@@ -12,6 +16,26 @@ export const completePackingResolver = {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
     await completePacking(tx, domain, user, releaseGoodNo)
 
+    const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+      where: { name: releaseGoodNo, domain },
+      relations: ['bizplace', 'bizplace.domain']
+    })
+
+    if (releaseGood.type == 'b2c') {
+      const xilnex: Account = await tx
+        .getRepository(Account)
+        .findOne({ where: { domain: releaseGood.bizplace.domain, status: 'active', platform: 'xilnex' } })
+
+      if (xilnex) {
+        try {
+          const xilnexCtrl: XilnexController = new XilnexController(tx, domain, user)
+          await xilnexCtrl.createShipment(tx, xilnex, releaseGood.id)
+        } catch (error) {
+          logger.error(`worksheet-base[completePacking]: ${error}`)
+        }
+      }
+    }
+
     const bizplace: Bizplace = await getMyBizplace(domain, user)
     const worksheetController: WorksheetController = new WorksheetController(tx, domain, user)
     await worksheetController.notifyToCustomer(bizplace, {

package/server/graphql/resolvers/worksheet/picking/activate-batch-picking.ts

@@ -1,4 +1,4 @@
-import { EntityManager } from 'typeorm'
+import { EntityManager, getConnection } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
@@ -6,6 +6,7 @@ import { Domain } from '@things-factory/shell'
 
 import { EcommerceController, PickingWorksheetController } from '../../../../controllers'
 import { Worksheet } from '../../../../entities'
+import { logger } from '@things-factory/env'
 
 export const activateBatchPickingResolver = {
   async activateBatchPicking(_: any, { worksheetNo }, context: any) {
@@ -20,21 +21,38 @@ export async function activateBatchPicking(
   user: User,
   worksheetNo: string
 ): Promise<Worksheet> {
-  const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
-  const worksheet = await worksheetController.activateBatchPicking(worksheetNo)
-  const worksheetDetails = worksheet.worksheetDetails
-  const companyDomain: Domain = worksheet?.bizplace.company.domain
-
-  // find for any existing marketplace store connections
-  const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
-    where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
-    relations: ['marketplaceDistributors']
-  })
-
-  if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
-    let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
-    const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-    await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
+  try {
+    const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
+    const worksheet = await worksheetController.activateBatchPicking(worksheetNo)
+    const worksheetDetails = worksheet.worksheetDetails
+    const companyDomain: Domain = worksheet?.bizplace.company.domain
+
+    // find for any existing marketplace store connections
+    const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
+      where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
+      relations: ['marketplaceDistributors']
+    })
+
+    const updateMarketplaceProductVariationStock = async (worksheetDetails, domain, user, marketplaceStores, companyDomain) => {
+      try {
+        await getConnection().transaction(async (tx2: EntityManager) => {
+          let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
+          const ecommerceCtrl: EcommerceController = new EcommerceController(tx2, domain, user)
+          await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
+        })
+      } catch (error) {
+        logger.error(`activate-batch-picking[activateBatchPicking]: ${worksheetNo + ':' + error}`)
+      }
+    }
+
+    if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
+      updateMarketplaceProductVariationStock(worksheetDetails, domain, user, marketplaceStores, companyDomain)
+    }
+
+    return worksheet
+
+  } catch (error) {
+    logger.error(`activate-batch-picking[activateBatchPicking]: ${worksheetNo + ':' + error}`)
+    throw new Error('Something went wrong. Please contact support.')
   }
-  return worksheet
 }

package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts

@@ -6,6 +6,7 @@ import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import { OrderInventory, ReleaseGood } from '@things-factory/sales-base'
+import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
 import {
@@ -88,7 +89,13 @@ export async function completeBatchPicking(
               }
             }
 
-            sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood)
+            const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
+              where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
+            })
+
+            if (rtsTriggerLevel && parseInt(rtsTriggerLevel?.value || 0) == 1) {
+              sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood)
+            }
           }
           break
 

package/server/graphql/resolvers/worksheet/picking/complete-picking.ts

@@ -2,8 +2,8 @@ import { EntityManager, getManager } from 'typeorm'
 
 import { ApplicationType, User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'
-// import { logger } from '@things-factory/env'
-// import { Account, AccountingAPI } from '@things-factory/integration-accounting'
+import { logger } from '@things-factory/env'
+import { Account, AccountingAPI } from '@things-factory/integration-accounting'
 import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
 import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
@@ -255,51 +255,49 @@ export async function completePicking(
       break
   }
 
-  // const account: Account = await tx
-  //   .getRepository(Account)
-  //   .findOne({ domain: releaseGood.bizplace.domain, status: 'active' })
-
-  // // Xilnex Create Sales Order and Post Sales Order to Sales Invoice
-  // const createSalesOrder = async account => {
-  //   if (account) {
-  //     try {
-  //       await getManager().transaction(async txMgr => {
-  //         if (account.platform == 'xilnex') {
-  //           const salesOrder: any = await AccountingAPI.createSalesOrder(account, {
-  //             releaseGood,
-  //             orderProducts: releaseGood.orderProducts
-  //           })
-
-  //           if (salesOrder) {
-  //             const salesInvoice: any = await AccountingAPI.postSalesOrderToSalesInvoice(account, {
-  //               orderId: salesOrder?.id || null
-  //             })
-
-  //             const salesOrderItems: any = salesInvoice.sale.items
-  //             await Promise.all(
-  //               releaseGood.orderProducts.map(async op => {
-  //                 const matchedProduct: any = salesOrderItems.find(soi => soi.itemId == op.productDetail.refCode)
-  //                 if (matchedProduct) {
-  //                   await tx.getRepository(OrderProduct).update({ id: op.id }, { refItemId: matchedProduct.id })
-  //                 }
-  //               })
-  //             )
-
-  //             await txMgr
-  //               .getRepository(ReleaseGood)
-  //               .update({ id: releaseGood.id }, { refNo3: salesInvoice.salesId, updater: releaseGood.updater })
-  //           }
-  //         }
-  //       })
-  //     } catch (error) {
-  //       logger.error(`complete-picking[createSalesOrder]: ${error}`)
-  //     }
-  //   }
-  // }
-
-  // if (releaseGood.type == 'b2c') {
-  //   createSalesOrder(account)
-  // }
+  const account: Account = await tx
+    .getRepository(Account)
+    .findOne({ domain: releaseGood.bizplace.domain, status: 'active' })
+
+  // Xilnex Create Sales Order and Post Sales Order to Sales Invoice
+  const createSalesOrder = async (account, tx) => {
+    if (account) {
+      try {
+        if (account.platform == 'xilnex') {
+          const salesOrder: any = await AccountingAPI.createSalesOrder(account, {
+            releaseGood,
+            orderProducts: releaseGood.orderProducts
+          })
+
+          if (salesOrder) {
+            const salesInvoice: any = await AccountingAPI.postSalesOrderToSalesInvoice(account, {
+              orderId: salesOrder?.id || null
+            })
+
+            const salesOrderItems: any = salesInvoice.sale.items
+            await Promise.all(
+              releaseGood.orderProducts.map(async op => {
+                const matchedProduct: any = salesOrderItems.find(soi => soi.itemId == op.productDetail.refCode)
+                if (matchedProduct) {
+                  await tx.getRepository(OrderProduct).update({ id: op.id }, { refItemId: matchedProduct.id })
+                }
+              })
+            )
+
+            await tx
+              .getRepository(ReleaseGood)
+              .update({ id: releaseGood.id }, { collectionOrderNo: salesInvoice.salesId, updater: releaseGood.updater })
+          }
+        }
+      } catch (error) {
+        logger.error(`complete-picking[createSalesOrder]: ${error}`)
+      }
+    }
+  }
+
+  if (releaseGood.type == 'b2c') {
+    await createSalesOrder(account, tx)
+  }
 
   if (releaseGood.packingOption) {
     const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)

package/server/graphql/resolvers/worksheet/unloading/complete-unloading-partially.ts

@@ -1,13 +1,31 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
+import { Account } from '@things-factory/integration-accounting'
+import { ArrivalNotice } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { UnloadingWorksheetController } from '../../../../controllers'
+import { XilnexController } from '../../../../controllers/pos'
 import { WorksheetDetail } from '../../../../entities'
 
 export const completeUnloadingPartiallyResolver = {
   async completeUnloadingPartially(_: any, { arrivalNoticeNo, worksheetDetail }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
     await completeUnloadingPartially(tx, domain, user, arrivalNoticeNo, worksheetDetail)
+
+    const arrivalNotice: ArrivalNotice = await tx
+      .getRepository(ArrivalNotice)
+      .findOne({ where: { name: arrivalNoticeNo, domain }, relations: ['domain', 'bizplace', 'bizplace.domain'] })
+
+    const xilnex: Account = await tx
+      .getRepository(Account)
+      .findOne({ where: { domain: arrivalNotice.bizplace.domain, status: 'active', platform: 'xilnex' } })
+
+    if (xilnex) {
+      const xilnexCtrl: XilnexController = new XilnexController(tx, domain, user)
+      await xilnexCtrl.createPartialUnloadInboundDocument(tx, xilnex, arrivalNotice, worksheetDetail)
+    }
   }
 }
 

package/server/graphql/resolvers/worksheet/unloading/complete-unloading.ts

@@ -2,12 +2,14 @@ import { EntityManager, In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
+import { Account } from '@things-factory/integration-accounting'
 import { ArrivalNotice, generateGoodsReceivalNote } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS } from '../../../../constants'
 import { PutawayWorksheetController, UnloadingWorksheetController } from '../../../../controllers'
+import { XilnexController } from '../../../../controllers/pos'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 
 export const completeUnloadingResolver = {
@@ -37,6 +39,8 @@ export const completeUnloadingResolver = {
       where: { domain, refOrderId: arrivalNotice.id, status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED]) }
     })
 
+    const inventoryIds: string[] = inventories.map(iv => iv.id)
+
     putawayWorksheet = await putawayWSCtrl.generatePutawayWorksheet(arrivalNotice.name, inventories)
 
     if (putawayWorksheet.status === WORKSHEET_STATUS.DEACTIVATED) {
@@ -46,6 +50,16 @@ export const completeUnloadingResolver = {
     const bizplaceId: Bizplace = arrivalNotice.bizplace.id
     await generateGoodsReceivalNote({ refNo: arrivalNoticeNo, customer: bizplaceId }, domain, user, tx)
 
+    const customerDomain: Domain = arrivalNotice.bizplace.domain
+    const xilnex: Account = await tx
+      .getRepository(Account)
+      .findOne({ where: { domain: customerDomain, status: 'active', platform: 'xilnex' } })
+
+    if (xilnex) {
+      const xilnexCtrl: XilnexController = new XilnexController(tx, domain, user)
+      await xilnexCtrl.createInboundDocument(tx, xilnex, arrivalNotice.id, inventoryIds)
+    }
+
     const worksheetController: UnloadingWorksheetController = new UnloadingWorksheetController(tx, domain, user)
     worksheetController.notifyToOfficeAdmin({
       title: `Unloading Completed (${arrivalNotice.bizplace.name}, ${arrivalNotice.name})`,

package/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Hatiolab
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.