@things-factory/worksheet-base 4.3.769 → 4.3.771

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/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
         }
       })
     }

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

@@ -111,6 +111,7 @@ export async function findPutawayWorksheetByArrivalNoticeNo(arrivalNoticeNo, con
         product: product?.id ? product : null,
         location: location?.id ? location : null,
         reusablePallet: reusablePallet?.id ? reusablePallet : null,
+        conditionOfGoods: wd.inv_condition_of_goods,
         completed: wd.wd_status === WORKSHEET_STATUS.DONE,
         packingTypeSize: `${wd.inv_packing_type}(${wd.inv_packing_size})`,
         reusablePalletName: reusablePallet?.id ? reusablePallet.name : '',

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

@@ -64,7 +64,8 @@ export const returnWorksheetResolver = {
           targetName: targetInventory.name,
           packingType: inventory.packingType,
           packingSize: inventory.packingSize,
-          location: inventory.location
+          location: inventory.location,
+          conditionOfGoods: inventory.conditionOfGoods
         }
       })
     }

package/server/graphql/types/worksheet/group-loading-package-item.ts

@@ -0,0 +1,8 @@
+import { gql } from 'apollo-server-koa'
+
+export const GroupLoadingPackageItem = gql`
+  input GroupLoadingPackageItem {
+    orderProductId: String!
+    groupQty: Float!
+  }
+`

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

@@ -12,6 +12,7 @@ import { GoodsDeliveryNote } from './goods-delivery-note'
 import { InventoryCheckWorksheet } from './inventory-check-worksheet'
 import { LoadedWorksheetDetail } from './loaded-worksheet-detail'
 import { LocationFilter } from './location-filter'
+import { GroupLoadingPackageItem } from './group-loading-package-item'
 import { MultipleReleaseGoodWorksheet } from './multiple-release-good-worksheet'
 import { MyPickingAssignmentStatus } from './my-picking-assignment-status'
 import { NewWorksheet } from './new-worksheet'
@@ -342,6 +343,11 @@ export const Mutation = /* GraphQL */ `
     orderInfo: WorksheetPatch
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  createGroupLoadingPackages (
+    releaseGoodNo: String!
+    groupedItems: [GroupLoadingPackageItem!]!
+  ): LoadingPackages @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   undoLoading (
     deliveryOrder: ObjectRef!
     palletIds: [String]!
@@ -902,5 +908,6 @@ export const Types = /* GraphQL */ [
   GenerateBatchPickInfo,
   MultipleReleaseGoodWorksheet,
   LocationFilter,
-  ValidateQcSealsResult
+  ValidateQcSealsResult,
+  GroupLoadingPackageItem
 ]

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

@@ -81,5 +81,6 @@ export const WorksheetDetailInfo = gql`
     originLocation: Location
     customerCompanyDomainId: String
     grossWeight: Float
+    conditionOfGoods: String
   }
 `

package/server/routes.ts

@@ -6,6 +6,7 @@ import { renderManifest } from './controllers/render-manifest'
 import { renderManualDO } from './controllers/render-manual-do'
 import { renderOrientageDO } from './controllers/render-orientage-do'
 import { renderOrientageGRN } from './controllers/render-orientage-grn'
+import { renderPackingLabel } from './controllers/render-packing-label'
 import { renderRODO } from './controllers/render-ro-do'
 import { renderSeebuuGRN } from './controllers/render-seebuu-grn'
 import { renderFmGRN } from './controllers/render-fm-grn'
@@ -76,4 +77,14 @@ process.on('bootstrap-module-domain-private-route' as any, (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 renderPackingLabel({ data }, context)
+    } catch (error) {
+      context.status = 400
+      context.body = error.message || 'Failed to render packing label'
+    }
+  })
 })