@things-factory/worksheet-base 4.3.767 → 4.3.770

package/dist-server/routes.js

@@ -8,6 +8,7 @@ const render_manifest_1 = require("./controllers/render-manifest");
 const render_manual_do_1 = require("./controllers/render-manual-do");
 const render_orientage_do_1 = require("./controllers/render-orientage-do");
 const render_orientage_grn_1 = require("./controllers/render-orientage-grn");
+const render_packing_label_1 = require("./controllers/render-packing-label");
 const render_ro_do_1 = require("./controllers/render-ro-do");
 const render_seebuu_grn_1 = require("./controllers/render-seebuu-grn");
 const render_fm_grn_1 = require("./controllers/render-fm-grn");
@@ -61,5 +62,15 @@ process.on('bootstrap-module-domain-private-route', (app, routes) => {
         context.type = 'application/json';
         context.body = data;
     });
+    routes.post('/render_packing_label', async (context, next) => {
+        try {
+            const data = context.request.body || {};
+            context.body = await (0, render_packing_label_1.renderPackingLabel)({ data }, context);
+        }
+        catch (error) {
+            context.status = 400;
+            context.body = error.message || 'Failed to render packing label';
+        }
+    });
 });
 //# sourceMappingURL=routes.js.map

package/dist-server/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.767",
+  "version": "4.3.770",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,25 +26,25 @@
     "@things-factory/auth-base": "^4.3.767",
     "@things-factory/biz-base": "^4.3.767",
     "@things-factory/document-template-base": "^4.3.767",
-    "@things-factory/id-rule-base": "^4.3.767",
-    "@things-factory/integration-accounting": "^4.3.767",
-    "@things-factory/integration-base": "^4.3.767",
-    "@things-factory/integration-lmd": "^4.3.767",
-    "@things-factory/integration-marketplace": "^4.3.767",
-    "@things-factory/integration-powrup": "^4.3.767",
-    "@things-factory/integration-sellercraft": "^4.3.767",
-    "@things-factory/integration-sftp": "^4.3.767",
-    "@things-factory/marketplace-base": "^4.3.767",
+    "@things-factory/id-rule-base": "^4.3.770",
+    "@things-factory/integration-accounting": "^4.3.770",
+    "@things-factory/integration-base": "^4.3.770",
+    "@things-factory/integration-lmd": "^4.3.770",
+    "@things-factory/integration-marketplace": "^4.3.770",
+    "@things-factory/integration-powrup": "^4.3.770",
+    "@things-factory/integration-sellercraft": "^4.3.770",
+    "@things-factory/integration-sftp": "^4.3.770",
+    "@things-factory/marketplace-base": "^4.3.770",
     "@things-factory/notification": "^4.3.767",
-    "@things-factory/sales-base": "^4.3.767",
+    "@things-factory/sales-base": "^4.3.770",
     "@things-factory/setting-base": "^4.3.767",
     "@things-factory/shell": "^4.3.767",
     "@things-factory/transport-base": "^4.3.767",
-    "@things-factory/warehouse-base": "^4.3.767",
+    "@things-factory/warehouse-base": "^4.3.770",
     "@things-factory/worksheet-ui": "^4.3.767",
     "jspdf": "2.5.1",
     "puppeteer": "21.0.3",
     "uuid": "^9.0.0"
   },
-  "gitHead": "065b02059d800f6a759a98c240fed8608b48a52c"
+  "gitHead": "0a56fbc916f4e50317ee050b680b84b9b870c4fb"
 }

package/server/constants/template.ts

@@ -9,5 +9,6 @@ export const TEMPLATE_TYPE = {
   PO_TEMPLATE: 'PO_TEMPLATE',
   COP: 'COP',
   SIGNATURE: 'SIGNATURE',
-  LOGO: 'LOGO'
+  LOGO: 'LOGO',
+  PACKING_LABEL_TEMPLATE: 'PACKING_LABEL_TEMPLATE'
 }

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

@@ -164,6 +164,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       expirationDate: inventory?.expirationDate ? new Date(inventory.expirationDate) : undefined,
       status: INVENTORY_STATUS.UNLOADED,
       qty: qty,
+      conditionOfGoods: inventory?.conditionOfGoods,
       manufactureDate: inventory?.manufactureDate ? new Date(inventory.manufactureDate) : undefined,
     }
 
@@ -357,6 +358,12 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       })
     }
 
+    if (inventory?.conditionOfGoods) {
+      invQb.andWhere('INV.condition_of_goods = :conditionOfGoods', {
+        conditionOfGoods: inventory.conditionOfGoods
+      })
+    }
+
     if (inventory?.cartonId) invQb.andWhere('INV.carton_id = :cartonId', { cartonId: inventory.cartonId })
     else invQb.andWhere('INV.pallet_id = :palletId', { palletId: inventory.palletId })
 
@@ -375,6 +382,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           targetProduct.packQty
         : 0
       : null
+    const conditionOfGoods: string = inventory?.conditionOfGoods
 
     if (!foundInventory) {
       let newInventory: Partial<Inventory> = new Inventory()
@@ -413,6 +421,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       newInventory.location = location
       newInventory.zone = zone
       newInventory.status = INVENTORY_STATUS.CHECKED
+      newInventory.conditionOfGoods = conditionOfGoods
       newInventory.creator = this.user
 
       if (inventory?.expirationDate) {
@@ -451,6 +460,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
               : targetInventory.returnUomValue / targetInventory.returnQty) *
             1000
         ) / 1000
+      foundInventory.conditionOfGoods = conditionOfGoods ?? foundInventory.conditionOfGoods // DEFAULT BACK TO PREVIOUS INVENTORY'S CONDITION OF GOODS
 
       //refer to scanUnload
       foundInventory = await this.transactionInventory(
@@ -593,6 +603,12 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       })
     }
 
+    if (inventory?.conditionOfGoods) {
+      invQb.andWhere('INV.condition_of_goods = :conditionOfGoods', {
+        conditionOfGoods: inventory.conditionOfGoods
+      })
+    }
+
     if (inventory?.cartonId) invQb.andWhere('INV.carton_id = :cartonId', { cartonId: inventory.cartonId })
     else invQb.andWhere('INV.pallet_id = :palletId', { palletId: inventory.palletId })
 
@@ -611,6 +627,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           targetProduct.packQty
         : 0
       : null
+    const conditionOfGoods: string = inventory?.conditionOfGoods
 
     if (!foundInventory) {
       let newInventory: Partial<Inventory> = new Inventory()
@@ -649,6 +666,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       newInventory.location = location
       newInventory.zone = zone
       newInventory.status = INVENTORY_STATUS.CHECKED
+      newInventory.conditionOfGoods = conditionOfGoods
       newInventory.creator = this.user
 
       if (inventory?.expirationDate) {
@@ -679,6 +697,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
             1000
         ) / 1000
       foundInventory.productDetail = productDetail
+      foundInventory.conditionOfGoods = conditionOfGoods ?? foundInventory.conditionOfGoods // DEFAULT BACK TO PREVIOUS INVENTORY'S CONDITION OF GOODS
+
       if (arrivalNotice) targetProduct.actualPackQty = targetProduct.actualPackQty + qty
       else if (returnOrder) targetInventory.actualPackQty = targetInventory.actualPackQty + qty
 

package/server/controllers/index.ts

@@ -1,6 +1,7 @@
 export * from './render-ro-do'
 export * from './render-grn'
 export * from './render-manual-do'
+export * from './render-packing-label'
 export * from './render-elccl-grn'
 export * from './render-job-sheet'
 export * from './render-kimeda-grn'

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

@@ -1,13 +1,17 @@
 import { Equal, In, Not, IsNull } from 'typeorm'
+import { v4 as uuidv4 } from 'uuid'
 
 import { Bizplace } from '@things-factory/biz-base'
 import {
   DeliveryOrder,
+  LoadingPackages,
+  LoadingPackageItems,
   ORDER_INVENTORY_STATUS,
   ORDER_STATUS,
   ORDER_TYPES,
   OrderInventory,
   OrderNoGenerator,
+  OrderProduct,
   OrderTote,
   OrderToteItem,
   OrderVas,
@@ -443,4 +447,67 @@ export class LoadingWorksheetController extends VasWorksheetController {
 
     return completeWorksheet
   }
+
+  async createGroupLoadingPackages(
+    releaseGood: ReleaseGood,
+    groupedItems: Array<{ orderProductId: string; groupQty: number }>
+  ): Promise<LoadingPackages> {
+    // Create LoadingPackages
+    const loadingPackageName = OrderNoGenerator.loadingPackage()
+    const loadingPackage: LoadingPackages = await this.trxMgr.getRepository(LoadingPackages).save({
+      name: loadingPackageName,
+      domain: this.domain,
+      bizplace: releaseGood.bizplace,
+      releaseGood: releaseGood,
+      status: ORDER_STATUS.DONE,
+      creator: this.user,
+      updater: this.user
+    })
+
+    // Create LoadingPackageItems for each grouped item
+    const loadingPackageItems: LoadingPackageItems[] = []
+
+    for (const groupedItem of groupedItems) {
+      // Validate groupQty
+      if (groupedItem.groupQty == null || isNaN(groupedItem.groupQty)) {
+        throw new Error('Invalid group quantity')
+      }
+      if (groupedItem.groupQty <= 0) {
+        throw new Error('Group quantity must be greater than zero')
+      }
+
+      // Fetch the OrderProduct directly
+      const orderProduct: OrderProduct | null = await this.trxMgr.getRepository(OrderProduct).findOne({
+        where: { id: groupedItem.orderProductId, domain: this.domain, releaseGood: releaseGood },
+        relations: ['productDetail']
+      })
+
+      if (!orderProduct) {
+        throw new Error(`Order product not found: ${groupedItem.orderProductId}`)
+      }
+
+      const loadingPackageItemName = OrderNoGenerator.loadingPackageItem()
+      loadingPackageItems.push({
+        name: loadingPackageItemName,
+        domain: this.domain,
+        bizplace: releaseGood.bizplace,
+        loadingPackage: loadingPackage,
+        orderProduct,
+        packedQty: groupedItem.groupQty,
+        productDetail: orderProduct.productDetail ?? null,
+        status: ORDER_STATUS.DONE,
+        creator: this.user,
+        updater: this.user
+      } as LoadingPackageItems)
+    }
+
+    // Save all loading package items
+    await this.trxMgr.getRepository(LoadingPackageItems).save(loadingPackageItems)
+
+    // Reload with relations
+    return await this.trxMgr.getRepository(LoadingPackages).findOne({
+      where: { id: loadingPackage.id },
+      relations: ['loadingPackageItems', 'loadingPackageItems.orderProduct']
+    })
+  }
 }

package/server/controllers/render-packing-label.ts

@@ -0,0 +1,199 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { getRepository, In, IsNull } from 'typeorm'
+
+import { Attachment, STORAGE } from '@things-factory/attachment-base'
+import { User } from '@things-factory/auth-base'
+import { config } from '@things-factory/env'
+import { Domain } from '@things-factory/shell'
+import { LoadingPackages } from '@things-factory/sales-base'
+
+import { TEMPLATE_TYPE } from '../constants'
+
+const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
+
+interface RenderPackingLabelInput {
+  releaseGoodNos?: string[]
+  loadingPackageIds?: string[]
+  printQuantity: number
+}
+
+export async function renderPackingLabel({ data }: { data: RenderPackingLabelInput }, context: any) {
+  const { domain }: { domain: Domain } = context.state
+  const { releaseGoodNos, loadingPackageIds, printQuantity = 1 } = data
+
+  if (!releaseGoodNos?.length && !loadingPackageIds?.length) {
+    throw new Error('No valid RO/loading package found')
+  }
+
+  const foundTemplate: Attachment = await getRepository(Attachment).findOne({
+    where: { domain, category: TEMPLATE_TYPE.PACKING_LABEL_TEMPLATE }
+  })
+
+  if (!foundTemplate) {
+    throw new Error('Packing label settings error. Please contact Support.')
+  }
+
+  const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
+
+  const foundLogo: Attachment = await getRepository(Attachment).findOne({
+    where: { domain, category: TEMPLATE_TYPE.LOGO }
+  })
+
+  let logo = null
+  if (foundLogo?.path) {
+    logo = 'data:' + foundLogo.mimetype + ';base64,' + (await STORAGE.readFile(foundLogo.path, 'base64'))
+  }
+
+  let loadingPackages: LoadingPackages[]
+
+  if (loadingPackageIds?.length) {
+    // Fetch by loading package IDs directly (for history popup reprinting)
+    loadingPackages = await getRepository(LoadingPackages).find({
+      where: {
+        domain,
+        id: In(loadingPackageIds),
+        deletedAt: IsNull()
+      },
+      relations: [
+        'releaseGood',
+        'releaseGood.bizplace',
+        'loadingPackageItems',
+        'loadingPackageItems.orderProduct',
+        'loadingPackageItems.orderProduct.product'
+      ],
+      order: {
+        releaseGood: { createdAt: 'ASC' }
+      }
+    })
+
+    if (loadingPackages.length !== loadingPackageIds.length) {
+      throw new Error(`Loading package(s) not found, please refresh the list and try again`)
+    }
+
+    // Validate order status for the found packages
+    const releaseGoodIds = [...new Set(loadingPackages.map(lp => lp.releaseGood?.id).filter(Boolean))] as string[]
+    if (releaseGoodIds.length > 0) {
+      await validateReleaseGoodStatus(domain.id, releaseGoodIds, 'id')
+    }
+  } else {
+    // Fetch by release good numbers (original flow for preview print)
+    await validateReleaseGoodStatus(domain.id, releaseGoodNos!, 'name')
+
+    loadingPackages = await getRepository(LoadingPackages).find({
+      where: {
+        domain,
+        releaseGood: { name: In(releaseGoodNos!) },
+        deletedAt: IsNull()
+      },
+      relations: [
+        'releaseGood',
+        'releaseGood.bizplace',
+        'loadingPackageItems',
+        'loadingPackageItems.orderProduct',
+        'loadingPackageItems.orderProduct.product'
+      ],
+      order: {
+        releaseGood: { createdAt: 'ASC' }
+      }
+    })
+  }
+
+  if (!loadingPackages.length) {
+    throw new Error('Unable to print due to no packages found for the selected orders')
+  }
+
+  const renderedPages: string[] = []
+
+  for (const loadingPackage of loadingPackages) {
+    const releaseGood = loadingPackage.releaseGood
+    const packageItems = loadingPackage.loadingPackageItems || []
+
+    const product_list = packageItems.map(item => ({
+      product_sku: item.orderProduct?.product?.sku || '',
+      product_name: item.orderProduct?.product?.name || item.orderProduct?.name || '',
+      product_qty: item.packedQty || 0
+    }))
+
+    const pageData = {
+      logo_url: logo,
+      company_name: releaseGood?.bizplace?.name || '',
+      ref_no: releaseGood?.refNo || '',
+      packed_qty: (loadingPackage.name || '').toUpperCase(),
+      product_list
+    }
+
+    const formData = new FormData()
+    formData.append('template', template)
+    formData.append('jsonString', JSON.stringify(pageData))
+
+    const response = await fetch(REPORT_API_URL, {
+      method: 'POST',
+      body: formData
+    })
+
+    const pageHtml = await response.text()
+
+    for (let i = 0; i < printQuantity; i++) {
+      renderedPages.push(pageHtml)
+    }
+  }
+
+  // Update printedAt and printedBy for all loading packages
+  const user: User = context.state.user
+  await getRepository(LoadingPackages).update(
+    { id: In(loadingPackages.map(lp => lp.id)) },
+    {
+      printedAt: new Date(),
+      printedBy: user
+    }
+  )
+
+  const combinedHtml = `
+    <!DOCTYPE html>
+    <html>
+      <head>
+        <title>Packing Labels</title>
+        <style>
+          @media print {
+            .page-break { page-break-after: always; }
+            .page-break:last-child { page-break-after: auto; }
+          }
+        </style>
+      </head>
+      <body>
+        ${renderedPages.map((html, idx) => `<div class="page-break">${html}</div>`).join('')}
+      </body>
+    </html>
+  `
+
+  return combinedHtml
+}
+
+async function validateReleaseGoodStatus(
+  domainId: string,
+  values: string[],
+  searchBy: 'id' | 'name'
+): Promise<void> {
+  const whereClause = searchBy === 'id' ? 'rg.id = ANY($2)' : 'rg.name = ANY($2)'
+
+  const validationResult: any[] = await getRepository(LoadingPackages).query(
+    `
+    SELECT rg.name, rg.status as rg_status, ws.status as ws_status
+    FROM release_goods rg
+    LEFT JOIN worksheets ws ON ws.release_good_id = rg.id AND ws.type = 'LOADING'
+    WHERE rg.domain_id = $1 AND ${whereClause}
+    `,
+    [domainId, values]
+  )
+
+  const invalidOrders = validationResult.filter(
+    r =>
+      !['LOADING', 'PROCESSING', 'PARTIAL_PROCESSING'].includes(r.rg_status) ||
+      !['EXECUTING', 'PARTIAL_EXECUTING'].includes(r.ws_status)
+  )
+
+  if (invalidOrders.length > 0) {
+    throw new Error(`Unable to print: Invalid order status for ${invalidOrders.map(o => o.name).join(', ')}`)
+  }
+}

package/server/controllers/render-ro-do.ts

@@ -263,6 +263,7 @@ export async function renderRODO({ doNo }, context: any) {
             wsd.targetInventory.product.id === wsd.targetInventory.inventory.product.id
               ? `${inventory.product.name} (${inventory.product.description})`
               : `${wsd.targetInventory.product.name} (${wsd.targetInventory.product.description})`
+          const productSize = matchedProductDetail ? matchedProductDetail.packingSize : inventory.packingSize
 
           toteProductMap.get(toteName).push({
             tote_name: toteName,
@@ -270,6 +271,7 @@ export async function renderRODO({ doNo }, context: any) {
             product_name: productName,
             product_qty: toteItem.qty || targetInventory.releaseQty,
             product_type: inventory.packingType,
+            product_size: productSize,
             targetInventoryId: targetInventory.id,
             wsd: wsd,
             inventory: inventory,
@@ -293,6 +295,7 @@ export async function renderRODO({ doNo }, context: any) {
           wsd.targetInventory.product.id === wsd.targetInventory.inventory.product.id
             ? `${inventory.product.name} (${inventory.product.description})`
             : `${wsd.targetInventory.product.name} (${wsd.targetInventory.product.description})`
+        const productSize = matchedProductDetail ? matchedProductDetail.packingSize : inventory.packingSize
 
         toteProductMap.get(toteName).push({
           tote_name: '',
@@ -300,6 +303,7 @@ export async function renderRODO({ doNo }, context: any) {
           product_name: productName,
           product_qty: targetInventory.releaseQty,
           product_type: inventory.packingType,
+          product_size: productSize,
           targetInventoryId: targetInventory.id,
           wsd: wsd,
           inventory: inventory,
@@ -312,11 +316,11 @@ export async function renderRODO({ doNo }, context: any) {
 
     // Process each tote group
     toteProductMap.forEach((products, toteName) => {
-      // Group products within each tote by sku, name, type
+      // Group products within each tote by sku, type, size, batch
       const groupedProducts = new Map<string, any>()
 
       products.forEach(product => {
-        const key = `${product.product_sku}_${product.product_name}_${product.product_type}`
+        const key = `${product.product_sku}_${product.product_type}_${product.product_size}_${product.wsd.targetInventory.inventory.batchId}`
 
         if (!groupedProducts.has(key)) {
           groupedProducts.set(key, {
@@ -325,6 +329,7 @@ export async function renderRODO({ doNo }, context: any) {
             product_name: product.product_name,
             product_qty: 0,
             product_type: product.product_type,
+            product_size: product.product_size,
             no_of_tote: 0, // Count of items of this product in this tote
             wsd: product.wsd,
             inventory: product.inventory,
@@ -367,8 +372,8 @@ export async function renderRODO({ doNo }, context: any) {
           product_batch: inventory.batchId,
           product_volume: matchedProductDetail ? matchedProductDetail.volume : 0,
           product_batch_ref: inventory.batchIdRef,
-          product_weight: targetInventory.releaseWeight,
-          product_gross_weight: inventory.product.grossWeight,
+          product_weight: (matchedProductDetail?.nettWeight ?? inventory.product.weight ?? 0) * product.product_qty,
+          product_gross_weight: ((matchedProductDetail?.grossWeight && matchedProductDetail.grossWeight !== 0) ? matchedProductDetail.grossWeight : inventory.product.grossWeight) * product.product_qty,
           product_uom_value: targetInventory.releaseUomValue,
           product_uom: inventory.uom,
           product_brand_sku:
@@ -421,8 +426,8 @@ export async function renderRODO({ doNo }, context: any) {
           product_volume: matchedProductDetail ? matchedProductDetail.volume : 0,
           product_batch_ref: inventory.batchIdRef,
           product_qty: targetInventory.releaseQty,
-          product_weight: targetInventory.releaseWeight,
-          product_gross_weight: inventory.product.grossWeight,
+          product_weight: (matchedProductDetail?.nettWeight ?? inventory.product.weight ?? 0) * targetInventory.releaseQty,
+          product_gross_weight: ((matchedProductDetail?.grossWeight && matchedProductDetail.grossWeight !== 0) ? matchedProductDetail.grossWeight : inventory.product.grossWeight) * targetInventory.releaseQty,
           product_uom_value: targetInventory.releaseUomValue,
           product_uom: inventory.uom,
           product_brand_sku:
@@ -444,12 +449,9 @@ export async function renderRODO({ doNo }, context: any) {
         var foundItem = newItem.find(
           newItem =>
             newItem.product_sku === item.product_sku &&
-            newItem.product_name === item.product_name &&
             newItem.product_type === item.product_type &&
-            newItem.product_batch === item.product_batch &&
-            newItem.product_batch_ref === item.product_batch_ref &&
-            newItem.cross_docking === item.cross_docking &&
-            newItem.pallet === item.pallet
+            newItem.product_size === item.product_size &&
+            newItem.product_batch === item.product_batch
         )
         if (!foundItem) {
           foundItem = {
@@ -483,11 +485,9 @@ export async function renderRODO({ doNo }, context: any) {
           return newItem.map(ni => {
             if (
               ni.product_sku === item.product_sku &&
-              ni.product_name === item.product_name &&
-              ni.product_batch === item.product_batch &&
-              ni.product_batch_ref === item.product_batch_ref &&
-              ni.cross_docking === item.cross_docking &&
-              ni.pallet === item.pallet
+              ni.product_type === item.product_type &&
+              ni.product_size === item.product_size &&
+              ni.product_batch === item.product_batch
             ) {
               return {
                 ...ni,

package/server/graphql/resolvers/worksheet/loading/create-group-loading-packages.ts

@@ -0,0 +1,32 @@
+import { EntityManager } from 'typeorm'
+import { User } from '@things-factory/auth-base'
+import { ReleaseGood } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+import { LoadingWorksheetController } from '../../../../controllers'
+import { WorksheetController } from '../../../../controllers'
+
+export const createGroupLoadingPackagesResolver = {
+  async createGroupLoadingPackages(_: any, { releaseGoodNo, groupedItems }, context: any) {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+
+    return await createGroupLoadingPackages(tx, domain, user, releaseGoodNo, groupedItems)
+  }
+}
+
+export async function createGroupLoadingPackages(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  releaseGoodNo: string,
+  groupedItems: Array<{ orderProductId: string; groupQty: number }>
+): Promise<any> {
+  const worksheetController: WorksheetController = new WorksheetController(tx, domain, user)
+  const releaseGood: ReleaseGood = await worksheetController.findRefOrder(
+    ReleaseGood,
+    { domain, name: releaseGoodNo },
+    ['bizplace']
+  )
+
+  const loadingWorksheetController: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)
+  return await loadingWorksheetController.createGroupLoadingPackages(releaseGood, groupedItems)
+}

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

@@ -3,12 +3,14 @@ import { loadingResolver } from './loading'
 import { undoLoadingResolver } from './undo-loading'
 import { completeLoadingResolver } from './complete-loading'
 import { validateQcSealsResolver } from './validate-qc-seals'
+import { createGroupLoadingPackagesResolver } from './create-group-loading-packages'
 
 export const Mutations = {
   ...activateLoadingResolver,
   ...loadingResolver,
   ...undoLoadingResolver,
-  ...completeLoadingResolver
+  ...completeLoadingResolver,
+  ...createGroupLoadingPackagesResolver
 }
 
 export const Query = {

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

@@ -163,7 +163,8 @@ export async function pickingWorksheet(domain: Domain, orderNo: String, location
 
 async function replenishmentWorksheet(orderNo: String, tx, domain, locationSortingRules) {
   let replenishment: Replenishment = await tx.getRepository(Replenishment).findOne({
-    where: { domain, name: orderNo }
+    where: { domain, name: orderNo },
+    relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
   })
 
   if (replenishment) {
@@ -200,6 +201,9 @@ async function replenishmentWorksheet(orderNo: String, tx, domain, locationSorti
 
     return {
       worksheetInfo: {
+        bizplaceName: replenishment.bizplace?.name,
+        partnerDomainId: replenishment.bizplace?.domain?.id,
+        customerCompanyDomainId: replenishment.bizplace?.company?.domain?.id,
         startedAt: worksheet.startedAt,
         replenishment
       },

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

@@ -106,7 +106,8 @@ export const putawayReplenishmentWorksheetResolver = {
           packingType: inventory.packingType,
           packingSize: inventory.packingSize,
           location: inventory.location,
-          reusablePallet: inventory.reusablePallet
+          reusablePallet: inventory.reusablePallet,
+          conditionOfGoods: inventory.conditionOfGoods
         }
       })
     }

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

@@ -75,7 +75,8 @@ export const putawayReturningWorksheetResolver = {
           packingType: inventory.packingType,
           packingSize: inventory.packingSize,
           location: inventory.location,
-          reusablePallet: inventory.reusablePallet
+          reusablePallet: inventory.reusablePallet,
+          conditionOfGoods: inventory.conditionOfGoods
         }
       })
     }