@things-factory/worksheet-base 3.8.0 → 3.8.4

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

@@ -45,7 +45,7 @@ export async function completePicking(
   releaseGoodNo: string
 ): Promise<void> {
   const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
-  const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+  let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
     where: { domain, name: releaseGoodNo },
     relations: [
       'bizplace',
@@ -53,6 +53,7 @@ export async function completePicking(
       'bizplace.company',
       'bizplace.company.domain',
       'orderInventories',
+      'orderInventories.inventory',
       'orderInventories.product'
     ]
   })
@@ -84,7 +85,7 @@ export async function completePicking(
 
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
+      releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
       await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
     } else {
       const companyDomain: Domain = releaseGood.bizplace.company.domain

package/server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts

@@ -1,6 +1,7 @@
 import { EntityManager, getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
+import { ReleaseGood, OrderInventory } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
@@ -10,69 +11,79 @@ import { pickingWorksheet } from '../picking-worksheet'
 import { activatePicking } from './activate-picking'
 
 export const fetchAndAssignPickingTaskResolver = {
-  async fetchAndAssignPickingTask(_: any, {}, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    const assignee: User = await tx.getRepository(User).findOne(user.id, { relations: ['domains'] })
-    if ((assignee?.domains || []).every((userDomain: Domain) => userDomain.id !== domain.id))
-      throw new Error('Target user is not belong to current domain')
+  async fetchAndAssignPickingTask(_: any, { }, context: any) {
+    try {
+      const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+      const assignee: User = await tx.getRepository(User).findOne(user.id, { relations: ['domains'] })
+      if ((assignee?.domains || []).every((userDomain: Domain) => userDomain.id !== domain.id))
+        throw new Error('Target user is not belong to current domain')
 
-    if (!assignee) throw new Error('failed to find target user')
+      if (!assignee) throw new Error('failed to find target user')
 
-    let worksheet: Worksheet
-    worksheet = await tx.getRepository(Worksheet).findOne({
-      relations: ['releaseGood'],
-      where: [
-        {
-          domain,
-          type: WORKSHEET_TYPE.PICKING,
-          status: WORKSHEET_STATUS.EXECUTING,
-          assignee: assignee
-        },
-        {
-          domain,
-          type: WORKSHEET_TYPE.PICKING,
-          status: WORKSHEET_STATUS.DEACTIVATED,
-          assignee: assignee
-        }
-      ],
-      order: {
-        name: 'ASC'
-      }
-    })
+      let worksheet: any
+      let worksheetQb = await tx.getRepository(Worksheet).createQueryBuilder('ws')
+        .select('ws.id')
+        .addSelect('ws.name')
+        .addSelect('ws.status')
+        .addSelect('ws.release_good_id')
+        .where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))', { domain_id: domain.id, type: WORKSHEET_TYPE.PICKING, assignee: assignee.id, status1: WORKSHEET_STATUS.EXECUTING, status2: WORKSHEET_STATUS.DEACTIVATED })
+        .andWhere(qb => {
+          const subQuery = qb
+            .subQuery()
+            .select('COUNT(*) AS totalPS')
+            .from(OrderInventory, 'OrderInventory')
+            .where('OrderInventory.release_good_id = ws.release_good_id')
+            .andWhere(`OrderInventory.status = 'PENDING_SPLIT'`)
+            .groupBy('OrderInventory.release_good_id')
+            .having('COUNT(*) > 0')
+            .getQuery()
+          return 'NOT EXISTS ' + subQuery
+        })
 
-    if (!worksheet) {
-      worksheet = await tx.getRepository(Worksheet).findOne({
-        relations: ['releaseGood'],
-        where: [
-          {
-            domain,
-            type: WORKSHEET_TYPE.PICKING,
-            status: WORKSHEET_STATUS.EXECUTING,
-            assignee: null
-          },
-          {
-            domain,
-            type: WORKSHEET_TYPE.PICKING,
-            status: WORKSHEET_STATUS.DEACTIVATED,
-            assignee: null
-          }
-        ]
-      })
+      worksheet = await worksheetQb.getRawOne();
 
-      await getRepository(Worksheet).update({ id: worksheet.id }, { assignee: assignee })
-    }
+      if (!worksheet) {
+        let worksheetQb = await tx.getRepository(Worksheet).createQueryBuilder('ws')
+          .select('ws.id')
+          .addSelect('ws.name')
+          .addSelect('ws.status')
+          .addSelect('ws.release_good_id')
+          .where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id IS NULL AND (ws.status = :status1 OR ws.status = :status2))', { domain_id: domain.id, type: WORKSHEET_TYPE.PICKING, status1: WORKSHEET_STATUS.EXECUTING, status2: WORKSHEET_STATUS.DEACTIVATED })
+          .andWhere(qb => {
+            const subQuery = qb
+              .subQuery()
+              .select('COUNT(*) AS totalPS')
+              .from(OrderInventory, 'OrderInventory')
+              .where('OrderInventory.release_good_id = ws.release_good_id')
+              .andWhere(`OrderInventory.status = 'PENDING_SPLIT'`)
+              .groupBy('OrderInventory.release_good_id')
+              .having('COUNT(*) > 0')
+              .getQuery()
+            return 'NOT EXISTS ' + subQuery
+          })
+
+        worksheet = await worksheetQb.getRawOne();
+
+        if (!worksheet) throw new Error('no suitable worksheet found')
+        await getRepository(Worksheet).update({ id: worksheet.id }, { assignee: assignee })
+      }
 
-    if (worksheet.status == WORKSHEET_STATUS.DEACTIVATED) await activatePicking(tx, domain, user, worksheet.name)
+      if (worksheet.status == WORKSHEET_STATUS.DEACTIVATED) await activatePicking(tx, domain, user, worksheet.ws_name)
 
-    const locationSortingRules: Setting = await tx.getRepository(Setting).findOne({
-      where: { domain, name: 'rule-for-picking-product' }
-    })
+      const locationSortingRules: Setting = await tx.getRepository(Setting).findOne({
+        where: { domain, name: 'rule-for-picking-product' }
+      })
 
-    const sortingRule = JSON.parse(locationSortingRules.value)
-    const locationSortingRule = Object.keys(sortingRule).map(field => {
-      return { name: field, desc: sortingRule[field] === 'DESC' }
-    })
+      const sortingRule = JSON.parse(locationSortingRules.value)
+      const locationSortingRule = Object.keys(sortingRule).map(field => {
+        return { name: field, desc: sortingRule[field] === 'DESC' }
+      })
 
-    return await pickingWorksheet(domain, worksheet.releaseGood.name, locationSortingRule, tx)
+      const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne(worksheet.release_good_id)
+
+      return await pickingWorksheet(domain, releaseGood.name, locationSortingRule, tx)
+    } catch (error) {
+      throw error
+    }
   }
 }

package/server/utils/inventory-util.ts

@@ -115,8 +115,6 @@ export async function generateInventoryHistory(
   inventoryHistory.uom = inventory.uom
   inventoryHistory.qty = qty
   inventoryHistory.openingQty = openingQty
-  inventoryHistory.weight = 0
-  inventoryHistory.openingWeight = 0
   inventoryHistory.uomValue = uomValue
   inventoryHistory.openingUomValue = openingUomValue
   inventoryHistory.unitCost = inventory.unitCost