@things-factory/worksheet-base 4.3.767 → 4.3.770

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'
+    }
+  })
 })