@things-factory/worksheet-base 5.0.12 → 6.0.0-alpha.0

package/dist-server/graphql/resolvers/worksheet/vas-transactions/unpacking/complete-unpacking.js.map

@@ -1 +1 @@
-{"version":3,"file":"complete-unpacking.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/unpacking/complete-unpacking.ts"],"names":[],"mappings":";;;AAIA,2DAAqD;AAM9C,KAAK,UAAU,iBAAiB,CAAC,MAAqB,EAAE,QAAkB,EAAE,IAAU;IAC3F,QAAQ,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,qBAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE;QACnE,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,CAAC;KAChH,CAAC,CAAA;IAEF,MAAM,MAAM,GAAW,QAAQ,CAAC,MAAM,CAAA;IACtC,MAAM,QAAQ,GAAa,QAAQ,CAAC,QAAQ,CAAA;IAC5C,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAA;IACzD,MAAM,QAAQ,GAAiB,aAAa,IAAI,WAAW,IAAI,QAAQ,CAAA;AACzE,CAAC;AATD,8CASC","sourcesContent":["import { User } from '@things-factory/auth-base'\nimport { Bizplace } from '@things-factory/biz-base'\nimport { Domain } from '@things-factory/shell'\nimport { EntityManager } from 'typeorm'\nimport { OrderVas } from '@things-factory/sales-base'\nimport { Worksheet } from '../../../../../entities'\nimport { activateUnloading } from '../../../worksheet/unloading/activate-unloading'\nimport { RefOrderType } from '../interfaces'\nimport { WORKSHEET_TYPE } from '../../../../../constants'\n\nexport async function completeUnpacking(trxMgr: EntityManager, orderVas: OrderVas, user: User): Promise<void> {\n  orderVas = await trxMgr.getRepository(OrderVas).findOne(orderVas.id, {\n    relations: ['domain', 'bizplace', 'inventory', 'inventory.product', 'arrivalNotice', 'releaseGood', 'vasOrder']\n  })\n\n  const domain: Domain = orderVas.domain\n  const bizplace: Bizplace = orderVas.bizplace\n  const { arrivalNotice, releaseGood, vasOrder } = orderVas\n  const refOrder: RefOrderType = arrivalNotice || releaseGood || vasOrder\n}\n"]}
+{"version":3,"file":"complete-unpacking.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/unpacking/complete-unpacking.ts"],"names":[],"mappings":";;;AAIA,2DAAqD;AAK9C,KAAK,UAAU,iBAAiB,CAAC,MAAqB,EAAE,QAAkB,EAAE,IAAU;IAC3F,QAAQ,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,qBAAQ,CAAC,CAAC,OAAO,CAAC;QACtD,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE;QAC1B,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,CAAC;KAChH,CAAC,CAAA;IAEF,MAAM,MAAM,GAAW,QAAQ,CAAC,MAAM,CAAA;IACtC,MAAM,QAAQ,GAAa,QAAQ,CAAC,QAAQ,CAAA;IAC5C,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAA;IACzD,MAAM,QAAQ,GAAiB,aAAa,IAAI,WAAW,IAAI,QAAQ,CAAA;AACzE,CAAC;AAVD,8CAUC","sourcesContent":["import { EntityManager } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Bizplace } from '@things-factory/biz-base'\nimport { OrderVas } from '@things-factory/sales-base'\nimport { Domain } from '@things-factory/shell'\n\nimport { RefOrderType } from '../interfaces'\n\nexport async function completeUnpacking(trxMgr: EntityManager, orderVas: OrderVas, user: User): Promise<void> {\n  orderVas = await trxMgr.getRepository(OrderVas).findOne({\n    where: { id: orderVas.id },\n    relations: ['domain', 'bizplace', 'inventory', 'inventory.product', 'arrivalNotice', 'releaseGood', 'vasOrder']\n  })\n\n  const domain: Domain = orderVas.domain\n  const bizplace: Bizplace = orderVas.bizplace\n  const { arrivalNotice, releaseGood, vasOrder } = orderVas\n  const refOrder: RefOrderType = arrivalNotice || releaseGood || vasOrder\n}\n"]}

package/dist-server/graphql/resolvers/worksheet/vas-transactions/unpacking/unpacking.js

@@ -4,12 +4,12 @@ exports.unpackingResolver = void 0;
 const id_rule_base_1 = require("@things-factory/id-rule-base");
 const product_base_1 = require("@things-factory/product-base");
 const sales_base_1 = require("@things-factory/sales-base");
+const constants_1 = require("../../../../../constants");
+const vas_worksheet_controller_1 = require("../../../../../controllers/vas/vas-worksheet-controller");
 const entities_1 = require("../../../../../entities");
-const common_utils_1 = require("../common-utils");
 const utils_1 = require("../../../../../utils");
 const execute_vas_1 = require("../../vas/execute-vas");
-const constants_1 = require("../../../../../constants");
-const vas_worksheet_controller_1 = require("../../../../../controllers/vas/vas-worksheet-controller");
+const common_utils_1 = require("../common-utils");
 exports.unpackingResolver = {
     async unpacking(_, { worksheetDetailName, childProductId, unpackQty, unpackUomValue, palletId, locationName }, context) {
         var _a;
@@ -62,8 +62,8 @@ exports.unpackingResolver = {
         else {
             let foundOP = await tx.getRepository(sales_base_1.OrderProduct).findOne({
                 where: {
-                    domain,
-                    arrivalNotice,
+                    domain: { id: domain.id },
+                    arrivalNotice: { id: arrivalNotice.id },
                     batchId: targetVas.targetBatchId,
                     product: targetVas.targetProduct
                 }
@@ -99,8 +99,8 @@ exports.unpackingResolver = {
             await tx.getRepository(sales_base_1.OrderProduct).save(foundOP);
             let worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
                 where: {
-                    domain,
-                    arrivalNotice,
+                    domain: { id: domain.id },
+                    arrivalNotice: { id: arrivalNotice.id },
                     type: constants_1.WORKSHEET_TYPE.UNLOADING
                 }
             });

package/dist-server/graphql/resolvers/worksheet/vas-transactions/unpacking/unpacking.js.map

@@ -1 +1 @@
-{"version":3,"file":"unpacking.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/unpacking/unpacking.ts"],"names":[],"mappings":"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","sourcesContent":["import { EntityManager, In } from 'typeorm'\nimport { Domain } from '@things-factory/shell'\nimport { User } from '@things-factory/auth-base'\nimport { Bizplace } from '@things-factory/biz-base'\nimport { generateId } from '@things-factory/id-rule-base'\nimport { Product } from '@things-factory/product-base'\nimport { OrderProduct, ReleaseGood, OrderVas, OrderNoGenerator, ORDER_PRODUCT_STATUS } from '@things-factory/sales-base'\nimport { Worksheet, WorksheetDetail } from '../../../../../entities'\nimport { getWorksheetDetailByName } from '../common-utils'\nimport { WorksheetNoGenerator } from '../../../../../utils'\nimport { executeVas } from '../../vas/execute-vas'\nimport { RefOrderType } from '../interfaces'\nimport { WORKSHEET_TYPE, WORKSHEET_STATUS } from '../../../../../constants'\nimport { VasWorksheetController } from '../../../../../controllers/vas/vas-worksheet-controller'\nimport { Inventory } from '@things-factory/warehouse-base'\n\nexport const unpackingResolver = {\n  async unpacking(\n    _: any,\n    { worksheetDetailName, childProductId, unpackQty, unpackUomValue, palletId, locationName },\n    context: any\n  ) {\n    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state\n\n    const childProduct: Product = await tx.getRepository(Product).findOne({\n      where: { id: childProductId },\n      relations: ['domain']\n    })\n    if (!childProduct) throw new Error(`Couldn't find product by its sku (${childProduct.sku})`)\n\n    // Find target worksheet detail & target order vas & bizplace\n    const wsd: WorksheetDetail = await getWorksheetDetailByName(tx, domain, worksheetDetailName)\n    let { bizplace, targetVas }: { bizplace: Bizplace; targetVas: OrderVas } = wsd\n\n    // Init refOrder\n    const { arrivalNotice, releaseGood, vasOrder }: { [key: string]: RefOrderType } = targetVas\n    const refOrder: RefOrderType = arrivalNotice || releaseGood || vasOrder || null\n    if (!refOrder) throw new Error(`Couldn't find reference order with current order vas`)\n\n    if (!palletId && refOrder instanceof ReleaseGood) {\n      // auto generate pallet ID for release order\n      const today = new Date()\n      const year = today.getFullYear()\n      const month = today.getMonth()\n      const day = today.getDate()\n\n      const yy = String(year).substr(String(year).length - 2)\n      const mm = String(month + 1).padStart(2, '0')\n      const dd = String(day).padStart(2, '0')\n\n      const date = yy + mm + dd\n      palletId = await generateId({\n        domain,\n        type: 'vas_pallet_id',\n        seed: {\n          batchId: targetVas.targetBatchId,\n          date: date\n        }\n      })\n\n      // to get refInventory location to assign as new inventory location\n      if (!locationName) {\n        const foundOrderVas: OrderVas = await tx.getRepository(OrderVas).findOne({\n          where: { id: targetVas.id },\n          relations: ['targetProduct', 'inventory', 'inventory.location']\n        })\n\n        locationName = foundOrderVas?.inventory?.location.name\n      }\n    }\n\n    if (palletId) {\n      const worksheetController: VasWorksheetController = new VasWorksheetController(tx, domain, user)\n      await worksheetController.unpackingWithPallet(\n        worksheetDetailName,\n        childProduct,\n        unpackQty,\n        unpackUomValue,\n        palletId,\n        locationName,\n        refOrder\n      )\n    } else {\n      let foundOP: OrderProduct = await tx.getRepository(OrderProduct).findOne({\n        where: {\n          domain,\n          arrivalNotice,\n          batchId: targetVas.targetBatchId,\n          product: targetVas.targetProduct\n        }\n      })\n\n      //Create new order product for unpacked products\n      let newOP: OrderProduct = new OrderProduct()\n      newOP.domain = domain\n      newOP.bizplace = bizplace\n      newOP.name = OrderNoGenerator.orderProduct()\n      newOP.batchId = targetVas.targetBatchId\n      newOP.packingType = childProduct.packingType\n      newOP.uom = childProduct.primaryUnit\n      newOP.packQty = unpackQty\n      newOP.uomValue = unpackUomValue\n      newOP.palletQty = null\n      newOP.totalUomValue =\n        (Number(unpackQty) * Number(unpackUomValue)).toFixed(2) + ' ' + (childProduct.primaryUnit || '')\n      newOP.status = ORDER_PRODUCT_STATUS.READY_TO_UNLOAD\n      newOP.arrivalNotice = arrivalNotice\n      newOP.product = childProduct\n      newOP.creator = user\n      newOP.updater = user\n\n      await tx.getRepository(OrderProduct).save(newOP)\n\n      // update unpackQty and unpackUomValue of original product\n      foundOP.unpackQty = unpackQty\n      foundOP.unpackUomValue = unpackUomValue\n\n      // update packQty and totalUomValue of original product\n      foundOP.packQty -= targetVas.qty\n      foundOP.totalUomValue = `${(foundOP.uomValue * foundOP.packQty).toFixed(2)} ${foundOP.uom}`\n\n      // update the order product status to DONE if remaining packQty is 0\n      // -- so that the user will never see this product during unloading and putaway stages\n      // if (foundOP.packQty === 0) foundOP.status = ORDER_PRODUCT_STATUS.TERMINATED\n\n      await tx.getRepository(OrderProduct).save(foundOP)\n\n      let worksheet: Worksheet = await tx.getRepository(Worksheet).findOne({\n        where: {\n          domain,\n          arrivalNotice,\n          type: WORKSHEET_TYPE.UNLOADING\n        }\n      })\n\n      let worksheetDetails: WorksheetDetail = new WorksheetDetail()\n      worksheetDetails.name = WorksheetNoGenerator.generate(WORKSHEET_TYPE.UNLOADING, true)\n      worksheetDetails.seq = 0\n      worksheetDetails.type = WORKSHEET_TYPE.UNLOADING\n      worksheetDetails.status = WORKSHEET_STATUS.DEACTIVATED\n      worksheetDetails.domain = domain\n      worksheetDetails.bizplace = bizplace\n      worksheetDetails.worksheet = worksheet\n      worksheetDetails.targetProduct = newOP\n      worksheetDetails.creator = user\n      worksheetDetails.updater = user\n\n      await tx.getRepository(WorksheetDetail).save(worksheetDetails)\n\n      // update actualQty & actualUomValue of order vas\n      let actualQty: number = 0\n      let actualUomValue: number = 0\n\n      actualQty = Number(targetVas.actualQty) + Number(unpackQty)\n      actualUomValue = Number(targetVas.actualUomValue) + Number(unpackUomValue)\n\n      let newTargetVas: OrderVas = Object.assign({}, targetVas)\n      newTargetVas.actualQty = actualQty\n      newTargetVas.actualUomValue = actualUomValue\n      await tx.getRepository(OrderVas).save(newTargetVas)\n\n      await executeVas(tx, domain, user, wsd)\n    }\n  }\n}\n"]}
+{"version":3,"file":"unpacking.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/unpacking/unpacking.ts"],"names":[],"mappings":"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","sourcesContent":["import { Bizplace } from '@things-factory/biz-base'\nimport { generateId } from '@things-factory/id-rule-base'\nimport { Product } from '@things-factory/product-base'\nimport { ORDER_PRODUCT_STATUS, OrderNoGenerator, OrderProduct, OrderVas, ReleaseGood } from '@things-factory/sales-base'\n\nimport { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../../constants'\nimport { VasWorksheetController } from '../../../../../controllers/vas/vas-worksheet-controller'\nimport { Worksheet, WorksheetDetail } from '../../../../../entities'\nimport { WorksheetNoGenerator } from '../../../../../utils'\nimport { executeVas } from '../../vas/execute-vas'\nimport { getWorksheetDetailByName } from '../common-utils'\nimport { RefOrderType } from '../interfaces'\n\nexport const unpackingResolver = {\n  async unpacking(\n    _: any,\n    { worksheetDetailName, childProductId, unpackQty, unpackUomValue, palletId, locationName },\n    context: any\n  ) {\n    const { tx, domain, user } = context.state\n\n    const childProduct: Product = await tx.getRepository(Product).findOne({\n      where: { id: childProductId },\n      relations: ['domain']\n    })\n    if (!childProduct) throw new Error(`Couldn't find product by its sku (${childProduct.sku})`)\n\n    // Find target worksheet detail & target order vas & bizplace\n    const wsd: WorksheetDetail = await getWorksheetDetailByName(tx, domain, worksheetDetailName)\n    let { bizplace, targetVas }: { bizplace: Bizplace; targetVas: OrderVas } = wsd\n\n    // Init refOrder\n    const { arrivalNotice, releaseGood, vasOrder }: { [key: string]: RefOrderType } = targetVas\n    const refOrder: RefOrderType = arrivalNotice || releaseGood || vasOrder || null\n    if (!refOrder) throw new Error(`Couldn't find reference order with current order vas`)\n\n    if (!palletId && refOrder instanceof ReleaseGood) {\n      // auto generate pallet ID for release order\n      const today = new Date()\n      const year = today.getFullYear()\n      const month = today.getMonth()\n      const day = today.getDate()\n\n      const yy = String(year).substr(String(year).length - 2)\n      const mm = String(month + 1).padStart(2, '0')\n      const dd = String(day).padStart(2, '0')\n\n      const date = yy + mm + dd\n      palletId = await generateId({\n        domain,\n        type: 'vas_pallet_id',\n        seed: {\n          batchId: targetVas.targetBatchId,\n          date: date\n        }\n      })\n\n      // to get refInventory location to assign as new inventory location\n      if (!locationName) {\n        const foundOrderVas: OrderVas = await tx.getRepository(OrderVas).findOne({\n          where: { id: targetVas.id },\n          relations: ['targetProduct', 'inventory', 'inventory.location']\n        })\n\n        locationName = foundOrderVas?.inventory?.location.name\n      }\n    }\n\n    if (palletId) {\n      const worksheetController: VasWorksheetController = new VasWorksheetController(tx, domain, user)\n      await worksheetController.unpackingWithPallet(\n        worksheetDetailName,\n        childProduct,\n        unpackQty,\n        unpackUomValue,\n        palletId,\n        locationName,\n        refOrder\n      )\n    } else {\n      let foundOP: OrderProduct = await tx.getRepository(OrderProduct).findOne({\n        where: {\n          domain: { id: domain.id },\n          arrivalNotice: { id: arrivalNotice.id },\n          batchId: targetVas.targetBatchId,\n          product: targetVas.targetProduct\n        }\n      })\n\n      //Create new order product for unpacked products\n      let newOP: OrderProduct = new OrderProduct()\n      newOP.domain = domain\n      newOP.bizplace = bizplace\n      newOP.name = OrderNoGenerator.orderProduct()\n      newOP.batchId = targetVas.targetBatchId\n      newOP.packingType = childProduct.packingType\n      newOP.uom = childProduct.primaryUnit\n      newOP.packQty = unpackQty\n      newOP.uomValue = unpackUomValue\n      newOP.palletQty = null\n      newOP.totalUomValue =\n        (Number(unpackQty) * Number(unpackUomValue)).toFixed(2) + ' ' + (childProduct.primaryUnit || '')\n      newOP.status = ORDER_PRODUCT_STATUS.READY_TO_UNLOAD\n      newOP.arrivalNotice = arrivalNotice\n      newOP.product = childProduct\n      newOP.creator = user\n      newOP.updater = user\n\n      await tx.getRepository(OrderProduct).save(newOP)\n\n      // update unpackQty and unpackUomValue of original product\n      foundOP.unpackQty = unpackQty\n      foundOP.unpackUomValue = unpackUomValue\n\n      // update packQty and totalUomValue of original product\n      foundOP.packQty -= targetVas.qty\n      foundOP.totalUomValue = `${(foundOP.uomValue * foundOP.packQty).toFixed(2)} ${foundOP.uom}`\n\n      // update the order product status to DONE if remaining packQty is 0\n      // -- so that the user will never see this product during unloading and putaway stages\n      // if (foundOP.packQty === 0) foundOP.status = ORDER_PRODUCT_STATUS.TERMINATED\n\n      await tx.getRepository(OrderProduct).save(foundOP)\n\n      let worksheet: Worksheet = await tx.getRepository(Worksheet).findOne({\n        where: {\n          domain: { id: domain.id },\n          arrivalNotice: { id: arrivalNotice.id },\n          type: WORKSHEET_TYPE.UNLOADING\n        }\n      })\n\n      let worksheetDetails: WorksheetDetail = new WorksheetDetail()\n      worksheetDetails.name = WorksheetNoGenerator.generate(WORKSHEET_TYPE.UNLOADING, true)\n      worksheetDetails.seq = 0\n      worksheetDetails.type = WORKSHEET_TYPE.UNLOADING\n      worksheetDetails.status = WORKSHEET_STATUS.DEACTIVATED\n      worksheetDetails.domain = domain\n      worksheetDetails.bizplace = bizplace\n      worksheetDetails.worksheet = worksheet\n      worksheetDetails.targetProduct = newOP\n      worksheetDetails.creator = user\n      worksheetDetails.updater = user\n\n      await tx.getRepository(WorksheetDetail).save(worksheetDetails)\n\n      // update actualQty & actualUomValue of order vas\n      let actualQty: number = 0\n      let actualUomValue: number = 0\n\n      actualQty = Number(targetVas.actualQty) + Number(unpackQty)\n      actualUomValue = Number(targetVas.actualUomValue) + Number(unpackUomValue)\n\n      let newTargetVas: OrderVas = Object.assign({}, targetVas)\n      newTargetVas.actualQty = actualQty\n      newTargetVas.actualUomValue = actualUomValue\n      await tx.getRepository(OrderVas).save(newTargetVas)\n\n      await executeVas(tx, domain, user, wsd)\n    }\n  }\n}\n"]}

package/dist-server/graphql/resolvers/worksheet/vas-worksheet.js

@@ -1,29 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.vasWorksheetResolver = void 0;
-const sales_base_1 = require("@things-factory/sales-base");
 const typeorm_1 = require("typeorm");
-const utils_1 = require("../../../utils");
+const sales_base_1 = require("@things-factory/sales-base");
+const shell_1 = require("@things-factory/shell");
 const constants_1 = require("../../../constants");
+const utils_1 = require("../../../utils");
 exports.vasWorksheetResolver = {
     async vasWorksheet(_, { orderNo, orderType }, context) {
         const { domain } = context.state;
         let refOrder;
         if (orderType === sales_base_1.ORDER_TYPES.ARRIVAL_NOTICE) {
-            refOrder = await (0, typeorm_1.getRepository)(sales_base_1.ArrivalNotice).findOne({
-                where: { domain, name: orderNo, status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(sales_base_1.ORDER_STATUS.DONE)) },
+            refOrder = await (0, shell_1.getRepository)(sales_base_1.ArrivalNotice).findOne({
+                where: { domain: { id: domain.id }, name: orderNo, status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(sales_base_1.ORDER_STATUS.DONE)) },
                 relations: ['bizplace']
             });
         }
         else if (orderType === sales_base_1.ORDER_TYPES.RELEASE_OF_GOODS) {
-            refOrder = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).findOne({
-                where: { domain, name: orderNo, status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(sales_base_1.ORDER_STATUS.DONE)) },
+            refOrder = await (0, shell_1.getRepository)(sales_base_1.ReleaseGood).findOne({
+                where: { domain: { id: domain.id }, name: orderNo, status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(sales_base_1.ORDER_STATUS.DONE)) },
                 relations: ['bizplace']
             });
         }
         else if (orderType === sales_base_1.ORDER_TYPES.VAS_ORDER) {
-            refOrder = await (0, typeorm_1.getRepository)(sales_base_1.VasOrder).findOne({
-                where: { domain, name: orderNo, status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(sales_base_1.ORDER_STATUS.DONE)) },
+            refOrder = await (0, shell_1.getRepository)(sales_base_1.VasOrder).findOne({
+                where: { domain: { id: domain.id }, name: orderNo, status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(sales_base_1.ORDER_STATUS.DONE)) },
                 relations: ['bizplace']
             });
         }
@@ -42,8 +43,8 @@ exports.vasWorksheetResolver = {
         if (orderType === sales_base_1.ORDER_TYPES.RELEASE_OF_GOODS) {
             for (let wsd of worksheet.worksheetDetails) {
                 const inventory = wsd.targetVas.inventory;
-                const orderInv = await (0, typeorm_1.getRepository)(sales_base_1.OrderInventory).findOne({
-                    where: { domain, releaseGood: refOrder, inventory }
+                const orderInv = await (0, shell_1.getRepository)(sales_base_1.OrderInventory).findOne({
+                    where: { domain: { id: domain.id }, releaseGood: refOrder, inventory }
                 });
                 wsd.targetInventory = orderInv;
             }

package/dist-server/graphql/resolvers/worksheet/vas-worksheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"vas-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/vas-worksheet.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ArrivalNotice,\n  OrderInventory,\n  OrderVas,\n  ORDER_STATUS,\n  ORDER_TYPES,\n  ReleaseGood,\n  VasOrder\n} from '@things-factory/sales-base'\nimport { Domain } from '@things-factory/shell'\nimport { Equal, getRepository, Not } from 'typeorm'\nimport { fetchExecutingWorksheet } from '../../../utils'\nimport { Inventory } from '@things-factory/warehouse-base'\nimport { WORKSHEET_TYPE } from '../../../constants'\nimport { Worksheet, WorksheetDetail } from '../../../entities'\n\nexport const vasWorksheetResolver = {\n  async vasWorksheet(_: any, { orderNo, orderType }, context: any) {\n    const { domain }: { domain: Domain } = context.state\n    let refOrder: ArrivalNotice | ReleaseGood | VasOrder\n    if (orderType === ORDER_TYPES.ARRIVAL_NOTICE) {\n      refOrder = await getRepository(ArrivalNotice).findOne({\n        where: { domain, name: orderNo, status: Not(Equal(ORDER_STATUS.DONE)) },\n        relations: ['bizplace']\n      })\n    } else if (orderType === ORDER_TYPES.RELEASE_OF_GOODS) {\n      refOrder = await getRepository(ReleaseGood).findOne({\n        where: { domain, name: orderNo, status: Not(Equal(ORDER_STATUS.DONE)) },\n        relations: ['bizplace']\n      })\n    } else if (orderType === ORDER_TYPES.VAS_ORDER) {\n      refOrder = await getRepository(VasOrder).findOne({\n        where: { domain, name: orderNo, status: Not(Equal(ORDER_STATUS.DONE)) },\n        relations: ['bizplace']\n      })\n    }\n\n    if (!refOrder) throw new Error(`Couldn't find VAS worksheet by order no (${orderNo})`)\n\n    const worksheet: Worksheet = await fetchExecutingWorksheet(\n      domain,\n      refOrder.bizplace,\n      [\n        'worksheetDetails',\n        'worksheetDetails.targetVas',\n        'worksheetDetails.targetVas.vas',\n        'worksheetDetails.targetVas.inventory',\n        'worksheetDetails.targetVas.targetProduct',\n        'worksheetDetails.targetVas.inventory.location',\n        'creator',\n        'updater'\n      ],\n      WORKSHEET_TYPE.VAS,\n      refOrder\n    )\n\n    if (orderType === ORDER_TYPES.RELEASE_OF_GOODS) {\n      for (let wsd of worksheet.worksheetDetails) {\n        const inventory: Inventory = wsd.targetVas.inventory\n        const orderInv: OrderInventory = await getRepository(OrderInventory).findOne({\n          where: { domain, releaseGood: refOrder, inventory }\n        })\n\n        wsd.targetInventory = orderInv\n      }\n    }\n\n    return {\n      worksheetInfo: {\n        bizplaceName: refOrder.bizplace.name,\n        containerNo: refOrder?.containerNo,\n        startedAt: worksheet.startedAt\n      },\n      worksheetDetailInfos: worksheet.worksheetDetails\n        .sort((a: WorksheetDetail, b: WorksheetDetail) => a.seq - b.seq)\n        .map((wsd: WorksheetDetail) => {\n          const targetVas: OrderVas = wsd.targetVas\n          return {\n            name: wsd.name,\n            seq: wsd.seq,\n            status: wsd.status,\n            issue: wsd.issue,\n            relatedOrderInv: wsd.targetInventory,\n            batchId: targetVas?.batchId,\n            targetName: targetVas?.name,\n            vas: targetVas?.vas,\n            set: targetVas?.set,\n            inventory: targetVas?.inventory,\n            locationInv: targetVas?.inventory?.location?.name,\n            targetType: targetVas?.targetType,\n            targetBatchId: targetVas?.targetBatchId,\n            targetProduct: targetVas?.targetProduct,\n            otherTarget: targetVas?.otherTarget,\n            qty: targetVas?.qty,\n            weight: targetVas?.weight,\n            uomValue: targetVas?.uomValue,\n            operationGuide: targetVas?.operationGuide,\n            description: wsd.description,\n            remark: targetVas?.remark,\n            actualQty: targetVas?.actualQty,\n            actualUomValue: targetVas?.actualUomValue\n          }\n        })\n    }\n  }\n}\n"]}
+{"version":3,"file":"vas-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/vas-worksheet.ts"],"names":[],"mappings":"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","sourcesContent":["import { Equal, Not } from 'typeorm'\n\nimport {\n  ArrivalNotice,\n  ORDER_STATUS,\n  ORDER_TYPES,\n  OrderInventory,\n  OrderVas,\n  ReleaseGood,\n  VasOrder\n} from '@things-factory/sales-base'\nimport { getRepository } from '@things-factory/shell'\nimport { Inventory } from '@things-factory/warehouse-base'\n\nimport { WORKSHEET_TYPE } from '../../../constants'\nimport { Worksheet, WorksheetDetail } from '../../../entities'\nimport { fetchExecutingWorksheet } from '../../../utils'\n\nexport const vasWorksheetResolver = {\n  async vasWorksheet(_: any, { orderNo, orderType }, context: ResolverContext) {\n    const { domain } = context.state\n    let refOrder: ArrivalNotice | ReleaseGood | VasOrder\n    if (orderType === ORDER_TYPES.ARRIVAL_NOTICE) {\n      refOrder = await getRepository(ArrivalNotice).findOne({\n        where: { domain: { id: domain.id }, name: orderNo, status: Not(Equal(ORDER_STATUS.DONE)) },\n        relations: ['bizplace']\n      })\n    } else if (orderType === ORDER_TYPES.RELEASE_OF_GOODS) {\n      refOrder = await getRepository(ReleaseGood).findOne({\n        where: { domain: { id: domain.id }, name: orderNo, status: Not(Equal(ORDER_STATUS.DONE)) },\n        relations: ['bizplace']\n      })\n    } else if (orderType === ORDER_TYPES.VAS_ORDER) {\n      refOrder = await getRepository(VasOrder).findOne({\n        where: { domain: { id: domain.id }, name: orderNo, status: Not(Equal(ORDER_STATUS.DONE)) },\n        relations: ['bizplace']\n      })\n    }\n\n    if (!refOrder) throw new Error(`Couldn't find VAS worksheet by order no (${orderNo})`)\n\n    const worksheet: Worksheet = await fetchExecutingWorksheet(\n      domain,\n      refOrder.bizplace,\n      [\n        'worksheetDetails',\n        'worksheetDetails.targetVas',\n        'worksheetDetails.targetVas.vas',\n        'worksheetDetails.targetVas.inventory',\n        'worksheetDetails.targetVas.targetProduct',\n        'worksheetDetails.targetVas.inventory.location',\n        'creator',\n        'updater'\n      ],\n      WORKSHEET_TYPE.VAS,\n      refOrder\n    )\n\n    if (orderType === ORDER_TYPES.RELEASE_OF_GOODS) {\n      for (let wsd of worksheet.worksheetDetails) {\n        const inventory: Inventory = wsd.targetVas.inventory\n        const orderInv: OrderInventory = await getRepository(OrderInventory).findOne({\n          where: { domain: { id: domain.id }, releaseGood: refOrder, inventory }\n        })\n\n        wsd.targetInventory = orderInv\n      }\n    }\n\n    return {\n      worksheetInfo: {\n        bizplaceName: refOrder.bizplace.name,\n        containerNo: refOrder?.containerNo,\n        startedAt: worksheet.startedAt\n      },\n      worksheetDetailInfos: worksheet.worksheetDetails\n        .sort((a: WorksheetDetail, b: WorksheetDetail) => a.seq - b.seq)\n        .map((wsd: WorksheetDetail) => {\n          const targetVas: OrderVas = wsd.targetVas\n          return {\n            name: wsd.name,\n            seq: wsd.seq,\n            status: wsd.status,\n            issue: wsd.issue,\n            relatedOrderInv: wsd.targetInventory,\n            batchId: targetVas?.batchId,\n            targetName: targetVas?.name,\n            vas: targetVas?.vas,\n            set: targetVas?.set,\n            inventory: targetVas?.inventory,\n            locationInv: targetVas?.inventory?.location?.name,\n            targetType: targetVas?.targetType,\n            targetBatchId: targetVas?.targetBatchId,\n            targetProduct: targetVas?.targetProduct,\n            otherTarget: targetVas?.otherTarget,\n            qty: targetVas?.qty,\n            weight: targetVas?.weight,\n            uomValue: targetVas?.uomValue,\n            operationGuide: targetVas?.operationGuide,\n            description: wsd.description,\n            remark: targetVas?.remark,\n            actualQty: targetVas?.actualQty,\n            actualUomValue: targetVas?.actualUomValue\n          }\n        })\n    }\n  }\n}\n"]}

package/dist-server/graphql/resolvers/worksheet/worksheet-by-order-no.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.worksheetByOrderNo = exports.worksheetByOrderNoResolver = void 0;
 const sales_base_1 = require("@things-factory/sales-base");
-const entities_1 = require("../../../entities");
 const constants_1 = require("../../../constants");
+const entities_1 = require("../../../entities");
 exports.worksheetByOrderNoResolver = {
     async worksheetByOrderNo(_, { orderType, orderNo }, context) {
         const { tx, domain } = context.state;
@@ -11,15 +11,18 @@ exports.worksheetByOrderNoResolver = {
     }
 };
 async function worksheetByOrderNo(domain, orderNo, type, tx) {
-    let findOption = { where: { domain, type }, relations: ['worksheetDetails'] };
+    let findOption = {
+        where: { domain: { id: domain.id }, type },
+        relations: ['worksheetDetails']
+    };
     if (type === constants_1.WORKSHEET_TYPE.UNLOADING || type === constants_1.WORKSHEET_TYPE.PUTAWAY) {
         const ganRepo = tx.getRepository(sales_base_1.ArrivalNotice);
-        findOption.where['arrivalNotice'] = await ganRepo.findOne({ domain, name: orderNo });
+        findOption.where['arrivalNotice'] = await ganRepo.findOneBy({ domain: { id: domain.id }, name: orderNo });
         findOption.relations.push('worksheetDetails.targetProduct');
     }
     else if (type === constants_1.WORKSHEET_TYPE.PICKING || type === constants_1.WORKSHEET_TYPE.LOADING) {
         const roRepo = tx.getRepository(sales_base_1.ReleaseGood);
-        findOption.where['releaseGood'] = await roRepo.findOne({ domain, name: orderNo });
+        findOption.where['releaseGood'] = await roRepo.findOneBy({ domain: { id: domain.id }, name: orderNo });
         findOption.relations.push('worksheetDetails.targetInventory');
     }
     const wsRepo = tx.getRepository(entities_1.Worksheet);

package/dist-server/graphql/resolvers/worksheet/worksheet-by-order-no.js.map

@@ -1 +1 @@
-{"version":3,"file":"worksheet-by-order-no.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet-by-order-no.ts"],"names":[],"mappings":";;;AAAA,2DAAuE;AAGvE,gDAA6C;AAC7C,kDAAmD;AAEtC,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CACtB,CAAM,EACN,EAAE,SAAS,EAAE,OAAO,EAA0C,EAC9D,OAAY;QAEZ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAC3E,OAAO,MAAM,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;IACjE,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,MAAc,EACd,OAAe,EACf,IAAY,EACZ,EAAiB;IAEjB,IAAI,UAAU,GAA8B,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,kBAAkB,CAAC,EAAE,CAAA;IAExG,IAAI,IAAI,KAAK,0BAAc,CAAC,SAAS,IAAI,IAAI,KAAK,0BAAc,CAAC,OAAO,EAAE;QACxE,MAAM,OAAO,GAA8B,EAAE,CAAC,aAAa,CAAC,0BAAa,CAAC,CAAA;QAC1E,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;QACpF,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAA;KAC5D;SAAM,IAAI,IAAI,KAAK,0BAAc,CAAC,OAAO,IAAI,IAAI,KAAK,0BAAc,CAAC,OAAO,EAAE;QAC7E,MAAM,MAAM,GAA4B,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAA;QACrE,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;QACjF,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAA;KAC9D;IAED,MAAM,MAAM,GAA0B,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAA;IACjE,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;AACzC,CAAC;AApBD,gDAoBC","sourcesContent":["import { ArrivalNotice, ReleaseGood } from '@things-factory/sales-base'\nimport { Domain } from '@things-factory/shell'\nimport { EntityManager, FindOneOptions, Repository } from 'typeorm'\nimport { Worksheet } from '../../../entities'\nimport { WORKSHEET_TYPE } from '../../../constants'\n\nexport const worksheetByOrderNoResolver = {\n  async worksheetByOrderNo(\n    _: any,\n    { orderType, orderNo }: { orderType: string; orderNo: string },\n    context: any\n  ): Promise<Worksheet> {\n    const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state\n    return await worksheetByOrderNo(domain, orderNo, orderType, tx)\n  }\n}\n\nexport async function worksheetByOrderNo(\n  domain: Domain,\n  orderNo: string,\n  type: string,\n  tx: EntityManager\n): Promise<Worksheet> {\n  let findOption: FindOneOptions<Worksheet> = { where: { domain, type }, relations: ['worksheetDetails'] }\n\n  if (type === WORKSHEET_TYPE.UNLOADING || type === WORKSHEET_TYPE.PUTAWAY) {\n    const ganRepo: Repository<ArrivalNotice> = tx.getRepository(ArrivalNotice)\n    findOption.where['arrivalNotice'] = await ganRepo.findOne({ domain, name: orderNo })\n    findOption.relations.push('worksheetDetails.targetProduct')\n  } else if (type === WORKSHEET_TYPE.PICKING || type === WORKSHEET_TYPE.LOADING) {\n    const roRepo: Repository<ReleaseGood> = tx.getRepository(ReleaseGood)\n    findOption.where['releaseGood'] = await roRepo.findOne({ domain, name: orderNo })\n    findOption.relations.push('worksheetDetails.targetInventory')\n  }\n\n  const wsRepo: Repository<Worksheet> = tx.getRepository(Worksheet)\n  return await wsRepo.findOne(findOption)\n}\n"]}
+{"version":3,"file":"worksheet-by-order-no.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet-by-order-no.ts"],"names":[],"mappings":";;;AAEA,2DAAuE;AAGvE,kDAAmD;AACnD,gDAA6C;AAEhC,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CACtB,CAAM,EACN,EAAE,SAAS,EAAE,OAAO,EAA0C,EAC9D,OAAY;QAEZ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QACpC,OAAO,MAAM,kBAAkB,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;IACjE,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,MAAc,EACd,OAAe,EACf,IAAY,EACZ,EAAiB;IAEjB,IAAI,UAAU,GAA8B;QAC1C,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE;QAC1C,SAAS,EAAE,CAAC,kBAAkB,CAAC;KAChC,CAAA;IAED,IAAI,IAAI,KAAK,0BAAc,CAAC,SAAS,IAAI,IAAI,KAAK,0BAAc,CAAC,OAAO,EAAE;QACxE,MAAM,OAAO,GAA8B,EAAE,CAAC,aAAa,CAAC,0BAAa,CAAC,CAAA;QAC1E,UAAU,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CACxG;QAAC,UAAU,CAAC,SAAsB,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAA;KAC3E;SAAM,IAAI,IAAI,KAAK,0BAAc,CAAC,OAAO,IAAI,IAAI,KAAK,0BAAc,CAAC,OAAO,EAAE;QAC7E,MAAM,MAAM,GAA4B,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAA;QACrE,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CACrG;QAAC,UAAU,CAAC,SAAsB,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAA;KAC7E;IAED,MAAM,MAAM,GAA0B,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAA;IACjE,OAAO,MAAM,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;AACzC,CAAC;AAvBD,gDAuBC","sourcesContent":["import { EntityManager, FindOneOptions, Repository } from 'typeorm'\n\nimport { ArrivalNotice, ReleaseGood } from '@things-factory/sales-base'\nimport { Domain } from '@things-factory/shell'\n\nimport { WORKSHEET_TYPE } from '../../../constants'\nimport { Worksheet } from '../../../entities'\n\nexport const worksheetByOrderNoResolver = {\n  async worksheetByOrderNo(\n    _: any,\n    { orderType, orderNo }: { orderType: string; orderNo: string },\n    context: any\n  ): Promise<Worksheet> {\n    const { tx, domain } = context.state\n    return await worksheetByOrderNo(domain, orderNo, orderType, tx)\n  }\n}\n\nexport async function worksheetByOrderNo(\n  domain: Domain,\n  orderNo: string,\n  type: string,\n  tx: EntityManager\n): Promise<Worksheet> {\n  let findOption: FindOneOptions<Worksheet> = {\n    where: { domain: { id: domain.id }, type },\n    relations: ['worksheetDetails']\n  }\n\n  if (type === WORKSHEET_TYPE.UNLOADING || type === WORKSHEET_TYPE.PUTAWAY) {\n    const ganRepo: Repository<ArrivalNotice> = tx.getRepository(ArrivalNotice)\n    findOption.where['arrivalNotice'] = await ganRepo.findOneBy({ domain: { id: domain.id }, name: orderNo })\n    ;(findOption.relations as string[]).push('worksheetDetails.targetProduct')\n  } else if (type === WORKSHEET_TYPE.PICKING || type === WORKSHEET_TYPE.LOADING) {\n    const roRepo: Repository<ReleaseGood> = tx.getRepository(ReleaseGood)\n    findOption.where['releaseGood'] = await roRepo.findOneBy({ domain: { id: domain.id }, name: orderNo })\n    ;(findOption.relations as string[]).push('worksheetDetails.targetInventory')\n  }\n\n  const wsRepo: Repository<Worksheet> = tx.getRepository(Worksheet)\n  return await wsRepo.findOne(findOption)\n}\n"]}

package/dist-server/graphql/resolvers/worksheet/worksheet-with-pagination.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.worksheetWithPaginationResolver = void 0;
-const typeorm_1 = require("typeorm");
+const shell_1 = require("@things-factory/shell");
 const entities_1 = require("../../../entities");
 exports.worksheetWithPaginationResolver = {
     async worksheetWithPagination(_, { name, pagination }, context) {
         const { domain } = context.state;
-        const worksheet = await (0, typeorm_1.getRepository)(entities_1.Worksheet).findOne({
-            where: { domain, name },
+        const worksheet = await (0, shell_1.getRepository)(entities_1.Worksheet).findOne({
+            where: { domain: { id: domain.id }, name },
             relations: ['bizplace', 'arrivalNotice', 'releaseGood', 'inventoryCheck']
         });
         let findManyOptions = {
-            where: { domain, worksheet },
+            where: { domain: { id: domain.id }, worksheet: { id: worksheet.id } },
             relations: [
                 'targetInventory',
                 'targetInventory.originLocation',
@@ -27,7 +27,7 @@ exports.worksheetWithPaginationResolver = {
             findManyOptions.skip = offset;
             findManyOptions.take = limit;
         }
-        const [worksheetDetails, total] = await (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).findAndCount(findManyOptions);
+        const [worksheetDetails, total] = await (0, shell_1.getRepository)(entities_1.WorksheetDetail).findAndCount(findManyOptions);
         return {
             worksheet,
             worksheetDetails,

package/dist-server/graphql/resolvers/worksheet/worksheet-with-pagination.js.map

@@ -1 +1 @@
-{"version":3,"file":"worksheet-with-pagination.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet-with-pagination.ts"],"names":[],"mappings":";;;AACA,qCAAwD;AACxD,gDAA8D;AAEjD,QAAA,+BAA+B,GAAG;IAC7C,KAAK,CAAC,uBAAuB,CAC3B,CAAM,EACN,EAAE,IAAI,EAAE,UAAU,EAAkE,EACpF,OAAY;QAEZ,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,MAAM,SAAS,GAAc,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAClE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;YACvB,SAAS,EAAE,CAAC,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,gBAAgB,CAAC;SAC1E,CAAC,CAAA;QAEF,IAAI,eAAe,GAAqC;YACtD,KAAK,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE;YAC5B,SAAS,EAAE;gBACT,iBAAiB;gBACjB,gCAAgC;gBAChC,mCAAmC;gBACnC,2BAA2B;gBAC3B,oCAAoC;gBACpC,mCAAmC;aACpC;SACF,CAAA;QAED,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,MAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAA,EAAE;YACzC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAoC,UAAU,CAAA;YACnE,MAAM,MAAM,GAAW,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAA;YACzC,eAAe,CAAC,IAAI,GAAG,MAAM,CAAA;YAC7B,eAAe,CAAC,IAAI,GAAG,KAAK,CAAA;SAC7B;QAED,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC,CAAA;QAEpG,OAAO;YACL,SAAS;YACT,gBAAgB;YAChB,KAAK;SACN,CAAA;IACH,CAAC;CACF,CAAA","sourcesContent":["import { Domain } from '@things-factory/shell'\nimport { FindManyOptions, getRepository } from 'typeorm'\nimport { Worksheet, WorksheetDetail } from '../../../entities'\n\nexport const worksheetWithPaginationResolver = {\n  async worksheetWithPagination(\n    _: any,\n    { name, pagination }: { name: string; pagination?: { page: number; limit: number } },\n    context: any\n  ): Promise<{ worksheet: Worksheet; worksheetDetails: WorksheetDetail[]; total: number }> {\n    const { domain }: { domain: Domain } = context.state\n    const worksheet: Worksheet = await getRepository(Worksheet).findOne({\n      where: { domain, name },\n      relations: ['bizplace', 'arrivalNotice', 'releaseGood', 'inventoryCheck']\n    })\n\n    let findManyOptions: FindManyOptions<WorksheetDetail> = {\n      where: { domain, worksheet },\n      relations: [\n        'targetInventory',\n        'targetInventory.originLocation',\n        'targetInventory.inspectedLocation',\n        'targetInventory.inventory',\n        'targetInventory.inventory.location',\n        'targetInventory.inventory.product'\n      ]\n    }\n\n    if (pagination?.page && pagination?.limit) {\n      const { page, limit }: { page: number; limit: number } = pagination\n      const offset: number = (page - 1) * limit\n      findManyOptions.skip = offset\n      findManyOptions.take = limit\n    }\n\n    const [worksheetDetails, total] = await getRepository(WorksheetDetail).findAndCount(findManyOptions)\n\n    return {\n      worksheet,\n      worksheetDetails,\n      total\n    }\n  }\n}\n"]}
+{"version":3,"file":"worksheet-with-pagination.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet-with-pagination.ts"],"names":[],"mappings":";;;AAEA,iDAAqD;AAErD,gDAA8D;AAEjD,QAAA,+BAA+B,GAAG;IAC7C,KAAK,CAAC,uBAAuB,CAC3B,CAAM,EACN,EAAE,IAAI,EAAE,UAAU,EAAkE,EACpF,OAAY;QAEZ,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAChC,MAAM,SAAS,GAAc,MAAM,IAAA,qBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAClE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE;YAC1C,SAAS,EAAE,CAAC,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,gBAAgB,CAAC;SAC1E,CAAC,CAAA;QAEF,IAAI,eAAe,GAAqC;YACtD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE;YACrE,SAAS,EAAE;gBACT,iBAAiB;gBACjB,gCAAgC;gBAChC,mCAAmC;gBACnC,2BAA2B;gBAC3B,oCAAoC;gBACpC,mCAAmC;aACpC;SACF,CAAA;QAED,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,MAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,CAAA,EAAE;YACzC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAoC,UAAU,CAAA;YACnE,MAAM,MAAM,GAAW,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAA;YACzC,eAAe,CAAC,IAAI,GAAG,MAAM,CAAA;YAC7B,eAAe,CAAC,IAAI,GAAG,KAAK,CAAA;SAC7B;QAED,MAAM,CAAC,gBAAgB,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,qBAAa,EAAC,0BAAe,CAAC,CAAC,YAAY,CAAC,eAAe,CAAC,CAAA;QAEpG,OAAO;YACL,SAAS;YACT,gBAAgB;YAChB,KAAK;SACN,CAAA;IACH,CAAC;CACF,CAAA","sourcesContent":["import { FindManyOptions } from 'typeorm'\n\nimport { getRepository } from '@things-factory/shell'\n\nimport { Worksheet, WorksheetDetail } from '../../../entities'\n\nexport const worksheetWithPaginationResolver = {\n  async worksheetWithPagination(\n    _: any,\n    { name, pagination }: { name: string; pagination?: { page: number; limit: number } },\n    context: any\n  ): Promise<{ worksheet: Worksheet; worksheetDetails: WorksheetDetail[]; total: number }> {\n    const { domain } = context.state\n    const worksheet: Worksheet = await getRepository(Worksheet).findOne({\n      where: { domain: { id: domain.id }, name },\n      relations: ['bizplace', 'arrivalNotice', 'releaseGood', 'inventoryCheck']\n    })\n\n    let findManyOptions: FindManyOptions<WorksheetDetail> = {\n      where: { domain: { id: domain.id }, worksheet: { id: worksheet.id } },\n      relations: [\n        'targetInventory',\n        'targetInventory.originLocation',\n        'targetInventory.inspectedLocation',\n        'targetInventory.inventory',\n        'targetInventory.inventory.location',\n        'targetInventory.inventory.product'\n      ]\n    }\n\n    if (pagination?.page && pagination?.limit) {\n      const { page, limit }: { page: number; limit: number } = pagination\n      const offset: number = (page - 1) * limit\n      findManyOptions.skip = offset\n      findManyOptions.take = limit\n    }\n\n    const [worksheetDetails, total] = await getRepository(WorksheetDetail).findAndCount(findManyOptions)\n\n    return {\n      worksheet,\n      worksheetDetails,\n      total\n    }\n  }\n}\n"]}

package/dist-server/graphql/resolvers/worksheet/worksheet.js

@@ -5,6 +5,8 @@ const typeorm_1 = require("typeorm");
 const marketplace_base_1 = require("@things-factory/marketplace-base");
 const sales_base_1 = require("@things-factory/sales-base");
 const setting_base_1 = require("@things-factory/setting-base");
+const shell_1 = require("@things-factory/shell");
+const warehouse_base_1 = require("@things-factory/warehouse-base");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 exports.worksheetResolver = {
@@ -12,9 +14,9 @@ exports.worksheetResolver = {
         var _a, _b, _c, _d, _e;
         const { domain } = context.state;
         let worksheet;
-        worksheet = (await (0, typeorm_1.getRepository)(entities_1.Worksheet).findOne({
+        worksheet = (await (0, shell_1.getRepository)(entities_1.Worksheet).findOne({
             where: {
-                domain,
+                domain: { id: domain.id },
                 name
             },
             relations: [
@@ -30,6 +32,7 @@ exports.worksheetResolver = {
                 'releaseGood.shippingOrder',
                 'releaseGood.deliverTo',
                 'releaseGood.deliverTo.bizplace',
+                'releaseGood.manifest',
                 'returnOrder',
                 'inventoryCheck',
                 'vasOrder',
@@ -56,10 +59,10 @@ exports.worksheetResolver = {
             ]
         }));
         if (!worksheet) {
-            worksheet = (await (0, typeorm_1.getRepository)(entities_1.Worksheet).findOne({
+            worksheet = (await (0, shell_1.getRepository)(entities_1.Worksheet).findOne({
                 where: {
-                    domain,
-                    arrivalNotice: name
+                    domain: { id: domain.id },
+                    arrivalNotice: { id: name } /* CONFIRMME regarding TYPEORM - name means id ? */
                 },
                 relations: [
                     'domain',
@@ -81,28 +84,47 @@ exports.worksheetResolver = {
                 ]
             }));
         }
-        let pWorksheetPickingItemSorting = (0, typeorm_1.getRepository)(setting_base_1.Setting).findOne({
-            where: { domain, category: 'location', name: 'rule-for-worksheet-release-goods-item' }
+        let pWorksheetPickingItemSorting = (0, shell_1.getRepository)(setting_base_1.Setting).findOne({
+            where: { domain: { id: domain.id }, category: 'location', name: 'rule-for-picking-product' }
         });
         if ((_a = worksheet === null || worksheet === void 0 ? void 0 : worksheet.arrivalNotice) === null || _a === void 0 ? void 0 : _a.id) {
-            worksheet.orderProducts = await (0, typeorm_1.getRepository)(sales_base_1.OrderProduct).find({
+            worksheet.orderProducts = await (0, shell_1.getRepository)(sales_base_1.OrderProduct).find({
                 where: {
-                    domain,
-                    bizplace: worksheet.bizplace,
-                    arrivalNotice: worksheet.arrivalNotice
+                    domain: { id: domain.id },
+                    bizplace: { id: worksheet.bizplace.id },
+                    arrivalNotice: { id: worksheet.arrivalNotice.id }
                 }
             });
-            worksheet.orderVass = await (0, typeorm_1.getRepository)(sales_base_1.OrderVas).find({
+            worksheet.orderVass = await (0, shell_1.getRepository)(sales_base_1.OrderVas).find({
                 where: {
-                    domain,
-                    bizplace: worksheet.bizplace,
-                    arrivalNotice: worksheet.arrivalNotice
+                    domain: { id: domain.id },
+                    bizplace: { id: worksheet.bizplace.id },
+                    arrivalNotice: { id: worksheet.arrivalNotice.id }
                 },
                 relations: ['targetProduct']
             });
+            // update inventory data >> unloaded inventory history data
+            if (worksheet.type === constants_1.WORKSHEET_TYPE.PUTAWAY &&
+                worksheet.worksheetDetails.every(wsd => wsd.targetInventory.inventory)) {
+                worksheet.worksheetDetails = await Promise.all(worksheet.worksheetDetails.map(async (wsd) => {
+                    let inventory = wsd.targetInventory.inventory;
+                    let foundHistory = await (0, shell_1.getRepository)(warehouse_base_1.InventoryHistory).findOne({
+                        where: [
+                            { inventory, refOrderId: worksheet.arrivalNotice.id, status: warehouse_base_1.INVENTORY_STATUS.UNLOADED },
+                            { inventory, refOrderId: worksheet.arrivalNotice.id, status: warehouse_base_1.INVENTORY_STATUS.PARTIALLY_UNLOADED },
+                            { inventory, refOrderId: worksheet.arrivalNotice.id, status: warehouse_base_1.INVENTORY_STATUS.CHECKED },
+                            { inventory, refOrderId: worksheet.arrivalNotice.id, status: warehouse_base_1.INVENTORY_STATUS.STORED }
+                        ],
+                        relations: ['location', 'product'],
+                        order: { seq: 'DESC' }
+                    });
+                    wsd.targetInventory.inventory = Object.assign(Object.assign({}, inventory), { qty: (foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.qty) || (foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.openingQty) || 0, uomValue: (foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.uomValue) || (foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.openingUomValue) || 0, location: foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.location, product: foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.product, cartonId: foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.cartonId, batchId: foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.batchId, batchIdRef: foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.batchIdRef, packingType: foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.packingType, packingSize: foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.packingSize, uom: foundHistory === null || foundHistory === void 0 ? void 0 : foundHistory.uom });
+                    return wsd;
+                }));
+            }
         }
         if (worksheet.type === constants_1.WORKSHEET_TYPE.BATCH_PICKING) {
-            let qbOrderInventories = (0, typeorm_1.getRepository)(sales_base_1.OrderInventory)
+            let qbOrderInventories = (0, shell_1.getRepository)(sales_base_1.OrderInventory)
                 .createQueryBuilder('oi')
                 .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
                 .leftJoinAndSelect('oi.inventory', 'inventory')
@@ -122,14 +144,15 @@ exports.worksheetResolver = {
             if (sortingSetting === null || sortingSetting === void 0 ? void 0 : sortingSetting.value) {
                 let settingValue = JSON.parse(sortingSetting.value);
                 for (const key in settingValue) {
-                    qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC');
+                    qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC');
                 }
             }
+            qbOrderInventories.addOrderBy(`product.name`, 'ASC');
             let orderInventories = await qbOrderInventories.getMany();
             worksheet.orderInventories = orderInventories;
         }
         if ((_b = worksheet === null || worksheet === void 0 ? void 0 : worksheet.releaseGood) === null || _b === void 0 ? void 0 : _b.id) {
-            let qbOrderInventories = (0, typeorm_1.getRepository)(sales_base_1.OrderInventory)
+            let qbOrderInventories = (0, shell_1.getRepository)(sales_base_1.OrderInventory)
                 .createQueryBuilder('oi')
                 .leftJoinAndSelect('oi.releaseGood', 'releaseGood')
                 .leftJoinAndSelect('oi.inventory', 'inventory')
@@ -151,25 +174,26 @@ exports.worksheetResolver = {
             if (sortingSetting === null || sortingSetting === void 0 ? void 0 : sortingSetting.value) {
                 let settingValue = JSON.parse(sortingSetting.value);
                 for (const key in settingValue) {
-                    qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC');
+                    qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC');
                 }
             }
+            qbOrderInventories.addOrderBy(`product.name`, 'ASC');
             let orderInventories = await qbOrderInventories.getMany();
             worksheet.orderInventories = orderInventories;
             if (worksheet.releaseGood.type == 'b2c') {
-                worksheet.marketplaceOrder = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).findOne({
+                worksheet.marketplaceOrder = await (0, shell_1.getRepository)(marketplace_base_1.MarketplaceOrder).findOne({
                     where: { orderNo: worksheet.releaseGood.refNo },
                     relations: ['marketplaceOrderItems', 'marketplaceStore']
                 });
                 if (worksheet.marketplaceOrder) {
                     let marketplaceOrderShipping;
                     if (worksheet.marketplaceOrder.isSplitted) {
-                        marketplaceOrderShipping = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).findOne({
+                        marketplaceOrderShipping = await (0, shell_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).findOne({
                             where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
                         });
                     }
                     else {
-                        marketplaceOrderShipping = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).findOne({
+                        marketplaceOrderShipping = await (0, shell_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).findOne({
                             where: { orderNoRef: worksheet.releaseGood.refNo }
                         });
                     }
@@ -181,50 +205,56 @@ exports.worksheetResolver = {
                         : marketplaceOrderShipping.transporter;
                 }
             }
-            worksheet.orderVass = await (0, typeorm_1.getRepository)(sales_base_1.OrderVas).find({
+            worksheet.orderVass = await (0, shell_1.getRepository)(sales_base_1.OrderVas).find({
                 where: {
-                    domain,
-                    bizplace: worksheet.bizplace,
-                    releaseGood: worksheet.releaseGood
+                    domain: { id: domain.id },
+                    bizplace: { id: worksheet.bizplace.id },
+                    releaseGood: { id: worksheet.releaseGood.id }
                 },
                 relations: ['targetProduct']
             });
         }
+        if (worksheet.orderInventories) {
+            worksheet.worksheetDetails.sort(function (a, b) {
+                return (worksheet.orderInventories.map(oi => oi.id).indexOf(a.targetInventory.id) -
+                    worksheet.orderInventories.map(oi => oi.id).indexOf(b.targetInventory.id));
+            });
+        }
         if ((_c = worksheet === null || worksheet === void 0 ? void 0 : worksheet.returnOrder) === null || _c === void 0 ? void 0 : _c.id) {
-            worksheet.orderInventories = await (0, typeorm_1.getRepository)(sales_base_1.OrderInventory).find({
+            worksheet.orderInventories = await (0, shell_1.getRepository)(sales_base_1.OrderInventory).find({
                 where: {
-                    domain,
-                    bizplace: worksheet.bizplace,
-                    returnOrder: worksheet.returnOrder,
+                    dodomain: { id: domain.id },
+                    bizplace: { id: worksheet.bizplace.id },
+                    returnOrder: { id: worksheet.returnOrder.id },
                     status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(sales_base_1.ORDER_INVENTORY_STATUS.CANCELLED))
                 },
                 relations: ['product', 'inventory', 'inventory.location']
             });
-            worksheet.orderVass = await (0, typeorm_1.getRepository)(sales_base_1.OrderVas).find({
+            worksheet.orderVass = await (0, shell_1.getRepository)(sales_base_1.OrderVas).find({
                 where: {
-                    domain,
-                    bizplace: worksheet.bizplace,
-                    returnOrder: worksheet.returnOrder
+                    domain: { id: domain.id },
+                    bizplace: { id: worksheet.bizplace.id },
+                    returnOrder: { id: worksheet.returnOrder.id }
                 },
                 relations: ['targetProduct']
             });
         }
         if ((_d = worksheet === null || worksheet === void 0 ? void 0 : worksheet.inventoryCheck) === null || _d === void 0 ? void 0 : _d.id) {
-            worksheet.orderInventories = await (0, typeorm_1.getRepository)(sales_base_1.OrderInventory).find({
+            worksheet.orderInventories = await (0, shell_1.getRepository)(sales_base_1.OrderInventory).find({
                 where: {
-                    domain,
-                    bizplace: worksheet.bizplace,
-                    inventoryCheck: worksheet.inventoryCheck
+                    domain: { id: domain.id },
+                    bizplace: { id: worksheet.bizplace.id },
+                    inventoryCheck: { id: worksheet.inventoryCheck.id }
                 },
                 relations: ['product', 'inventory', 'inventory.location']
             });
         }
         if ((_e = worksheet === null || worksheet === void 0 ? void 0 : worksheet.vasOrder) === null || _e === void 0 ? void 0 : _e.id) {
-            worksheet.orderVass = await (0, typeorm_1.getRepository)(sales_base_1.OrderVas).find({
+            worksheet.orderVass = await (0, shell_1.getRepository)(sales_base_1.OrderVas).find({
                 where: {
-                    domain,
-                    bizplace: worksheet.bizplace,
-                    vasOrder: worksheet.vasOrder
+                    domain: { id: domain.id },
+                    bizplace: { id: worksheet.bizplace.id },
+                    vasOrder: { id: worksheet.vasOrder.id }
                 },
                 relations: ['targetProduct']
             });