@things-factory/worksheet-base 4.3.324 → 4.3.327

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

@@ -46,7 +46,7 @@ export const completePutawayReturnResolver = {
 
     if (application) {
       const powrupController: PowrupController = new PowrupController()
-      await powrupController.updateStock(returnOrder.orderInventories, customerDomain, user, tx)
+      powrupController.updateStock(returnOrder.orderInventories, customerDomain, user, tx)
     }
   }
 }

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

@@ -45,7 +45,7 @@ export const sortingWorksheetResolver = {
       .addSelect('OI.packing_type', 'packingType')
       .addSelect('OI.packing_size', 'packingSize')
       .addSelect('OI.product_detail_id', 'productDetailId')
-      .addSelect('OI.status','status')
+      .addSelect('OI.status', 'status')
       .addSelect('INV.expiration_date', 'expirationDate')
       .leftJoin('OI.product', 'PROD')
       .leftJoin('OI.inventory', 'INV')
@@ -86,7 +86,7 @@ export const sortingWorksheetResolver = {
             productName: item?.productName,
             productDescription: item?.productDescription,
             productBarcodes: await getRepository(ProductBarcode).find({
-              where: { productDetail: { id: item.productDetailId } }
+              where: { product: { id: item.productId } }
             }),
             isRequireSerialNumberScanningOutbound: item?.isRequireSerialNumberScanningOutbound,
             releaseQty: item.releaseQty,

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

@@ -10,7 +10,7 @@ import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
 import { WORKSHEET_STATUS } from '../../../../constants'
 import { PutawayWorksheetController, UnloadingWorksheetController } from '../../../../controllers'
 import { XilnexController } from '../../../../controllers/pos'
-import { Worksheet, WorksheetDetail } from '../../../../entities'
+import { Worksheet, WorksheetDetail } from '../../../../entities' 
 
 export const completeUnloadingResolver = {
   async completeUnloading(_: any, { arrivalNoticeNo, worksheetDetails }, context: any) {
@@ -36,7 +36,8 @@ export const completeUnloadingResolver = {
     let putawayWorksheet: Worksheet
 
     const inventories: Inventory[] = await tx.getRepository(Inventory).find({
-      where: { domain, refOrderId: arrivalNotice.id, status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED]) }
+      where: { domain, refOrderId: arrivalNotice.id, status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED]) },
+      relations: ['productDetail', 'product', 'creator']
     })
 
     const inventoryIds: string[] = inventories.map(iv => iv.id)

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

@@ -3,7 +3,6 @@ import { activateVasResolver } from './activate-vas'
 import { executeVasResolver } from './execute-vas'
 import { undoVasResolver } from './undo-vas'
 import { completeVasResolver } from './complete-vas'
-import { editVasResolver } from './edit-vas'
 import { undoVasInventoryResolver } from './undo-vas-inventory'
 
 export const Mutations = {
@@ -12,6 +11,5 @@ export const Mutations = {
   ...executeVasResolver,
   ...undoVasResolver,
   ...completeVasResolver,
-  ...editVasResolver,
   ...undoVasInventoryResolver
 }

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

@@ -506,12 +506,6 @@ export const Mutation = /* GraphQL */ `
     worksheetDetails: [WorksheetDetailPatch]
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
-  editVas (
-    orderVasPatch: [OrderVasPatch]
-    orderVasItemPatch: [OrderVasItemPatch]
-    orderNo: String
-  ): Boolean @transaction
-
   repalletizing (
     worksheetDetailName: String!
     fromPalletId: String!

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

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.editVas = exports.editVasResolver = void 0;
-const controllers_1 = require("../../../../controllers");
-exports.editVasResolver = {
-    async editVas(_, { orderVasPatch, orderVasItemPatch, orderNo }, context) {
-        const { tx, domain, user } = context.state;
-        return await editVas(tx, domain, user, orderVasPatch, orderVasItemPatch, orderNo);
-    }
-};
-async function editVas(tx, domain, user, orderVasPatch, orderVasItemPatch, orderNo) {
-    const worksheetController = new controllers_1.VasWorksheetController(tx, domain, user);
-    return await worksheetController.editVas(tx, domain, user, orderVasPatch, orderVasItemPatch, orderNo);
-}
-exports.editVas = editVas;
-//# sourceMappingURL=edit-vas.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"edit-vas.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/vas/edit-vas.ts"],"names":[],"mappings":";;;AAGA,yDAAgE;AAInD,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,iBAAiB,EAAE,OAAO,EAAE,EAAE,OAAY;QAC/E,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,OAAO,MAAM,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAA;IACnF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAA8B,EAC9B,iBAAsC,EACtC,OAAe;IAEf,MAAM,mBAAmB,GAA2B,IAAI,oCAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAChG,OAAO,MAAM,mBAAmB,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAA;AACvG,CAAC;AAVD,0BAUC"}

package/server/graphql/resolvers/worksheet/vas/edit-vas.ts

@@ -1,25 +0,0 @@
-import { User } from '@things-factory/auth-base'
-import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
-import { VasWorksheetController } from '../../../../controllers'
-import { WorksheetDetail } from '../../../../entities'
-import { OrderVasPatch, OrderVasItemPatch } from '@things-factory/sales-base'
-
-export const editVasResolver = {
-  async editVas(_: any, { orderVasPatch, orderVasItemPatch, orderNo }, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    return await editVas(tx, domain, user, orderVasPatch, orderVasItemPatch, orderNo)
-  }
-}
-
-export async function editVas(
-  tx: EntityManager,
-  domain: Domain,
-  user: User,
-  orderVasPatch: OrderVasPatch[],
-  orderVasItemPatch: OrderVasItemPatch[],
-  orderNo: string
-) {
-  const worksheetController: VasWorksheetController = new VasWorksheetController(tx, domain, user)
-  return await worksheetController.editVas(tx, domain, user, orderVasPatch, orderVasItemPatch, orderNo)
-}