@things-factory/worksheet-base 4.0.21 → 4.0.25

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.ws_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/graphql/resolvers/worksheet/picking-worksheet.ts

@@ -90,6 +90,7 @@ export async function pickingWorksheet(
       startedAt: worksheet.startedAt,
       refNo: releaseGood.refNo,
       refNo2: releaseGood.refNo2,
+      refNo3: releaseGood.refNo3,
       releaseGood
     },
     worksheetDetailInfos: worksheetDetails.map(async (pickingWSD: WorksheetDetail) => {

package/server/graphql/resolvers/worksheet/putaway-returning-worksheet.ts

@@ -1,11 +1,13 @@
-import { Domain } from '@things-factory/shell'
 import { getRepository } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
-import { fetchExecutingWorksheet } from '../../../utils'
+import { OrderInventory, ReturnOrder } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { ReturnOrder, OrderInventory } from '@things-factory/sales-base'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { fetchExecutingWorksheet } from '../../../utils'
 
 export const putawayReturningWorksheetResolver = {
   async putawayReturningWorksheet(_: any, { returnOrderNo }, context: any) {
@@ -50,6 +52,8 @@ export const putawayReturningWorksheetResolver = {
         partnerDomainId: customerBizplace?.domain.id,
         customerCompanyDomainId: customerCompanyDomain.id,
         refNo: returnOrder.refNo,
+        refNo2: returnOrder.refNo2,
+        refNo3: returnOrder.refNo3,
         startedAt: worksheet.startedAt
       },
       worksheetDetailInfos: worksheet.worksheetDetails.map(async (putawayWSD: WorksheetDetail) => {

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

@@ -1,11 +1,13 @@
-import { ArrivalNotice, OrderInventory } from '@things-factory/sales-base'
+import { getRepository } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
+import { ArrivalNotice, OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
-import { fetchExecutingWorksheet } from '../../../utils'
 import { Inventory } from '@things-factory/warehouse-base'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { fetchExecutingWorksheet } from '../../../utils'
 
 export const putawayWorksheetResolver = {
   async putawayWorksheet(_: any, { arrivalNoticeNo }, context: any) {
@@ -49,6 +51,8 @@ export const putawayWorksheetResolver = {
         partnerDomainId: customerBizplace?.domain.id,
         customerCompanyDomainId: customerCompanyDomain.id,
         refNo: arrivalNotice.refNo,
+        refNo2: arrivalNotice.refNo2,
+        refNo3: arrivalNotice.refNo3,
         startedAt: worksheet.startedAt
       },
       worksheetDetailInfos: worksheet.worksheetDetails.map(async (putawayWSD: WorksheetDetail) => {

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

@@ -1,10 +1,12 @@
-import { Domain } from '@things-factory/shell'
 import { getRepository } from 'typeorm'
-import { fetchExecutingWorksheet } from '../../../utils'
-import { Inventory } from '@things-factory/warehouse-base'
+
 import { OrderInventory, ReleaseGood } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+import { Inventory } from '@things-factory/warehouse-base'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { fetchExecutingWorksheet } from '../../../utils'
 
 export const returnWorksheetResolver = {
   async returnWorksheet(_: any, { releaseGoodNo }, context: any) {
@@ -41,6 +43,8 @@ export const returnWorksheetResolver = {
         partnerDomainId: worksheet?.bizplace.domain.id,
         customerCompanyDomainId: customerCompanyDomain.id,
         refNo: releaseGood.refNo,
+        refNo2: releaseGood.refNo2,
+        refNo3: releaseGood.refNo3,
         startedAt: worksheet.startedAt
       },
       worksheetDetailInfos: worksheet.worksheetDetails.map((returnWSD: WorksheetDetail) => {

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

@@ -1,6 +1,8 @@
-import { OrderInventory, ORDER_STATUS, ORDER_INVENTORY_STATUS, ReleaseGood } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
 import { getRepository, SelectQueryBuilder } from 'typeorm'
+
+import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { fetchExecutingBatchWorksheet } from '../../../utils'
 
@@ -55,6 +57,7 @@ export const sortingWorksheetResolver = {
         startedAt: worksheet.startedAt,
         refNo: releaseGood.refNo,
         refNo2: releaseGood.refNo2,
+        refNo3: releaseGood.refNo3,
         releaseGood
       },
       worksheetDetailInfos: items.map((item: any) => {

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

@@ -1,18 +1,16 @@
 import { activateUnloadingResolver } from './activate-unloading'
-import { unloadResolver } from './unload'
-import { scanProductUnloadResolver } from './scan-product-unload'
-import { undoUnloadingResolver } from './undo-unloading'
-import { undoProductScanUnloadResolver } from './undo-product-scan-unload'
 import { completeProductScanUnloadResolver } from './complete-product-scan-unload'
 import { completeUnloadingResolver } from './complete-unloading'
 import { completeUnloadingPartiallyResolver } from './complete-unloading-partially'
+import { scanProductUnloadResolver } from './scan-product-unload'
+import { undoUnloadingResolver } from './undo-unloading'
+import { unloadResolver } from './unload'
 
 export const Mutations = {
   ...activateUnloadingResolver,
   ...scanProductUnloadResolver,
   ...unloadResolver,
   ...undoUnloadingResolver,
-  ...undoProductScanUnloadResolver,
   ...completeProductScanUnloadResolver,
   ...completeUnloadingResolver,
   ...completeUnloadingPartiallyResolver

package/server/graphql/resolvers/worksheet/unloading/undo-unloading.ts

@@ -1,12 +1,14 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { UnloadingWorksheetController } from '../../../../controllers'
 
 export const undoUnloadingResolver = {
-  async undoUnloading(_: any, { worksheetDetailName, palletId }, context: any) {
+  async undoUnloading(_: any, { orderType, orderNo, inventoryIds }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await undoUnloading(tx, domain, user, worksheetDetailName, palletId)
+    await undoUnloading(tx, domain, user, orderType, orderNo, inventoryIds)
   }
 }
 
@@ -14,9 +16,10 @@ async function undoUnloading(
   tx: EntityManager,
   domain: Domain,
   user: User,
-  worksheetDetailName: string,
-  palletId: string
+  orderType: string,
+  orderNo: string,
+  inventoryIds: [string]
 ): Promise<void> {
   const worksheetController: UnloadingWorksheetController = new UnloadingWorksheetController(tx, domain, user)
-  await worksheetController.undoUnload(worksheetDetailName, palletId)
+  await worksheetController.undoUnload(orderType, orderNo, inventoryIds)
 }

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

@@ -1,10 +1,12 @@
-import { ArrivalNotice, OrderProduct } from '@things-factory/sales-base'
+import { getRepository } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
+import { ArrivalNotice, OrderProduct } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
-import { fetchExecutingWorksheet } from '../../../utils'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { fetchExecutingWorksheet } from '../../../utils'
 
 export const unloadingWorksheetResolver = {
   async unloadingWorksheet(_: any, { arrivalNoticeNo }, context: any) {
@@ -64,6 +66,8 @@ export const unloadingWorksheetResolver = {
         bufferLocation: worksheet.bufferLocation.name,
         startedAt: worksheet.startedAt,
         refNo: arrivalNotice.refNo,
+        refNo2: arrivalNotice?.refNo2,
+        refNo3: arrivalNotice?.refNo3,
         looseItem: arrivalNotice.looseItem,
         orderVas: vasWorksheet ? vasWorksheet.worksheetDetails : null
       },

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

@@ -18,7 +18,8 @@ interface WorksheetInterface extends Worksheet {
 export const worksheetResolver = {
   async worksheet(_: any, { name }, context: any) {
     const { domain }: { domain: Domain } = context.state
-    const worksheet: WorksheetInterface = (await getRepository(Worksheet).findOne({
+    let worksheet: WorksheetInterface
+    worksheet = (await getRepository(Worksheet).findOne({
       where: {
         domain,
         name
@@ -60,6 +61,33 @@ export const worksheetResolver = {
       ]
     })) as WorksheetInterface
 
+    if (!worksheet) {
+      worksheet = (await getRepository(Worksheet).findOne({
+        where: {
+          domain,
+          arrivalNotice: name
+        },
+        relations: [
+          'domain',
+          'bizplace',
+          'bizplace.domain',
+          'worksheetDetails',
+          'worksheetDetails.targetProduct',
+          'worksheetDetails.targetProduct.product',
+          'worksheetDetails.targetInventory',
+          'worksheetDetails.targetInventory.releaseGood',
+          'worksheetDetails.targetInventory.product',
+          'worksheetDetails.targetInventory.inventory',
+          'worksheetDetails.targetInventory.inventory.product',
+          'worksheetDetails.targetInventory.inventory.warehouse',
+          'worksheetDetails.targetInventory.inventory.location',
+          'worksheetDetails.targetInventory.inspectedLocation',
+          'creator',
+          'updater'
+        ]
+      })) as WorksheetInterface
+    }
+
     let pWorksheetPickingItemSorting = getRepository(Setting).findOne({
       where: { domain, category: 'location', name: 'rule-for-worksheet-release-goods-item' }
     })

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

@@ -61,6 +61,10 @@ export const Mutation = /* GraphQL */ `
     releaseGoodNo: String!
   ): ReleaseGoodWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  generateMultipleReleaseGoodWorksheet (
+    releaseGoodNos: [String!]
+  ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
+
   fetchSellercraftAirwayBill (
     releaseGoodNo: String!
   ): AirwayBill @privilege(category: "worksheet_control", privilege: "mutation") @transaction
@@ -186,14 +190,9 @@ export const Mutation = /* GraphQL */ `
   ): Boolean @transaction
 
   undoUnloading (
-    worksheetDetailName: String!
-    palletId: String!
-  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
-
-  undoProductScanUnload (
-    worksheetDetailName: String!
-    palletId: String
-    cartonId: String
+    orderType: String!
+    orderNo: String!
+    inventoryIds: [String]!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   completeUnloadingPartially (
@@ -668,7 +667,7 @@ export const Query = /* GraphQL */ `
   findReleaseOrdersByTaskNo(taskNo: String!): [ReleaseGood] @privilege(category: "worksheet", privilege: "query") @transaction
 `
 
-export const Types = /* GraphQL */[
+export const Types = /* GraphQL */ [
   Worksheet,
   AirwayBill,
   NewWorksheet,

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

@@ -23,6 +23,7 @@ export const WorksheetInfo = gql`
     palletId: String
     refNo: String
     refNo2: String
+    refNo3: String
     looseItem: String
     orderVas: [WorksheetDetail]
   }

package/dist-server/graphql/resolvers/worksheet/unloading/undo-product-scan-unload.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.undoProductScanUnloadResolver = void 0;
-const controllers_1 = require("../../../../controllers");
-exports.undoProductScanUnloadResolver = {
-    async undoProductScanUnload(_, { worksheetDetailName, palletId, cartonId }, context) {
-        const { tx, domain, user } = context.state;
-        await undoProductScanUnload(tx, domain, user, worksheetDetailName, palletId, cartonId);
-    }
-};
-async function undoProductScanUnload(tx, domain, user, worksheetDetailName, palletId, cartonId) {
-    const worksheetController = new controllers_1.UnloadingWorksheetController(tx, domain, user);
-    await worksheetController.undoProductScanUnload(worksheetDetailName, palletId, cartonId);
-}
-//# sourceMappingURL=undo-product-scan-unload.js.map

package/dist-server/graphql/resolvers/worksheet/unloading/undo-product-scan-unload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"undo-product-scan-unload.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/undo-product-scan-unload.ts"],"names":[],"mappings":";;;AAGA,yDAAsE;AAEzD,QAAA,6BAA6B,GAAG;IAC3C,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,OAAY;QAC3F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;IACxF,CAAC;CACF,CAAA;AAED,KAAK,UAAU,qBAAqB,CAClC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,QAAgB,EAChB,QAAgB;IAEhB,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,MAAM,mBAAmB,CAAC,qBAAqB,CAAC,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;AAC1F,CAAC"}

package/server/graphql/resolvers/worksheet/unloading/undo-product-scan-unload.ts

@@ -1,23 +0,0 @@
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
-import { UnloadingWorksheetController } from '../../../../controllers'
-
-export const undoProductScanUnloadResolver = {
-  async undoProductScanUnload(_: any, { worksheetDetailName, palletId, cartonId }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await undoProductScanUnload(tx, domain, user, worksheetDetailName, palletId, cartonId)
-  }
-}
-
-async function undoProductScanUnload(
-  tx: EntityManager,
-  domain: Domain,
-  user: User,
-  worksheetDetailName: string,
-  palletId: string,
-  cartonId: string
-): Promise<void> {
-  const worksheetController: UnloadingWorksheetController = new UnloadingWorksheetController(tx, domain, user)
-  await worksheetController.undoProductScanUnload(worksheetDetailName, palletId, cartonId)
-}