@things-factory/operato-wms 4.3.769 → 4.3.771

package/server/graphql/resolvers/other/add-release-good-products.ts

@@ -54,7 +54,7 @@ export const addReleaseGoodProducts = {
           let existingOrderInv: OrderInventory
 
           if (curOrderInv?.inventory?.id) {
-            const foundInv: Inventory = await tx.getRepository(Inventory).findOne(curOrderInv.inventory.id)
+            let foundInv: Inventory = await tx.getRepository(Inventory).findOne(curOrderInv.inventory.id)
             curOrderInv.inventory = foundInv
 
             existingOrderInv = await tx.getRepository(OrderInventory).findOne({
@@ -134,13 +134,35 @@ export const addReleaseGoodProducts = {
               await tx.getRepository(WorksheetDetail).save(existingWorksheetDetail)
               await tx.getRepository(OrderInventory).save(curOrderInv)
             } else {
-              foundInv.updater = user
-              foundInv.lockedQty =
-                foundInv.lockedQty - Number(existingOrderInv.releaseQty) + Number(curOrderInv.releaseQty)
-              foundInv.lockedUomValue =
-                foundInv.lockedUomValue - Number(existingOrderInv.releaseUomValue) + Number(curOrderInv.releaseUomValue)
+              const qtyDelta = Number(curOrderInv.releaseQty) - Number(existingOrderInv.releaseQty)
+              const uomDelta = Number(curOrderInv.releaseUomValue) - Number(existingOrderInv.releaseUomValue)
+
+              const updateResult = await tx
+                .getRepository(Inventory)
+                .createQueryBuilder()
+                .update(Inventory)
+                .set({
+                  lockedQty: () => `GREATEST(COALESCE("locked_qty", 0) + :qtyDelta::numeric, 0)`,
+                  lockedUomValue: () => `GREATEST(COALESCE("locked_uom_value", 0) + :uomDelta::numeric, 0)`,
+                  updater: user
+                })
+                .setParameter('qtyDelta', qtyDelta)
+                .setParameter('uomDelta', uomDelta)
+                .where(
+                  qtyDelta > 0
+                    ? 'id = :id AND qty >= COALESCE(locked_qty, 0) + :newQty'
+                    : 'id = :id',
+                  {
+                    id: foundInv.id,
+                    ...(qtyDelta > 0 ? { newQty: qtyDelta } : {})
+                  }
+                )
+                .execute()
 
-              await tx.getRepository(Inventory).save(foundInv)
+              if (updateResult.affected === 0) {
+                throw new Error(`Insufficient inventory for pallet ${foundInv.palletId}`)
+              }
+              foundInv = await tx.getRepository(Inventory).findOne(foundInv.id)
 
               if (existingOrderInv) {
                 // if found existing OrderInventory and worksheetDetail then qty, uomValue, and status are updated
@@ -224,7 +246,7 @@ export const addReleaseGoodProducts = {
           // check if it is release by inventory (has inventory value) or product
           if (newOrderInv.inventory?.id) {
             // if release by inventory, then quantity and uomValue values are updated
-            const foundInv: Inventory = await tx
+            let foundInv: Inventory = await tx
               .getRepository(Inventory)
               .findOne({ where: { id: newOrderInv.inventory.id }, relations: ['productDetail'] })
             newOrderInv.inventory = foundInv
@@ -246,9 +268,28 @@ export const addReleaseGoodProducts = {
               }
             })
 
-            foundInv.lockedQty = Number(foundInv.lockedQty) + newOrderInv.releaseQty
-            foundInv.lockedUomValue = Number(foundInv.lockedUomValue) + newOrderInv.releaseUomValue
-            foundInv.updater = user
+            const lockResult = await tx
+              .getRepository(Inventory)
+              .createQueryBuilder()
+              .update(Inventory)
+              .set({
+                lockedQty: () => `COALESCE("locked_qty", 0) + :releaseQty::numeric`,
+                lockedUomValue: () => `COALESCE("locked_uom_value", 0) + :releaseUomValue::numeric`,
+                updater: user
+              })
+              .setParameter('releaseQty', newOrderInv.releaseQty)
+              .setParameter('releaseUomValue', newOrderInv.releaseUomValue)
+              .where('id = :id AND qty >= COALESCE(locked_qty, 0) + :newQty', {
+                id: foundInv.id,
+                newQty: newOrderInv.releaseQty
+              })
+              .execute()
+
+            if (lockResult.affected === 0) {
+              throw new Error(`Insufficient inventory for pallet ${foundInv.palletId}`)
+            }
+            // Re-read foundInv for downstream use
+            foundInv = await tx.getRepository(Inventory).findOne(foundInv.id)
 
             let newOrderProduct: OrderProduct = Object.assign(new OrderProduct(), newOrderInv)
             newOrderProduct = {
@@ -263,8 +304,6 @@ export const addReleaseGoodProducts = {
             if (!existingOrderProduct) newOrderProduct = await tx.getRepository(OrderProduct).save(newOrderProduct)
 
             newOrderInv.orderProduct = existingOrderProduct ? existingOrderProduct : newOrderProduct
-
-            await tx.getRepository(Inventory).save(foundInv)
           } else {
             // check for existing released OrderInventory specifying product, batchId and packingType
             existingOrderInv = await tx.getRepository(OrderInventory).findOne({

package/server/graphql/resolvers/outbound/find-loadable-release-good-by-bin.ts

@@ -146,17 +146,25 @@ const transformToWorksheetFormat = (orderInventories: OrderInventory[], releaseG
         batchId: oi.batchId,
         packingType: oi.packingType,
         refWorksheetId: oi.refWorksheetId,
+        packedQty: oi.packedQty,
+        releaseQty: oi.releaseQty,
         product: oi.inventory?.product
           ? {
               id: oi.inventory.product.id,
               sku: oi.inventory.product.sku,
-              name: oi.inventory.product.name
+              name: oi.inventory.product.name,
+              isInventoryDecimal: oi.inventory.product.isInventoryDecimal
             }
           : null,
         productDetail: oi.inventory?.productDetail
           ? {
               id: oi.inventory.productDetail.id
             }
+          : null,
+        orderProduct: oi.orderProductId
+          ? {
+              id: oi.orderProductId
+            }
           : null
       }
     }))

package/server/graphql/resolvers/outbound/loading-worksheet-v2.ts

@@ -57,14 +57,20 @@ interface WorksheetDetailInfo {
     id?: string
     batchId?: string
     packingType?: string
+    packedQty?: number
+    releaseQty?: number
     product?: {
       id?: string
       sku?: string
       name?: string
+      isInventoryDecimal?: boolean
     }
     productDetail?: {
       id?: string
     }
+    orderProduct?: {
+      id?: string
+    }
   }
 }
 
@@ -243,13 +249,19 @@ async function mapdata(
       batchId: wsd.targetInventory?.batchId || '-',
       packingType: wsd.targetInventory?.packingType,
       refWorksheetId: wsd.targetInventory?.refWorksheetId,
+      packedQty: wsd.targetInventory?.packedQty || 0,
+      releaseQty: wsd.targetInventory?.releaseQty,
       product: {
         id: wsd.targetInventory?.product?.id,
         sku: wsd.targetInventory?.product?.sku,
-        name: wsd.targetInventory?.product?.name
+        name: wsd.targetInventory?.product?.name,
+        isInventoryDecimal: wsd.targetInventory?.product?.isInventoryDecimal
       },
       productDetail: {
         id: wsd.targetInventory?.productDetail?.id
+      },
+      orderProduct: {
+        id: wsd.targetInventory?.orderProductId
       }
     }
   }))

package/server/graphql/resolvers/reports/inbound-order-details-report.ts

@@ -83,7 +83,7 @@ export const inboundOrderDetailsReport = {
               p.id as "product_id", p.sku as "product_sku", p.name as "product_name", p.description as "product_description", p.type as "product_type",
               oi.packing_size as "pack_size", oi.packing_type as "pack_type", oi.actual_pack_qty, oi.actual_pack_uom_value, oi.uom, oi.batch_id, oi.batch_id_ref,
               oi.unloaded_at as "unloaded_at", oi.putaway_at as "putaway_at", oi.unloaded_by_id as "oi_unloaded_by_id", oi.putaway_by_id as "oi_putaway_by_id",
-              i.pallet_id, i.carton_id, i.expiration_date, i.manufacture_date, i.unit_cost,
+              i.pallet_id, i.carton_id, i.expiration_date, i.condition_of_goods, i.manufacture_date, i.unit_cost,
               pd.volume as "unit_volume", pd.nett_weight as "unit_nett_weight", pd.gross_weight as "unit_gross_weight", pd.weight_unit as "weight_unit"
 			        from (
 			          select * from arrival_notices 
@@ -208,6 +208,7 @@ export const inboundOrderDetailsReport = {
           batchId: itm.batch_id,
           batchIdRef: itm.batch_id_ref,
           expirationDate: itm.expiration_date,
+          conditionOfGoods: itm.condition_of_goods,
           manufactureDate: itm.manufacture_date,
           unloadedAt: itm.unloaded_at,
           unloadedBy: itm.unloaded_by,

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

@@ -257,10 +257,10 @@ export const zonePicking = {
 
             //update inventory with proper decimal handling
             let updateInvObj = {
-              qty: () => `"qty" - ${targetInventory.releaseQty}::numeric`,
-              lockedQty: () => `"locked_qty" - ${targetInventory.releaseQty}::numeric`,
-              uomValue: () => `"uom_value" - ${targetInventory.releaseUomValue}::numeric`,
-              lockedUomValue: () => `"locked_uom_value" - ${targetInventory.releaseUomValue}::numeric`,
+              qty: () => `"qty" - :deductQty::numeric`,
+              lockedQty: () => `GREATEST("locked_qty" - :deductQty::numeric, 0)`,
+              uomValue: () => `"uom_value" - :deductUomValue::numeric`,
+              lockedUomValue: () => `GREATEST("locked_uom_value" - :deductUomValue::numeric, 0)`,
               updater: user,
               updatedAt: new Date()
             }
@@ -270,6 +270,8 @@ export const zonePicking = {
               .createQueryBuilder()
               .update(Inventory)
               .set(updateInvObj)
+              .setParameter('deductQty', targetInventory.releaseQty)
+              .setParameter('deductUomValue', targetInventory.releaseUomValue)
               .where('id = :id', { id: targetInventory.inventory.id })
               .returning(['qty'])
               .execute()

package/server/graphql/types/reports/inbound-order-details-report.ts

@@ -45,6 +45,7 @@ export const InboundOrderDetailsReport = gql`
     batchId: String
     batchIdRef: String
     expirationDate: String
+    conditionOfGoods: String
     manufactureDate: String
     unloadedAt: String
     unloadedBy: String

package/things-factory.config.js

@@ -208,6 +208,10 @@ export default {
       tagname: 'bulk-print-packing-list',
       page: 'bulk_print_packing_list'
     },
+    {
+      tagname: 'preview-print-packing-list',
+      page: 'preview_print_packing_list'
+    },
     {
       tagname: 'create-loading-manifest',
       page: 'create_loading_manifest'
@@ -380,6 +384,10 @@ export default {
       tagname: 'unload-product',
       page: 'unloading'
     },
+    {
+      tagname: 'unload-product-landing-page',
+      page: 'unloading_landing'
+    },
     {
       tagname: 'putaway-product',
       page: 'putaway'

package/translations/en.json

@@ -59,6 +59,7 @@
   "button.get_tracking_no": "get tracking no",
   "button.go_to_loading": "Go to LOADING",
   "button.go_to_picked": "Go to PICKED",
+  "button.group_packing_label": "Group Packing Label",
   "button.ignore": "ignore",
   "button.import": "import",
   "button.init_logistics": "init logistics",
@@ -130,6 +131,7 @@
   "button.view_merged_list": "view merged list",
   "button.warehouse_return": "warehouse return",
   "button.wooden_pallet": "wooden pallet",
+  "button.condition": "condition",
   "claim_chit_list": "claim chit list",
   "claim_created": "new claim created",
   "claim_updated": "claim updated",
@@ -484,6 +486,7 @@
   "field.number_of_shelf": "number of shelf",
   "field.obsolete_qty": "obsolete qty",
   "field.obsolete": "obsolete",
+  "field.inventory_quality": "inventory quality",
   "field.onhand_inventory_quantity": "onhand inventory quantity",
   "field.opening_balance": "opening balance",
   "field.opening_qty": "opening qty",
@@ -526,6 +529,7 @@
   "field.packed_at": "packed at",
   "field.packed_by": "packed by",
   "field.packing_end": "packing end",
+  "field.packing_label_no": "Packing Label No.",
   "field.packing_rate": "packing rate",
   "field.packing_size": "packing size",
   "field.packing_start": "packing start",
@@ -560,6 +564,7 @@
   "field.print_no": "print no.",
   "field.print_qty": "print quantity",
   "field.printed_at": "printed at",
+  "field.printed_by": "printed by",
   "field.printed": "printed",
   "field.priority_delivery": "priority delivery",
   "field.priority": "priority",
@@ -822,6 +827,11 @@
   "field.your_name": "your name",
   "field.zone": "zone",
   "filed.role": "role",
+  "field.type_of_condition": "type of condition",
+  "label.COLLECTION": "COLLECTION",
+  "label.DELIVERY": "DELIVERY",
+  "label.Location_format": "location format",
+  "label.VAS": "value added service",
   "label.activated": "activated",
   "label.actual_qty": "actual qty",
   "label.add_extension": "add extension",
@@ -1101,6 +1111,7 @@
   "label.packing_type": "packing type",
   "label.packing_unit": "packing unit",
   "label.packing": "packing",
+  "label.packing_label": "Packing Label",
   "label.paid_amount": "paid amount",
   "label.pallet_id": "pallet id",
   "label.pallet_qty": "pallet qty",
@@ -1131,6 +1142,7 @@
   "label.previous_location": "previous location",
   "label.print_by_sku": "print by sku",
   "label.print_qty": "print qty",
+  "label.print_quantity": "Print Quantity",
   "label.printing_mode": "printing mode",
   "label.process_type": "process type",
   "label.product_barcode": "product barcode",
@@ -1250,9 +1262,11 @@
   "label.total_location_with_opening_balance": "total location with opening balance",
   "label.total_opening_balance": "total opening balance",
   "label.total_pack_qty": "total pack qty",
+  "label.total_packing_label": "Total Packing Label",
   "label.total_pallet_qty": "total pallet qty",
   "label.total_tracking_no": "total tracking no",
   "label.total_uom_value": "total uom value",
+  "label.total_sku": "Total SKU",
   "label.total": "total",
   "label.tracking_no": "tracking no.",
   "label.transfer_inventory": "transfer inventory",
@@ -1306,6 +1320,11 @@
   "label.worksheet_no": "worksheet no",
   "label.zip_postal_code": "ZIP/Postal code",
   "label.zone_name": "zone name",
+  "label.condition": "Condition",
+  "label.condition_of_goods_good": "Good",
+  "label.condition_of_goods_defect": "Defect",
+  "label.condition_of_goods_damaged": "Damaged",
+  "label.condition_of_goods_quarantine": "Quarantine",
   "release_order_created": "release order created",
   "release_order_updated": "release order updated",
   "release_orders_requests": "release orders requests",
@@ -1514,6 +1533,11 @@
   "text.extra_products_approved": "extra product approved",
   "text.extra_products_have_been_processed": "extra products have been processed",
   "text.extra_products_were_added": "extra products were added",
+  "text.failed_to_open_packing_label_history": "failed to open packing label history",
+  "text.failed_to_open_print_packing_label": "failed to open print packing label",
+  "text.failed_to_print": "failed to print",
+  "text.failed_to_render_template": "failed to render template",
+  "text.failed_to_create_group_loading_packages": "failed to create group loading packages",
   "text.field": "field",
   "text.fields": "fields",
   "text.from_date_cannot_be_empty": "from date cannot be empty",
@@ -1534,6 +1558,9 @@
   "text.goods_delivery_note_uploaded": "goods delivery note uploaded",
   "text.goods_received_note_has_been_received": "GRN has been marked received",
   "text.goods_received_note_has_been_sent_successfully": "GRN has been sent successfully",
+  "text.group_quantity_cannot_be_negative": "group quantity cannot be negative",
+  "text.group_quantity_cannot_be_zero": "group quantity cannot be zero",
+  "text.group_quantity_exceeds_total": "group quantity cannot exceed total quantity",
   "text.holder_field_is_empty": "holder field is empty",
   "text.inbound": "inbound",
   "text.incomplete_container_information": "incomplete container information",
@@ -1630,6 +1657,7 @@
   "text.month_is_empty": "month is empty",
   "text.new_batch_id_is_empty": "new batch no is empty",
   "text.new_sku_empty": "new SKU column is empty",
+  "text.new_packing_label_created": "new packing label created",
   "text.no_available_worksheet_selected": "no available worksheet selected",
   "text.no_changes_to_be_submitted": "no changes to be submitted",
   "text.no_company_selected": "no company selected",
@@ -1646,6 +1674,9 @@
   "text.no_products": "no products",
   "text.no_record_selected": "no record selected",
   "text.no_serial_number_selected": "no serial number selected",
+  "text.no_sku_selected": "no SKU selected",
+  "text.no_valid_orders_selected": "no valid orders selected",
+  "text.no_valid_packages_selected": "no valid packages selected",
   "text.not_a_reusable_pallet": "not a reusable pallet",
   "text.not_found_in_putaway_list": "not found in putaway list",
   "text.nothing_changed": "nothing changed",
@@ -1656,6 +1687,7 @@
   "text.online": "online",
   "text.only_one_file_is_allowed_for_both_AWB_upload": "Only one file is allowed for both AWB upload. Please ensure you select a single file",
   "text.only_one_file_is_allowed_for_both_invoice_upload": "Only one file is allowed for both Invoice upload. Please ensure you select a single file.",
+  "text.only_available_on_loading_tab": "only available on the LOADING tab",
   "text.only_supports_search_of_single_field": "only supports search of single field",
   "text.only_transfer_quantity_with_greater_than_zero": "only transfer quantity with greater than 0 will be created in the replenishment.",
   "text.optional": "optional",
@@ -1709,10 +1741,12 @@
   "text.please_select_a_truck": "select a truck",
   "text.please_select_an_existing_manifest_or_create_a_new_one": "please select an existing manifest or create a new one",
   "text.please_select_an_inventory": "please select an inventory",
+  "text.please_select_at_least_one_record": "please select at least one record",
   "text.please_select_at_least_one_order_with_status_deactivated_to_proceed": "please select at least one order with status deactivated to proceed",
   "text.please_select_container_size": "please select container size",
   "text.please_select_label_indicator": "please select label indicator",
   "text.please_select_maximum_50_worksheets_with_status_deactivated_to_proceed": "please select maximum 50 worksheets with status deactivated to proceed",
+  "text.please_select_one_or_more_order": "please select one or more orders",
   "text.please_select_one_or_more_order_to_generate_worksheet": "please select one or more order to generate worksheet",
   "text.please_select_order_with_status_deactivated_only": "please select order with status deactivated only",
   "text.please_select_product_to_replenish": "please select product to replenish",
@@ -1771,6 +1805,7 @@
   "text.related_release_order_will_be_rejected": "related release order will be rejected",
   "text.release_date_is_empty": "release date is empty",
   "text.release_date_is_required": "release date is required",
+  "text.release_good_number_not_found": "release good number not found",
   "text.release_order_confirmed": "release order confirmed",
   "text.release_order_created": "release order created",
   "text.release_order_details_updated": "release order details updated",
@@ -1833,6 +1868,7 @@
   "text.selected_qty_is_more_than_expected": "selected qty is more than expected",
   "text.selected_release_order(s)_is_not_in_pending_worksheet_status": "selected release order(s) is not in pending worksheet status",
   "text.selected_replenishment(s)_is_not_in_pending_worksheet_status": "selected replenishment(s) is not in pending worksheet status",
+  "text.selected_items_not_found": "selected items not found in data",
   "text.send_goods_received_note": "send GRN",
   "text.sequence_out_of_range": "sequence out of range: {ranges}",
   "text.serial_number_has_been_scanned": "serial number has been scanned",
@@ -1848,6 +1884,7 @@
   "text.sku_has_vas_releaseQty_less_than_qty_for_vas_changing_will_require_user_to_reenter_vas_information": "SKU has vas. release Qty is lesser than Qty for vas changing will require user to reenter vas information",
   "text.sku_is_required_kindly_fill_in_the_sku_to_continue": "SKU is required. Kindly fill in the sku to continue",
   "text.sku_is_required": "sku is required",
+  "text.sku_list_view_not_found": "SKU list view not found",
   "text.sorting_is_completed": "sorting is completed",
   "text.state_is_empty_please_fill_in_the_data_before_proceed_create_order": "state is empty. please fill in the data before proceed create order.",
   "text.status_field_is_empty": "status field is empty",
@@ -1930,6 +1967,7 @@
   "text.unable_to_save_print_history_x": "unable to save print history ({state.counter} label(s) printed). Kindly contact our support",
   "text.undo_inspection": "undo inspection",
   "text.undo_inventory": "undo inventory",
+  "text.undo_loading_package_success": "undo loading package successfully",
   "text.undo_picking_worksheet": "undo inventory selection",
   "text.undo_preunload": "undo preunload",
   "text.undo_putaway": "undo putaway",
@@ -1974,6 +2012,7 @@
   "text.wrong_lot_id": "wrong lot ID",
   "text.wrong_release_qty": "wrong release qty",
   "text.wrong_sorting_qty": "wrong sorting qty",
+  "text.error_occurred": "unexpected error occurred",
   "text.x_error": "{state.x} error",
   "text.x_exceed_limit": "{state.x} exceed limit",
   "text.x_is_empty": "{state.x} is empty",
@@ -1988,6 +2027,7 @@
   "text.your_work_has_completed": "your work has completed",
   "text.zip/postal_code_is_empty_please_fill_in_the_data_before_proceed_create_order": "ZIP/Postal code is empty. please fill in the data before proceed create order.",
   "text.zone_picking": "zone picking",
+  "text.no_products_found": "No Products Found",
   "title.add_inventory": "add inventory",
   "title.add_product": "add product",
   "title.add_rule_field": "add rule field",
@@ -2189,6 +2229,9 @@
   "title.outbound_worksheet": "outbound worksheet",
   "title.packing_list": "packing list",
   "title.packing_worksheet_list": "packing worksheet list",
+  "title.packing_label": "packing label",
+  "title.packing_label_history": "packing label history",
+  "title.print_packing_label": "print packing label",
   "title.packing": "packing",
   "title.pallet_replacement": "pallet replacement",
   "title.pallet": "pallet",
@@ -2374,5 +2417,6 @@
   "title.worksheet_unloading": "worksheet unloading",
   "title.worksheet_vas": "worksheet vas",
   "title.worksheet": "worksheet",
-  "title.zone_worksheet": "zone worksheet"
+  "title.zone_worksheet": "zone worksheet",
+  "title.condition_of_goods": "condition of goods"
 }