@things-factory/sales-base 4.3.49 → 4.3.54

package/server/service/release-good/release-good-query.ts

@@ -62,52 +62,47 @@ export class ReleaseGoodQuery {
       buildQuery(qb, params, context)
       let items: any
       let total: number
-      if (!params.filters.find((filter: any) => filter.name === 'releaseGoodOnly')) {
-        qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
-        qb.leftJoinAndSelect('rg.domain', 'domain')
-        qb.leftJoinAndSelect('rg.bizplace', 'bizplace')
-        qb.leftJoinAndSelect('rg.orderInventories', 'oi')
-        qb.leftJoinAndSelect('rg.orderProducts', 'op')
-        qb.leftJoinAndSelect('oi.inventory', 'inv')
-        qb.leftJoinAndSelect('oi.product', 'prod')
-        qb.leftJoinAndSelect('rg.arrivalNotice', 'an')
-        qb.leftJoinAndSelect('rg.creator', 'creator')
-        qb.leftJoinAndSelect('rg.updater', 'updater')
-        qb.leftJoin(
-          subQuery => {
-            return subQuery
-              .select(`ccd.rank`, 'rank')
-              .addSelect(`ccd.name`, 'status')
-              .from(`common_code_details`, 'ccd')
-              .innerJoin(`ccd.commonCode`, 'cc')
-              .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
-              .andWhere(`cc.name = 'RO_LIST_STATUS'`)
-          },
-          'cc',
-          'cc.status = rg.status'
-        )
+      qb.addSelect('COALESCE("cc".rank, 99999)', 'rank')
+      qb.leftJoinAndSelect('rg.domain', 'domain')
+      qb.leftJoinAndSelect('rg.bizplace', 'bizplace')
+      qb.leftJoinAndSelect('rg.orderInventories', 'oi')
+      qb.leftJoinAndSelect('rg.orderProducts', 'op')
+      qb.leftJoinAndSelect('oi.inventory', 'inv')
+      qb.leftJoinAndSelect('oi.product', 'prod')
+      qb.leftJoinAndSelect('rg.arrivalNotice', 'an')
+      qb.leftJoinAndSelect('rg.creator', 'creator')
+      qb.leftJoinAndSelect('rg.updater', 'updater')
+      qb.leftJoin(
+        subQuery => {
+          return subQuery
+            .select(`ccd.rank`, 'rank')
+            .addSelect(`ccd.name`, 'status')
+            .from(`common_code_details`, 'ccd')
+            .innerJoin(`ccd.commonCode`, 'cc')
+            .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+            .andWhere(`cc.name = 'RO_LIST_STATUS'`)
+        },
+        'cc',
+        'cc.status = rg.status'
+      )
 
-        const arrChildSortData = ['bizplace']
-        const sort = (params.sortings || []).reduce(
-          (acc, sort) => ({
-            ...acc,
-            [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'rg.' + sort.name]: sort.desc
-              ? 'DESC'
-              : 'ASC'
-          }),
-          !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {}
-        )
+      const arrChildSortData = ['bizplace']
+      const sort = (params.sortings || []).reduce(
+        (acc, sort) => ({
+          ...acc,
+          [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'rg.' + sort.name]: sort.desc
+            ? 'DESC'
+            : 'ASC'
+        }),
+        !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {}
+      )
 
-        qb.orderBy(sort)
+      qb.orderBy(sort)
+
+      let [itemsRes, totalRes] = await qb.getManyAndCount()
+      items = itemsRes
+      total = totalRes
 
-        let [itemsRes, totalRes] = await qb.getManyAndCount()
-        items = itemsRes
-        total = totalRes
-      } else {
-        let itemsRes = await qb.getOne()
-        items = itemsRes ? [itemsRes] : []
-        total = items.length
-      }
       return { items, total }
     } catch (error) {
       throw error
@@ -116,30 +111,51 @@ export class ReleaseGoodQuery {
 
   @Directive('@privilege(category: "order", privilege: "query")')
   @Query(returns => ReleaseGood)
-  async releaseGood(@Ctx() context: any, @Arg('name') name: string): Promise<ReleaseGood> {
+  async releaseGood(
+    @Ctx() context: any,
+    @Arg('name', { nullable: true }) name: string,
+    @Arg('trackingNo', { nullable: true }) trackingNo: string
+  ): Promise<ReleaseGood> {
     const { domain, user }: { domain: Domain; user: User } = context.state
 
-    return await getRepository(ReleaseGood).findOne({
-      where: {
-        domain,
-        name,
-        bizplace: In(await getPermittedBizplaceIds(domain, user))
-      },
-      relations: [
-        'domain',
-        'bizplace',
-        'shippingOrder',
-        'arrivalNotice',
-        'orderInventories',
-        'orderInventories.product',
-        'orderInventories.inventory',
-        'orderInventories.inventory.product',
-        'orderVass',
-        'orderVass.vas',
-        'creator',
-        'updater'
-      ]
-    })
+    if (name) {
+      return await getRepository(ReleaseGood).findOne({
+        where: {
+          domain,
+          name,
+          bizplace: In(await getPermittedBizplaceIds(domain, user))
+        },
+        relations: [
+          'domain',
+          'bizplace',
+          'shippingOrder',
+          'arrivalNotice',
+          'orderInventories',
+          'orderInventories.product',
+          'orderInventories.inventory',
+          'orderInventories.inventory.product',
+          'orderVass',
+          'orderVass.vas',
+          'creator',
+          'updater'
+        ]
+      })
+    } else if (trackingNo) {
+      let releaseGood = await getRepository(ReleaseGood).findOne({
+        where: {
+          domain,
+          trackingNo,
+          bizplace: In(await getPermittedBizplaceIds(domain, user))
+        },
+        relations: ['bizplace']
+      })
+
+      if (!releaseGood) {
+        throw new Error('Tracking No not found in any orders')
+      } else {
+        return releaseGood
+      }
+    }
   }
 
   @Directive('@privilege(category: "order", privilege: "query")')

package/translations/en.json

@@ -1,4 +1,8 @@
 {
+  "error.Manifest(s) (x) already in open status": "Manifest(s) ({x}) already in open status",
+  "error.release_order_not_found": "release order not found",
+  "error.tracking_no_already_scanned_before": "tracking no already scanned before",
+  "error.tracking_no_belongs_to_x": "tracking no belongs to {x}",
   "field.customer": "customer",
   "field.issued_on": "issued on",
   "field.payment_due": "payment due",

package/translations/ko.json

@@ -16,5 +16,9 @@
   "field.options": "옵션",
   "field.unit": "단위",
   "field.start_at": "시작 시간",
-  "field.end_at": "완료 시간"
-}
+  "field.end_at": "완료 시간",
+  "error.Manifest(s) (x) already in open status": "[ko] Manifest(s) ({x}) already in open status",
+  "error.release_order_not_found": "[ko] release order not found",
+  "error.tracking_no_belongs_to_x": "[ko] tracking no belongs to {x}",
+  "error.tracking_no_already_scanned_before": "[ko] tracking no already scanned before"
+}

package/translations/ms.json

@@ -16,5 +16,9 @@
   "field.options": "pilihan-pilihan",
   "field.unit": "unit",
   "field.start_at": "bermula pada",
-  "field.end_at": "berakhir pada"
+  "field.end_at": "berakhir pada",
+  "error.Manifest(s) (x) already in open status": "[ms] Manifest(s) ({x}) already in open status",
+  "error.release_order_not_found": "[ms] release order not found",
+  "error.tracking_no_belongs_to_x": "[ms] tracking no belongs to {x}",
+  "error.tracking_no_already_scanned_before": "[ms] tracking no already scanned before"
 }