@things-factory/worksheet-base 6.0.47 → 6.0.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "6.0.47",
+  "version": "6.0.52",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,21 +23,21 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^6.0.43",
-    "@things-factory/biz-base": "^6.0.43",
-    "@things-factory/document-template-base": "^6.0.43",
-    "@things-factory/id-rule-base": "^6.0.43",
-    "@things-factory/integration-lmd": "^6.0.43",
-    "@things-factory/integration-marketplace": "^6.0.43",
-    "@things-factory/integration-sellercraft": "^6.0.43",
-    "@things-factory/integration-sftp": "^6.0.43",
-    "@things-factory/marketplace-base": "^6.0.43",
-    "@things-factory/notification": "^6.0.43",
-    "@things-factory/sales-base": "^6.0.45",
-    "@things-factory/setting-base": "^6.0.43",
-    "@things-factory/shell": "^6.0.43",
-    "@things-factory/transport-base": "^6.0.43",
-    "@things-factory/warehouse-base": "^6.0.43"
+    "@things-factory/auth-base": "^6.0.49",
+    "@things-factory/biz-base": "^6.0.49",
+    "@things-factory/document-template-base": "^6.0.49",
+    "@things-factory/id-rule-base": "^6.0.49",
+    "@things-factory/integration-lmd": "^6.0.49",
+    "@things-factory/integration-marketplace": "^6.0.49",
+    "@things-factory/integration-sellercraft": "^6.0.49",
+    "@things-factory/integration-sftp": "^6.0.49",
+    "@things-factory/marketplace-base": "^6.0.49",
+    "@things-factory/notification": "^6.0.49",
+    "@things-factory/sales-base": "^6.0.49",
+    "@things-factory/setting-base": "^6.0.49",
+    "@things-factory/shell": "^6.0.49",
+    "@things-factory/transport-base": "^6.0.49",
+    "@things-factory/warehouse-base": "^6.0.49"
   },
-  "gitHead": "ed200e9966ed1c5763ff9d5529dc68cfe1d7b578"
+  "gitHead": "be223b9a3f3a093cba2f97110e109597c9f9b21f"
 }

package/server/controllers/inbound/putaway-returning-worksheet-controller.ts

@@ -27,9 +27,11 @@ import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class PutawayReturningWorksheetController extends VasWorksheetController {
   async generatePutawayReturnWorksheet(returnOrderNo: string, inventories: Inventory[]): Promise<Worksheet> {
-    let returnOrder: ReturnOrder = await this.findRefOrder(ReturnOrder, { domain: this.domain, name: returnOrderNo }, [
-      'bizplace'
-    ])
+    let returnOrder: ReturnOrder = await this.findRefOrder(
+      ReturnOrder,
+      { domain: { id: this.domain.id }, name: returnOrderNo },
+      ['bizplace']
+    )
 
     const bizplace: Bizplace = returnOrder.bizplace
     const unloadingWorksheet: Worksheet = await this.findWorksheetByRefOrder(

package/server/controllers/inbound/unloading-returning-worksheet-controller.ts

@@ -105,7 +105,11 @@ export class UnloadingReturningWorksheetController extends VasWorksheetControlle
   ): Promise<void> {
     let returnOrder: ReturnOrder = await this.findRefOrder(
       ReturnOrder,
-      { domain: this.domain, name: returnOrderNo, status: In([ORDER_STATUS.PROCESSING, ORDER_STATUS.PUTTING_AWAY]) },
+      {
+        domain: { id: this.domain.id },
+        name: returnOrderNo,
+        status: In([ORDER_STATUS.PROCESSING, ORDER_STATUS.PUTTING_AWAY])
+      },
       ['orderInventories']
     )
 

package/server/controllers/inspect/cycle-count-worksheet-controller.ts

@@ -292,7 +292,7 @@ export class CycleCountWorksheetController extends WorksheetController {
 
   async undoInspection(worksheetDetailName: string): Promise<void> {
     let worksheetDetail: WorksheetDetail = await this.findWorksheetDetail(
-      { domain: this.domain, name: worksheetDetailName, status: Not(Equal(WORKSHEET_STATUS.EXECUTING)) },
+      { domain: { id: this.domain.id }, name: worksheetDetailName, status: Not(Equal(WORKSHEET_STATUS.EXECUTING)) },
       ['targetInventory', 'targetInventory.inventory']
     )
 

package/server/controllers/outbound/loading-worksheet-controller.ts

@@ -26,7 +26,7 @@ export class LoadingWorksheetController extends VasWorksheetController {
   ): Promise<Worksheet> {
     const releaseGood: ReleaseGood = await this.findRefOrder(
       ReleaseGood,
-      { domain: this.domain, name: releaseGoodNo },
+      { domain: { id: this.domain.id }, name: releaseGoodNo },
       ['bizplace']
     )
     return await this.generateWorksheet(
@@ -45,7 +45,7 @@ export class LoadingWorksheetController extends VasWorksheetController {
   ): Promise<Worksheet> {
     const releaseGood: ReleaseGood = await this.findRefOrder(
       ReleaseGood,
-      { domain: this.domain, name: releaseGoodNo },
+      { domain: { id: this.domain.id }, name: releaseGoodNo },
       ['bizplace']
     )
     return await this.updateWorksheet(
@@ -101,7 +101,7 @@ export class LoadingWorksheetController extends VasWorksheetController {
   ): Promise<any> {
     const releaseGood: ReleaseGood = await this.findRefOrder(
       ReleaseGood,
-      { domain: this.domain, name: releaseGoodNo },
+      { domain: { id: this.domain.id }, name: releaseGoodNo },
       ['bizplace']
     )
     const bizplace: Bizplace = releaseGood.bizplace

package/server/controllers/outbound/returning-worksheet-controller.ts

@@ -19,7 +19,7 @@ export class ReturningWorksheetController extends VasWorksheetController {
   ): Promise<Worksheet> {
     const releaseGood: ReleaseGood = await this.findRefOrder(
       ReleaseGood,
-      { domain: this.domain, name: releaseGoodNo },
+      { domain: { id: this.domain.id }, name: releaseGoodNo },
       ['bizplace']
     )
     return await this.generateWorksheet(

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

@@ -111,7 +111,7 @@ export const packingWorksheetResolver = {
         const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
 
         const directActivatePackingWorksheet: Setting = await tx.getRepository(Setting).findOne({
-          where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
+          where: { domain: { id: domain.id }, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
         })
 
         const partnerDirectActivatePackingWorksheetSetting: PartnerSetting = await tx
@@ -150,7 +150,7 @@ export const packingWorksheetResolver = {
       switch (orderSource) {
         case ApplicationType.SELLERCRAFT:
           const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOneBy({
-            domain: {id: worksheet.bizplace.domain.id},
+            domain: { id: worksheet.bizplace.domain.id },
             status: SellercraftStatus.ACTIVE
           })