@things-factory/worksheet-base 4.3.550 → 4.3.552

package/dist-server/graphql/types/worksheet/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,2EAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,uDAAkD;AAClD,uFAAgF;AAChF,iFAA0E;AAC1E,mDAA8C;AAC9C,iDAA4C;AAC5C,2EAAqE;AACrE,uDAAkD;AAClD,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,iEAA4D;AAC5D,+DAAyD;AACzD,2DAAsD;AACtD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAypBnC,CAAA;AAEU,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwKlC,CAAA;AAEY,QAAA,KAAK,GAAiB;IACjC,qBAAS;IACT,0CAAmB;IACnB,gCAAc;IACd,oCAAgB;IAChB,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,0BAAW;IACX,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;IACrB,8DAA4B;IAC5B,gCAAc;CACf,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,2EAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,uDAAkD;AAClD,uFAAgF;AAChF,iFAA0E;AAC1E,mDAA8C;AAC9C,iDAA4C;AAC5C,2EAAqE;AACrE,uDAAkD;AAClD,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,iEAA4D;AAC5D,+DAAyD;AACzD,2DAAsD;AACtD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0pBnC,CAAA;AAEU,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwKlC,CAAA;AAEY,QAAA,KAAK,GAAiB;IACjC,qBAAS;IACT,0CAAmB;IACnB,gCAAc;IACd,oCAAgB;IAChB,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,0BAAW;IACX,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;IACrB,8DAA4B;IAC5B,gCAAc;CACf,CAAA"}

package/dist-server/graphql/types/worksheet/worksheet-detail-info.js

@@ -77,6 +77,7 @@ exports.WorksheetDetailInfo = (0, apollo_server_koa_1.gql) `
     expirationPeriod: Int
     productDetail: ProductDetail
     originLocation: Location
+    customerCompanyDomainId: String
     grossWeight: Float
   }
 `;

package/dist-server/graphql/types/worksheet/worksheet-detail-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"worksheet-detail-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-detail-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,mBAAmB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6ErC,CAAA"}
+{"version":3,"file":"worksheet-detail-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-detail-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,mBAAmB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8ErC,CAAA"}

package/dist-server/graphql/types/worksheet-detail/worksheet-detail.js

@@ -28,6 +28,7 @@ exports.WorksheetDetail = (0, apollo_server_koa_1.gql) `
     updater: User
     createdAt: String
     updatedAt: String
+    customerCompanyDomainId: String
   }
 `;
 //# sourceMappingURL=worksheet-detail.js.map

package/dist-server/graphql/types/worksheet-detail/worksheet-detail.js.map

@@ -1 +1 @@
-{"version":3,"file":"worksheet-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/worksheet-detail.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,eAAe,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BjC,CAAA"}
+{"version":3,"file":"worksheet-detail.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/worksheet-detail.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,eAAe,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BjC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.550",
+  "version": "4.3.552",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -36,14 +36,14 @@
     "@things-factory/integration-sftp": "^4.3.550",
     "@things-factory/marketplace-base": "^4.3.544",
     "@things-factory/notification": "^4.3.535",
-    "@things-factory/sales-base": "^4.3.550",
+    "@things-factory/sales-base": "^4.3.552",
     "@things-factory/setting-base": "^4.3.535",
     "@things-factory/shell": "^4.3.535",
     "@things-factory/transport-base": "^4.3.535",
-    "@things-factory/warehouse-base": "^4.3.544",
+    "@things-factory/warehouse-base": "^4.3.551",
     "jspdf": "2.5.1",
     "puppeteer": "21.0.3",
     "uuid": "^9.0.0"
   },
-  "gitHead": "34019fe138cf7053de639857ba7a4e3fb08665b9"
+  "gitHead": "c952a94b1ed99834abad268e1401a133e2772375"
 }

package/server/controllers/ecommerce/sellercraft-controller.ts

@@ -83,7 +83,7 @@ export class SellercraftController extends WorksheetController {
                 const { sku, qty, product, releaseQty } = itm
                 const idx = orderProducts.findIndex(op => op.product.sku == sku || op.product.sku == product?.sku)
 
-                const matchedOrderProduct = idx !== -1 ? orderProducts[idx] : undefined
+                const matchedOrderProduct = idx !== -1 ? { ...orderProducts[idx] } : undefined
 
                 const matchedOrderPackageItem: OrderPackageItem = orderPackage?.orderPackageItems?.find(
                   itm => itm.orderProductId === matchedOrderProduct?.id
@@ -121,7 +121,11 @@ export class SellercraftController extends WorksheetController {
                 return {
                   ...commonProperties,
                   name: OrderNoGenerator.orderPackageItem(),
-                  releaseQty: qty || releaseQty
+                  releaseQty: releaseQty
+                    ? releaseQty
+                    : qty > matchedOrderProduct.releaseQty
+                    ? matchedOrderProduct.releaseQty
+                    : qty
                 }
               })
               .filter(item => item != null)

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

@@ -403,7 +403,7 @@ export class PickingWorksheetController extends VasWorksheetController {
                   packageId: null,
                   trackingNo: null,
                   transporter: null,
-                  airwayBill: releaseGood?.airwayBill,
+                  airwayBill: releaseGood?.airwayBill || null,
                   invoice: releaseGood?.invoice,
                   status: ORDER_STATUS.PROCESSING,
                   releaseGood,
@@ -668,7 +668,7 @@ export class PickingWorksheetController extends VasWorksheetController {
                         packageId: null,
                         trackingNo: null,
                         transporter: null,
-                        airwayBill: releaseGood?.airwayBill,
+                        airwayBill: releaseGood?.airwayBill || null,
                         invoice: releaseGood?.invoice,
                         status: ORDER_STATUS.PROCESSING,
                         releaseGood,
@@ -2818,7 +2818,7 @@ export class PickingWorksheetController extends VasWorksheetController {
                       packageId: null,
                       trackingNo: null,
                       transporter: null,
-                      airwayBill: releaseGood?.airwayBill,
+                      airwayBill: releaseGood?.airwayBill || null,
                       invoice: releaseGood?.invoice,
                       status: ORDER_STATUS.PROCESSING,
                       releaseGood,
@@ -2935,7 +2935,7 @@ export async function splitOrderConsignment(
         packageId: null,
         trackingNo: null,
         transporter: null,
-        airwayBill: releaseGood?.airwayBill,
+        airwayBill: releaseGood?.airwayBill || null,
         invoice: releaseGood?.invoice,
         status: ORDER_STATUS.PROCESSING,
         releaseGood,
@@ -3119,7 +3119,7 @@ export async function createConsignmentPackage(
       packageId: null,
       trackingNo: null,
       transporter: null,
-      airwayBill: releaseGood?.airwayBill,
+      airwayBill: releaseGood?.airwayBill || null,
       invoice: releaseGood?.invoice,
       status: ORDER_STATUS.PROCESSING,
       releaseGood,

package/server/controllers/replenishment/replenishment-worksheet-controller.ts

@@ -109,11 +109,11 @@ export class ReplenishmentWorksheetController extends WorksheetController {
   async replenishmentPicking(
     worksheetDetailName: string,
     worksheetType: string,
-    productBarcode: string,
     cartonId: string,
+    pickedQty: number,
+    productBarcode?: string,
     binLocation?: string,
-    serialNumber?: string,
-    pickedQty: number = 1
+    serialNumber?: string
   ): Promise<WorksheetDetail> {
     try {
       //find existing worksheet detail
@@ -150,25 +150,28 @@ export class ReplenishmentWorksheetController extends WorksheetController {
       if (targetInventory?.status != ORDER_INVENTORY_STATUS.PICKING)
         throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
 
-      if (!productBarcodes.find(itm => itm.gtin == productBarcode) && product?.isRequireSerialNumberScanningOutbound) {
-        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      // for enable product scanning
+      if (productBarcode) {
+        if (!productBarcodes.find(itm => itm.gtin == productBarcode) && product?.isRequireSerialNumberScanningOutbound) {
+          throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+        }
+  
+        matchingProduct = await this.getDirectQty(
+          {
+            ...productDetail,
+            product: targetInventory?.product
+          },
+          productBarcode,
+          pickedQty
+        )
+  
+        //validate matching product details based on scanned barcode
+        if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+          
+        pickedQty = matchingProduct.qty
+        pickedUomValue = matchingProduct.uomValue
       }
 
-      matchingProduct = await this.getDirectQty(
-        {
-          ...productDetail,
-          product: targetInventory?.product
-        },
-        productBarcode,
-        pickedQty
-      )
-
-      //validate matching product details based on scanned barcode
-      if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
-
-      pickedQty = matchingProduct.qty
-      pickedUomValue = matchingProduct.uomValue
-
       //validation to prevent over release
       if (
         !worksheetDetail?.targetInventory ||
@@ -393,7 +396,7 @@ export class ReplenishmentWorksheetController extends WorksheetController {
         domain: this.domain,
         name: replenishmentNo
       },
-      ['orderInventories', 'orderInventories.inventory']
+      ['orderInventories', 'orderInventories.inventory', 'orderInventories.bizplace']
     )
     let orderInventories: OrderInventory[] = replenishment.orderInventories
 
@@ -430,7 +433,8 @@ export class ReplenishmentWorksheetController extends WorksheetController {
     worksheetDetailName: [string],
     cartonId: string,
     locationName: string,
-    actualQty: number
+    actualQty: number,
+    productBarcode: string
   ): Promise<void> {
     const worksheetDetails: WorksheetDetail[] = await this.findExecutableWorksheetDetailByNames(
       worksheetDetailName,
@@ -453,7 +457,23 @@ export class ReplenishmentWorksheetController extends WorksheetController {
       let targetInventory: OrderInventory = worksheetDetail.targetInventory
       let inventory: Inventory = targetInventory.inventory
 
-      if (inventory.cartonId !== cartonId) {
+      if (productBarcode) {
+        let matchingProduct = await this.getDirectQty(
+          {
+            ...inventory.productDetail,
+            product: inventory?.product
+          },
+          productBarcode,
+          actualQty
+        )
+  
+        //validate matching product details based on scanned barcode
+        if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+  
+        actualQty = matchingProduct.qty
+      }
+
+      if (!productBarcode && inventory.cartonId !== cartonId) {
         throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('cartonId', cartonId, inventory.cartonId))
       }
 
@@ -467,11 +487,7 @@ export class ReplenishmentWorksheetController extends WorksheetController {
           name: locationName,
           type: In([
             LOCATION_TYPE.SHELF,
-            LOCATION_TYPE.BUFFER,
-            LOCATION_TYPE.FLOOR,
-            LOCATION_TYPE.BIN,
-            LOCATION_TYPE.QUARANTINE,
-            LOCATION_TYPE.RESERVE
+            LOCATION_TYPE.FLOOR
           ])
         },
         relations: ['warehouse']
@@ -537,6 +553,7 @@ export class ReplenishmentWorksheetController extends WorksheetController {
       newInventory.lockedUomValue = 0
       newInventory.transferUomValue = 0
       newInventory.refOrderId = replenishment.id
+      newInventory.refInventory = inventory
 
       await this.trxMgr.getRepository(Inventory).save(newInventory)
 
@@ -593,9 +610,10 @@ export class ReplenishmentWorksheetController extends WorksheetController {
       const targetInventory: OrderInventory = worksheetDetail.targetInventory
 
       let inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
-        where: { domain: this.domain, cartonId, refOrderId: replenishment.id }
+        where: { domain: this.domain, cartonId, refOrderId: replenishment.id, refInventory: {id: targetInventory.inventory.id} }
       })
 
+      let totalUndoPackQty = 0
       for (const inventory of inventories) {
         let inventoryItems: InventoryItem = await this.trxMgr
           .getRepository(InventoryItem)
@@ -610,6 +628,7 @@ export class ReplenishmentWorksheetController extends WorksheetController {
 
           await this.trxMgr.getRepository(InventoryItem).save(inventoryItems)
         }
+        totalUndoPackQty += inventory.qty
 
         await this.checkReleaseTarget(inventory)
 
@@ -633,7 +652,7 @@ export class ReplenishmentWorksheetController extends WorksheetController {
         .where('id = :id', { id: targetInventory.inventory.id })
         .execute()
 
-      targetInventory.actualPackQty = 0
+      targetInventory.actualPackQty = targetInventory.actualPackQty - totalUndoPackQty
       targetInventory.status = ORDER_PRODUCT_STATUS.PUTTING_AWAY
       targetInventory.updater = this.user
       await this.updateOrderTargets([targetInventory])

package/server/controllers/worksheet-controller.ts

@@ -263,7 +263,7 @@ export class WorksheetController {
           break
 
         case ReferenceOrderFields.Replenishment:
-          refOrder = await this.findRefOrder(Replenishment, refOrder)
+          refOrder = await this.findRefOrder(Replenishment, refOrder, ['bizplace'])
           break
       }
     }
@@ -412,10 +412,7 @@ export class WorksheetController {
     additionalProps: Partial<Worksheet> = {}
   ): Promise<Worksheet> {
     let refOrderType: string = await this.getRefOrderField(refOrder)
-    let bizplace: Bizplace
-    if (refOrderType !== 'replenishment') {
-      bizplace = await this.extractBizplaceFromRefOrder(refOrder)
-    }
+    let bizplace: Bizplace = await this.extractBizplaceFromRefOrder(refOrder)
 
     let existingWorksheet: Worksheet
     try {
@@ -487,13 +484,7 @@ export class WorksheetController {
     orderTargets: OrderTargetTypes[],
     additionalProps: Partial<WorksheetDetail> = {}
   ): Promise<WorksheetDetail[]> {
-    if (
-      !worksheet.bizplace?.id &&
-      type !== WORKSHEET_TYPE.PICKING_REPLENISHMENT &&
-      type !== WORKSHEET_TYPE.PUTAWAY_REPLENISHMENT
-    ) {
-      worksheet = await this.findWorksheetById(worksheet.id, ['bizplace'])
-    }
+    worksheet = await this.findWorksheetById(worksheet.id, ['bizplace'])
     const bizplace: Bizplace = worksheet.bizplace
 
     const worksheetDetails: Partial<WorksheetDetail>[] = orderTargets.map((orderTarget: OrderTargetTypes) => {

package/server/graphql/resolvers/worksheet/cancel-replenishment.ts

@@ -1,9 +1,23 @@
-import { In, Not, EntityManager } from 'typeorm'
+import {
+  EntityManager,
+  In,
+  Not
+} from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_STATUS,
+  OrderInventory,
+  Replenishment
+} from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, Replenishment } from '@things-factory/sales-base'
-import { User } from '@things-factory/auth-base'
-import { Worksheet, WorksheetDetail } from '../../../entities'
+
+import {
+  Worksheet,
+  WorksheetDetail
+} from '../../../entities'
 
 export const cancelReplenishment = {
   async cancelReplenishment(_: any, { name }, context: any) {
@@ -64,6 +78,6 @@ export const cancelReplenishment = {
       .getRepository(Replenishment)
       .update({ id: replenishment.id }, { status: ORDER_STATUS.CANCELLED, updater: this.user })
 
-    return worksheet
+    return true
   }
 }

package/server/graphql/resolvers/worksheet/picking/replenishment-picking.ts

@@ -1,9 +1,9 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
-import { ReplenishmentWorksheetController } from '../../../../controllers'
 
-import { pickingWorksheet } from '../picking-worksheet'
+import { ReplenishmentWorksheetController } from '../../../../controllers'
 
 export const replenishmentPickingResolver = {
   async replenishmentPicking(
@@ -17,11 +17,11 @@ export const replenishmentPickingResolver = {
     let ws = await worksheetController.replenishmentPicking(
       worksheetDetailName,
       worksheetType,
-      productBarcode,
       cartonId,
+      pickingQty,
+      productBarcode,
       binLocation,
-      serialNumber,
-      pickingQty
+      serialNumber
     )
   }
 }

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

@@ -1,20 +1,29 @@
-import { EntityManager, In, SelectQueryBuilder } from 'typeorm'
+import {
+  EntityManager,
+  In,
+  SelectQueryBuilder
+} from 'typeorm'
 
 import {
   ORDER_INVENTORY_STATUS,
   OrderInventory,
   ReleaseGood,
-  ShippingOrder,
-  Replenishment
+  Replenishment,
+  ShippingOrder
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, Location, InventoryChange } from '@things-factory/warehouse-base'
+import {
+  Inventory,
+  InventoryChange,
+  Location
+} from '@things-factory/warehouse-base'
 
-import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
+import {
+  WORKSHEET_STATUS,
+  WORKSHEET_TYPE
+} from '../../../constants'
 import { WorksheetDetail } from '../../../entities'
 import { fetchExecutingWorksheet } from '../../../utils'
-import { VasOrderWorksheet } from 'server/graphql/types/worksheet/vas-order-worksheet'
-import { ReplenishmentWorksheetController } from 'server/controllers'
 
 export const pickingWorksheetResolver = {
   async pickingWorksheet(_: any, { orderNo, locationSortingRules }, context: any) {
@@ -169,7 +178,7 @@ async function replenishmentWorksheet(orderNo: String, tx, domain, locationSorti
   if (replenishment) {
     const worksheet = await fetchExecutingWorksheet(
       domain,
-      null,
+      replenishment.bizplaceId,
       [],
       WORKSHEET_TYPE.PICKING_REPLENISHMENT,
       replenishment,

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

@@ -6,9 +6,9 @@ import { Domain } from '@things-factory/shell'
 import { ReplenishmentWorksheetController } from '../../../../controllers'
 
 export const replenishmentPutawayResolver = {
-  async replenishmentPutaway(_: any, { worksheetDetailName, cartonId, toLocation, actualQty }, context: any) {
+  async replenishmentPutaway(_: any, { worksheetDetailName, cartonId, toLocation, actualQty, productBarcode }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await replenishmentPutaway(tx, domain, user, worksheetDetailName, cartonId, toLocation, actualQty)
+    await replenishmentPutaway(tx, domain, user, worksheetDetailName, cartonId, toLocation, actualQty, productBarcode)
   }
 }
 
@@ -19,8 +19,9 @@ async function replenishmentPutaway(
   worksheetDetailName: [string],
   cartonId: string,
   locationName: string,
-  actualQty: number
+  actualQty: number,
+  productBarcode: string
 ) {
   const worksheetController: ReplenishmentWorksheetController = new ReplenishmentWorksheetController(tx, domain, user)
-  await worksheetController.replenishmentPutaway(worksheetDetailName, cartonId, locationName, actualQty)
+  await worksheetController.replenishmentPutaway(worksheetDetailName, cartonId, locationName, actualQty, productBarcode)
 }

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

@@ -37,7 +37,7 @@ export const putawayReplenishmentWorksheetResolver = {
         where: { domain, name: replenishmentNo }
       })
 
-      if (!binLocation) throw new Error(`Replenishment dosen't exist.`)
+      if (!binLocation) throw new Error(`Replenishment doesn't exist.`)
 
       const qb: SelectQueryBuilder<OrderInventory> = getRepository(OrderInventory).createQueryBuilder('orderInventory')
       qb.innerJoinAndSelect('orderInventory.replenishment', 'replenishment')
@@ -56,13 +56,14 @@ export const putawayReplenishmentWorksheetResolver = {
       }
     }
 
-    if (!replenishment) throw new Error(`Replenishment dosen't exist.`)
+    if (!replenishment) throw new Error(`Replenishment doesn't exist.`)
 
     const worksheet: Worksheet = await fetchExecutingWorksheet(
       domain,
-      null,
+      replenishment.bizplaceId,
       [
         'bizplace',
+        'bizplace.company',
         'replenishment',
         'worksheetDetails',
         'worksheetDetails.targetInventory',
@@ -77,17 +78,20 @@ export const putawayReplenishmentWorksheetResolver = {
 
     return {
       worksheetInfo: {
+        bizplaceName: worksheet.bizplace.name,
         status: worksheet.status,
         replenishment: {
           id: replenishment.id,
           name: replenishment.name
-        }
+        },
+        customerCompanyDomainId: worksheet.bizplace.company.domainId
       },
       worksheetDetailInfos: worksheet.worksheetDetails.map(async (putawayWSD: WorksheetDetail) => {
         const targetInventory: OrderInventory = putawayWSD.targetInventory
         const inventory: Inventory = targetInventory.inventory
         return {
           name: putawayWSD.name,
+          inventory: inventory,
           palletId: inventory.palletId,
           cartonId: inventory.cartonId,
           batchId: inventory.batchId,

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

@@ -305,6 +305,7 @@ export const Mutation = /* GraphQL */ `
     cartonId: String
     toLocation: String!
     actualQty: Int!
+    productBarcode: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   putawayReturn (
@@ -398,7 +399,7 @@ export const Mutation = /* GraphQL */ `
   replenishmentPicking (
     worksheetDetailName: String!
     worksheetType: String!
-    productBarcode: String!
+    productBarcode: String
     cartonId: String!
     binLocation: String
     serialNumber: String

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

@@ -75,6 +75,7 @@ export const WorksheetDetailInfo = gql`
     expirationPeriod: Int
     productDetail: ProductDetail
     originLocation: Location
+    customerCompanyDomainId: String
     grossWeight: Float
   }
 `

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

@@ -26,5 +26,6 @@ export const WorksheetDetail = gql`
     updater: User
     createdAt: String
     updatedAt: String
+    customerCompanyDomainId: String
   }
 `