@things-factory/worksheet-base 4.3.199 → 4.3.201

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

@@ -1,9 +1,23 @@
-import { EntityManager, getManager, In, getConnection } from 'typeorm'
+import {
+  EntityManager,
+  getManager,
+  In
+} from 'typeorm'
 
-import { ApplicationType, User } from '@things-factory/auth-base'
-import { Bizplace, getMyBizplace } from '@things-factory/biz-base'
+import {
+  ApplicationType,
+  User
+} from '@things-factory/auth-base'
+import {
+  Bizplace,
+  getMyBizplace
+} from '@things-factory/biz-base'
+import { logger } from '@things-factory/env'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
+import {
+  Sellercraft,
+  SellercraftStatus
+} from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import {
   ORDER_STATUS,
@@ -16,7 +30,6 @@ import {
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { logger } from '@things-factory/env'
 
 import {
   PackingWorksheetController,
@@ -26,7 +39,10 @@ import {
 } from '../../../../controllers/'
 import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
-import { Worksheet, WorksheetDetail } from '../../../../entities'
+import {
+  Worksheet,
+  WorksheetDetail
+} from '../../../../entities'
 import { createLmdParcel } from '../../../../utils'
 
 export const completeBatchPickingResolver = {
@@ -60,7 +76,7 @@ export async function completeBatchPicking(
   if (worksheet?.type) {
     const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
     const targetInventories: OrderInventory[] = worksheetDetails
-      .filter(wsd => wsd.status != 'MISSING')
+      .filter(wsd => wsd.status != 'MISSING' && wsd.status != 'CANCELLED')
       .map((wsd: WorksheetDetail) => wsd.targetInventory)
 
     const releaseGoods: ReleaseGood[] = worksheetDetails.map(

package/server/graphql/resolvers/worksheet/sorting/scan-product-sorting.ts

@@ -1,16 +1,18 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { SortingWorksheetController } from '../../../../controllers'
 
 export const scanProductSortingResolver = {
   async scanProductSorting(
     _: any,
-    { releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty },
+    { releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty, productId },
     context: any
   ) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await scanProductSorting(tx, domain, user, releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty)
+    await scanProductSorting(tx, domain, user, releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty, productId)
   }
 }
 
@@ -23,8 +25,10 @@ export async function scanProductSorting(
   productBarcode?: string,
   serialNumber?: string,
   toteNo?: string,
-  sortingQty?: number
+  sortingQty?: number,
+  productId?: string
+
 ) {
   const worksheetController: SortingWorksheetController = new SortingWorksheetController(tx, domain, user)
-  await worksheetController.scanProductSorting(releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty)
+  await worksheetController.scanProductSorting(releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty, productId)
 }

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

@@ -1,6 +1,15 @@
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import {
+  getRepository,
+  SelectQueryBuilder
+} from 'typeorm'
 
-import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
+import { ProductBarcode } from '@things-factory/product-base'
+import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_STATUS,
+  OrderInventory,
+  ReleaseGood
+} from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 
 import { WORKSHEET_TYPE } from '../../../constants'
@@ -35,6 +44,8 @@ export const sortingWorksheetResolver = {
       .addSelect('OI.batch_id', 'batchId')
       .addSelect('OI.packing_type', 'packingType')
       .addSelect('OI.packing_size', 'packingSize')
+      .addSelect('OI.product_detail_id', 'productDetailId')
+      .addSelect('OI.status','status')
       .addSelect('INV.expiration_date', 'expirationDate')
       .leftJoin('OI.product', 'PROD')
       .leftJoin('OI.inventory', 'INV')
@@ -50,11 +61,12 @@ export const sortingWorksheetResolver = {
       .addGroupBy('OI.batch_id')
       .addGroupBy('OI.packing_type')
       .addGroupBy('OI.packing_size')
+      .addGroupBy('OI.product_detail_id')
+      .addGroupBy('OI.status')
       .orderBy('PROD.sku', 'ASC')
 
     const items: any[] = await qb.getRawMany()
-
-    return {
+    let results = {
       worksheetInfo: {
         bizplaceName: releaseGood.bizplace.name,
         partnerDomainId: releaseGood.bizplace?.domain.id,
@@ -65,24 +77,31 @@ export const sortingWorksheetResolver = {
         refNo3: releaseGood.refNo3,
         releaseGood
       },
-      worksheetDetailInfos: items.map((item: any) => {
-        return {
-          batchId: item?.batchId,
-          productId: item?.productId,
-          productSku: item?.productSku,
-          productName: item?.productName,
-          productDescription: item?.productDescription,
-          isRequireSerialNumberScanningOutbound: item?.isRequireSerialNumberScanningOutbound,
-          releaseQty: item.releaseQty,
-          sortedQty: item.sortedQty,
-          status: item.status,
-          expirationDate: item?.expirationDate,
-          packingType: item?.packingType,
-          packingSize: item?.packingSize,
-          binRemarks: item?.binRemarks,
-          releaseGood
-        }
-      })
+      worksheetDetailInfos: await Promise.all(
+        items.map(async (item: any) => {
+          return {
+            batchId: item?.batchId,
+            productId: item?.productId,
+            productSku: item?.productSku,
+            productName: item?.productName,
+            productDescription: item?.productDescription,
+            productBarcodes: await getRepository(ProductBarcode).find({
+              where: { productDetail: { id: item.productDetailId } }
+            }),
+            isRequireSerialNumberScanningOutbound: item?.isRequireSerialNumberScanningOutbound,
+            releaseQty: item.releaseQty,
+            sortedQty: item.sortedQty,
+            status: item.status,
+            expirationDate: item?.expirationDate,
+            packingType: item?.packingType,
+            packingSize: item?.packingSize,
+            binRemarks: item?.binRemarks,
+            releaseGood
+          }
+        })
+      )
     }
+
+    return results
   }
 }

package/server/graphql/types/worksheet/index.ts

@@ -385,6 +385,7 @@ export const Mutation = /* GraphQL */ `
     serialNumber: String
     toteNo: String
     sortingQty: Int
+    productId: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   packing (

package/server/graphql/types/worksheet/worksheet-detail-info.ts

@@ -12,6 +12,7 @@ export const WorksheetDetailInfo = gql`
     productName: String
     productSku: String
     productId: String
+    productBarcodes: [ProductBarcode]
     productDescription: String
     packingType: String
     packingSize: Float