@things-factory/worksheet-base 4.3.324 → 4.3.327

package/server/controllers/vas/vas-worksheet-controller.ts

@@ -237,7 +237,7 @@ export class VasWorksheetController extends WorksheetController {
   }
 
   async activateVAS(worksheetNo: string, vasWorksheetDetails: Partial<WorksheetDetail>[]): Promise<Worksheet> {
-    const worksheet: Worksheet = await this.findActivatableWorksheet(worksheetNo, WORKSHEET_TYPE.VAS, [
+    const worksheet: Worksheet = await this.findWorksheetByNo(worksheetNo, [
       'vasOrder',
       'worksheetDetails',
       'worksheetDetails.targetVas'
@@ -261,7 +261,7 @@ export class VasWorksheetController extends WorksheetController {
     }
 
     await this.updateOrderTargets(targetVass)
-    return await this.activateWorksheet(worksheet, worksheetDetails, vasWorksheetDetails)
+    return worksheet
   }
 
   async unpackingWithPallet(
@@ -1098,179 +1098,4 @@ export class VasWorksheetController extends WorksheetController {
       await this.COMPLETE_TRX_MAP[operationGuide](this.trxMgr, targetVas, this.user)
     }
   }
-
-  async editVas(
-    tx: any,
-    domain: Domain,
-    user: User,
-    orderVasPatch: OrderVasPatch[],
-    orderVasItemPatch: OrderVasItemPatch[],
-    orderNo: string
-  ): Promise<Boolean> {
-    let results = []
-    const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({ where: { name: orderNo } })
-    const orderVasRepo = getRepository(OrderVas)
-    const orderVasItemRepo = getRepository(OrderVasItem)
-    const worksheetDetailRepo = getRepository(WorksheetDetail)
-    const worksheetRepo = getRepository(Worksheet)
-    let vasWorksheet: Worksheet = await getRepository(Worksheet).findOne({
-      where: { domain, releaseGood: releaseGood.id, type: 'VAS' }
-    })
-    // Order Vas
-    if (orderVasPatch.length > 0) {
-      const _deleteRecords = orderVasPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === '-')
-      const _createRecords = orderVasPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
-      const _updateRecords = orderVasPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
-
-      if (_deleteRecords.length > 0) {
-        for (let i = 0; i < _deleteRecords.length; i++) {
-          const deleteRecord = _deleteRecords[i]
-          if (vasWorksheet) {
-            await worksheetDetailRepo.delete({ targetVas: deleteRecord.id })
-          }
-          await orderVasItemRepo.delete({ orderVas: deleteRecord.id })
-          await orderVasRepo.delete(deleteRecord.id)
-        }
-      }
-
-      if (_createRecords.length > 0) {
-        for (let i = 0; i < _createRecords.length; i++) {
-          const newRecord = _createRecords[i]
-
-          const result = await orderVasRepo.save({
-            ...newRecord,
-            id: uuidv4(),
-            name: `${_createRecords[i].product.name} - ${new Date()}`,
-            domain: domain,
-            creator: user,
-            updater: user
-          })
-
-          results.push({ ...result, cuFlag: '+' })
-
-          // create wds if worksheet is available
-          if (vasWorksheet) {
-            const orderVas: OrderVas[] = await getRepository(OrderVas).find({ where: { id: result.id } })
-            await this.createWorksheetDetails(vasWorksheet, WORKSHEET_TYPE.VAS, orderVas)
-          } else if (releaseGood.status === 'READY_TO_PICK' && !vasWorksheet) {
-            const orderVas: OrderVas[] = await getRepository(OrderVas).find({ where: { id: result.id } })
-            vasWorksheet = await this.generateWorksheet(
-              WORKSHEET_TYPE.VAS,
-              releaseGood,
-              orderVas,
-              ORDER_STATUS.READY_TO_PICK,
-              ORDER_INVENTORY_STATUS.READY_TO_PICK
-            )
-          }
-
-          // create new ovi
-          for (let ii = 0; ii < newRecord.orderVasItemsPatch.length; ii++) {
-            await orderVasItemRepo.save({
-              orderVas: result.id,
-              name: `${newRecord.orderVasItemsPatch[ii].vas.name} (${newRecord.orderVasItemsPatch[ii].vas.description})- ${result.id}`,
-              vas: newRecord.orderVasItemsPatch[ii].vas,
-              vasQty: newRecord.orderVasItemsPatch[ii].vasQty,
-              domain: domain,
-              creator: user,
-              createdAt: new Date()
-            })
-          }
-        }
-      }
-
-      if (_updateRecords.length > 0) {
-        for (let i = 0; i < _updateRecords.length; i++) {
-          const newRecord = _updateRecords[i]
-          const orderVas: OrderVas = await orderVasRepo.findOne({
-            where: { domain, id: newRecord.id },
-            relations: ['product', 'productDetail', 'newProduct', 'newProductDetail', 'releaseGood', 'orderVasItems']
-          })
-
-          const result = await orderVasRepo.save({
-            ...orderVas,
-            ...newRecord,
-            updater: user
-          })
-
-          results.push({ ...result, cuFlag: 'M' })
-
-          for (let ii = 0; ii < newRecord.orderVasItemsPatch.length; ii++) {
-            await orderVasItemRepo.update(
-              { id: newRecord.orderVasItemsPatch[ii].id },
-              {
-                orderVas: result.id,
-                name: `${newRecord.orderVasItemsPatch[ii].vas.name}- ${result.id}`,
-                vas: newRecord.orderVasItemsPatch[ii].vas,
-                vasQty: newRecord.orderVasItemsPatch[ii].vasQty,
-                domain: domain,
-                creator: user,
-                createdAt: new Date()
-              }
-            )
-          }
-        }
-      }
-    }
-
-    // order Vas Item
-    if (orderVasItemPatch?.length > 0) {
-      const _deleteRecords = orderVasItemPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === '-')
-      const _createRecords = orderVasItemPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
-      const _updateRecords = orderVasItemPatch.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
-
-      if (_deleteRecords.length > 0) {
-        for (let i = 0; i < _deleteRecords.length; i++) {
-          const deleteRecord = _deleteRecords[i]
-          if (deleteRecord.id) {
-            await orderVasItemRepo.delete(deleteRecord.id)
-          }
-        }
-      }
-
-      if (_createRecords.length > 0) {
-        for (let i = 0; i < _createRecords.length; i++) {
-          const newRecord = _createRecords[i]
-          const result = await orderVasItemRepo.save({
-            id: uuidv4(),
-            orderVas: newRecord.orderVas.id,
-            name: `${newRecord.vas.name}- ${newRecord.orderVas.id}`,
-            vas: newRecord.vas,
-            vasQty: newRecord.vasQty,
-            domain: domain,
-            creator: user,
-            createdAt: new Date()
-          })
-          results.push({ ...result, cuFlag: '+' })
-        }
-      }
-
-      if (_updateRecords.length > 0) {
-        for (let i = 0; i < _updateRecords.length; i++) {
-          const newRecord = _updateRecords[i]
-
-          const result = await getRepository(OrderVasItem).update(
-            {
-              id: newRecord.id
-            },
-            { vasQty: newRecord.vasQty, updater: user.id, updatedAt: new Date() }
-          )
-
-          results.push({ ...result, cuFlag: 'M' })
-        }
-      }
-    }
-
-    // delete worksheet if no orderVas Left
-    if (vasWorksheet) {
-      const vasWorksheetDetails: WorksheetDetail[] = await getRepository(WorksheetDetail).find({
-        where: { domain, worksheet: vasWorksheet.id }
-      })
-
-      if (vasWorksheetDetails.length == 0) {
-        await worksheetRepo.delete(vasWorksheet.id)
-      }
-    }
-
-    return results ? true : false
-  }
 }

package/server/controllers/worksheet-controller.ts

@@ -416,7 +416,7 @@ export class WorksheetController {
     let existingWorksheet: Worksheet
     try {
       existingWorksheet = await this.findWorksheetByRefOrder(refOrder, type)
-    } catch (e) { }
+    } catch (e) {}
 
     if (existingWorksheet)
       throw new Error(
@@ -432,7 +432,7 @@ export class WorksheetController {
       name: WorksheetNoGenerator.generate(type),
       type,
       status:
-        refOrderType == 'replenishment' && type == WORKSHEET_TYPE.PUTAWAY_REPLENISHMENT
+        (refOrderType == 'replenishment' && type == WORKSHEET_TYPE.PUTAWAY_REPLENISHMENT) || type == WORKSHEET_TYPE.VAS
           ? WORKSHEET_STATUS.EXECUTING
           : WORKSHEET_STATUS.DEACTIVATED,
       creator: this.user,
@@ -501,7 +501,9 @@ export class WorksheetController {
         name: WorksheetNoGenerator.generate(type, true),
         type,
         status:
-          type == WORKSHEET_TYPE.PUTAWAY_REPLENISHMENT ? WORKSHEET_STATUS.EXECUTING : WORKSHEET_STATUS.DEACTIVATED,
+          type == WORKSHEET_TYPE.PUTAWAY_REPLENISHMENT || type == WORKSHEET_TYPE.VAS
+            ? WORKSHEET_STATUS.EXECUTING
+            : WORKSHEET_STATUS.DEACTIVATED,
         [orderTargetField]: orderTarget,
         creator: this.user,
         updater: this.user,

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

@@ -31,23 +31,27 @@ import { LastMileAPI } from '@things-factory/integration-lmd'
 export const confirmCancellationReleaseOrder = {
   async confirmCancellationReleaseOrder(_: any, { name }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
-      where: { domain, name, status: ORDER_STATUS.PENDING_CANCEL },
-      relations: [
-        'bizplace',
-        'bizplace.domain',
-        'orderProducts',
-        'orderProducts.productDetail',
-        'orderInventories',
-        'orderInventories.inventory',
-        'orderInventories.inventory.location',
-        'orderInventories.product',
-        'orderInventories.productDetail',
-        'orderVass',
-        'lastMileDelivery',
-        'orderPackages'
-      ]
-    })
+
+    let releaseGood: ReleaseGood = await tx
+      .getRepository(ReleaseGood)
+      .createQueryBuilder('rg')
+      .innerJoinAndSelect('rg.bizplace', 'b')
+      .innerJoinAndSelect('b.domain', 'd')
+      .innerJoinAndSelect('rg.orderProducts', 'op')
+      .innerJoinAndSelect('op.productDetail', 'oppd')
+      .innerJoinAndSelect('rg.orderInventories', 'oi')
+      .innerJoinAndSelect('oi.inventory', 'i')
+      .innerJoinAndSelect('oi.product', 'p')
+      .innerJoinAndSelect('oi.productDetail', 'pd')
+      .leftJoinAndSelect('rg.orderVass', 'ov')
+      .leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
+      .leftJoinAndSelect('rg.orderPackages', 'opk')
+      .where(`rg.domain_id = :domain`, { domain: domain.id })
+      .andWhere(`rg.name = :name`, { name })
+      .andWhere(`rg.status = :status`, {
+        status: ORDER_STATUS.PENDING_CANCEL
+      })
+      .getOne()
 
     if (!releaseGood) throw new Error(`Release good order doesn't exists.`)
     let targetOIs: OrderInventory[] = releaseGood.orderInventories
@@ -63,7 +67,6 @@ export const confirmCancellationReleaseOrder = {
       await Promise.all(
         pickedOIs.map(async (orderInventory: OrderInventory) => {
           let inventory: Inventory = orderInventory.inventory
-          let location: Location = inventory?.location
 
           if (inventory && inventory.id) {
             await tx
@@ -138,7 +141,6 @@ export const confirmCancellationReleaseOrder = {
         .getRepository(OrderInventory)
         .update(cancelOIs, { status: ORDER_INVENTORY_STATUS.CANCELLED, updater: user })
     }
-
     if (replacedOIs && replacedOIs.length) {
       await tx
         .getRepository(OrderInventory)
@@ -187,7 +189,6 @@ export const confirmCancellationReleaseOrder = {
       })
       await tx.getRepository(WorksheetDetail).save(foundWSD)
     }
-
     // find DO and change status to pending cancel
     let foundDO: DeliveryOrder[] = await tx.getRepository(DeliveryOrder).find({
       where: { domain, releaseGood, status: ORDER_STATUS.PENDING_CANCEL },
@@ -319,7 +320,7 @@ async function updateStockForOrderInventories(
     })
     if (application) {
       const powrupController: PowrupController = new PowrupController()
-      await powrupController.updateStock(orderInventories, customerDomain, user, tx)
+      powrupController.updateStock(orderInventories, customerDomain, user, tx)
     }
   }
 }

package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts

@@ -131,7 +131,7 @@ export async function cycleCountAdjustment(
 
       if (application) {
         const powrupController: PowrupController = new PowrupController()
-        await powrupController.updateStock([inventory], customerDomain, user, tx)
+        powrupController.updateStock([inventory], customerDomain, user, tx)
       }
     } else if (targetInventory.inspectedQty == 0) {
       // create STORED, CC_ADJUSTMENT history
@@ -167,7 +167,7 @@ export async function cycleCountAdjustment(
 
       if (application) {
         const powrupController: PowrupController = new PowrupController()
-        await powrupController.updateStock([inventory], customerDomain, user, tx)
+        powrupController.updateStock([inventory], customerDomain, user, tx)
       }
     } else {
       const prevLocationId: string = inventory.location.id
@@ -227,7 +227,7 @@ export async function cycleCountAdjustment(
 
     if (application) {
       const powrupController: PowrupController = new PowrupController()
-      await powrupController.updateStock([inventory], customerDomain, user, tx)
+      powrupController.updateStock([inventory], customerDomain, user, tx)
     }
 
     targetInventory.status = ORDER_INVENTORY_STATUS.TERMINATED