@things-factory/worksheet-base 3.6.7 → 3.6.15

package/server/graphql/resolvers/worksheet/worksheet.ts

@@ -1,11 +1,12 @@
-import { MarketplaceOrder } from '@things-factory/marketplace-base'
-import { OrderInventory, OrderProduct, OrderVas, ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
 import { Equal, getRepository, Not } from 'typeorm'
+
+import { MarketplaceOrder, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
+import { ORDER_INVENTORY_STATUS, OrderInventory, OrderProduct, OrderVas } from '@things-factory/sales-base'
+import { Setting } from '@things-factory/setting-base'
+import { Domain } from '@things-factory/shell'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet } from '../../../entities'
-import { Setting } from '@things-factory/setting-base'
-import orderBy from 'lodash/orderBy'
 
 interface WorksheetInterface extends Worksheet {
   orderProducts: OrderProduct[]
@@ -82,7 +83,6 @@ export const worksheetResolver = {
       })
     }
 
-
     if (worksheet.type === WORKSHEET_TYPE.BATCH_PICKING) {
       // let orderInventories: OrderInventory[] = await getRepository(OrderInventory).find({
       //   where: {
@@ -93,23 +93,24 @@ export const worksheetResolver = {
       //   relations: ['releaseGood', 'inventory', 'product', 'inventory.location', 'bizplace']
       // })
 
-      let qbOrderInventories = getRepository(OrderInventory).createQueryBuilder('oi')
-      .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
-      .leftJoinAndSelect('oi.inventory', 'inventory')
-      .leftJoinAndSelect('oi.product', 'product')
-      .leftJoinAndSelect('inventory.location', 'location')
-      .leftJoinAndSelect('oi.bizplace', 'bizplace')
-      .where('"oi"."domain_id" = :domain')
-      .andWhere('"oi"."bizplace_id" = :bizplace')
-      .andWhere('"oi"."ref_worksheet_id" = :refWorksheetId')
-      .setParameters({
-        domain: domain.id,
-        bizplace: worksheet.bizplace.id,
-        refWorksheetId: worksheet.id
-      })
-      
+      let qbOrderInventories = getRepository(OrderInventory)
+        .createQueryBuilder('oi')
+        .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
+        .leftJoinAndSelect('oi.inventory', 'inventory')
+        .leftJoinAndSelect('oi.product', 'product')
+        .leftJoinAndSelect('inventory.location', 'location')
+        .leftJoinAndSelect('oi.bizplace', 'bizplace')
+        .where('"oi"."domain_id" = :domain')
+        .andWhere('"oi"."bizplace_id" = :bizplace')
+        .andWhere('"oi"."ref_worksheet_id" = :refWorksheetId')
+        .setParameters({
+          domain: domain.id,
+          bizplace: worksheet.bizplace.id,
+          refWorksheetId: worksheet.id
+        })
+
       let sortingSetting: Setting = await pWorksheetPickingItemSorting
-      if(sortingSetting?.value){
+      if (sortingSetting?.value) {
         let settingValue = JSON.parse(sortingSetting.value)
         for (const key in settingValue) {
           qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
@@ -131,25 +132,26 @@ export const worksheetResolver = {
       //   relations: ['product', 'inventory', 'inventory.location']
       // })
 
-      let qbOrderInventories = getRepository(OrderInventory).createQueryBuilder('oi')
-      .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
-      .leftJoinAndSelect('oi.inventory', 'inventory')
-      .leftJoinAndSelect('oi.product', 'product')
-      .leftJoinAndSelect('inventory.location', 'location')
-      .leftJoinAndSelect('oi.bizplace', 'bizplace')
-      .where('"oi"."domain_id" = :domain')
-      .andWhere('"oi"."bizplace_id" = :bizplace')
-      .andWhere('"oi"."release_good_id" = :releaseGood')
-      .andWhere('"oi"."status" != :status')
-      .setParameters({
-        domain: domain.id,
-        bizplace: worksheet.bizplace.id,
-        releaseGood: worksheet.releaseGood.id,
-        status: ORDER_INVENTORY_STATUS.CANCELLED
-      })
+      let qbOrderInventories = getRepository(OrderInventory)
+        .createQueryBuilder('oi')
+        .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
+        .leftJoinAndSelect('oi.inventory', 'inventory')
+        .leftJoinAndSelect('oi.product', 'product')
+        .leftJoinAndSelect('inventory.location', 'location')
+        .leftJoinAndSelect('oi.bizplace', 'bizplace')
+        .where('"oi"."domain_id" = :domain')
+        .andWhere('"oi"."bizplace_id" = :bizplace')
+        .andWhere('"oi"."release_good_id" = :releaseGood')
+        .andWhere('"oi"."status" != :status')
+        .setParameters({
+          domain: domain.id,
+          bizplace: worksheet.bizplace.id,
+          releaseGood: worksheet.releaseGood.id,
+          status: ORDER_INVENTORY_STATUS.CANCELLED
+        })
 
       let sortingSetting: Setting = await pWorksheetPickingItemSorting
-      if(sortingSetting?.value){
+      if (sortingSetting?.value) {
         let settingValue = JSON.parse(sortingSetting.value)
         for (const key in settingValue) {
           qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
@@ -159,10 +161,32 @@ export const worksheetResolver = {
       let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
       worksheet.orderInventories = orderInventories
 
-      worksheet.marketplaceOrder = await getRepository(MarketplaceOrder).findOne({
-        where: { releaseOrderId: worksheet.releaseGood.id },
-        relations: ['marketplaceOrderItems', 'marketplaceStore']
-      })
+      if (worksheet.releaseGood.type == 'b2c') {
+        worksheet.marketplaceOrder = await getRepository(MarketplaceOrder).findOne({
+          where: { orderNo: worksheet.releaseGood.refNo },
+          relations: ['marketplaceOrderItems', 'marketplaceStore']
+        })
+
+        if (worksheet.marketplaceOrder) {
+          let marketplaceOrderShipping: MarketplaceOrderShipping
+          if (worksheet.marketplaceOrder.isSplitted) {
+            marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
+              where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
+            })
+          } else {
+            marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
+              where: { orderNoRef: worksheet.releaseGood.refNo }
+            })
+          }
+
+          worksheet.marketplaceOrder.trackingNo = marketplaceOrderShipping.ownTrackingNo
+            ? marketplaceOrderShipping.ownTrackingNo
+            : marketplaceOrderShipping.trackingNo
+          worksheet.marketplaceOrder.shippingProvider = marketplaceOrderShipping.ownTransporter
+            ? marketplaceOrderShipping.ownTransporter
+            : marketplaceOrderShipping.transporter
+        }
+      }
 
       worksheet.orderVass = await getRepository(OrderVas).find({
         where: {

package/server/routes.ts

@@ -1,4 +1,5 @@
 import { renderElcclGRN } from './controllers/render-elccl-grn'
+import { renderGRN } from './controllers/render-grn'
 import { renderJobSheet } from './controllers/render-job-sheet'
 import { renderKimedaGRN } from './controllers/render-kimeda-grn'
 import { renderManualDO } from './controllers/render-manual-do'
@@ -24,6 +25,10 @@ process.on('bootstrap-module-domain-private-route' as any, (app, routes) => {
     context.body = await renderElcclGRN(context.params, context)
   })
 
+  routes.get('/view_grn/:grnNo/:timezoneOffSet', async (context, next) => {
+    context.body = await renderGRN(context.params, context)
+  })
+
   routes.get('/view_kimeda_grn/:grnNo/:timezoneOffSet', async (context, next) => {
     context.body = await renderKimedaGRN(context.params, context)
   })