@things-factory/operato-wms 4.3.761 → 4.3.764

package/server/graphql/resolvers/outbound/unsort-item.ts

@@ -0,0 +1,78 @@
+import { EntityManager, Not } from 'typeorm'
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+import { ORDER_INVENTORY_STATUS, OrderInventory, OrderToteItem } from '@things-factory/sales-base'
+
+export const unsortItem = {
+  async unsortItem(_: any, { orderToteItemId, reason }, context: any) {
+    const { domain, user, tx }: { domain: Domain; user: User; tx: EntityManager } = context.state
+
+    // Find the order tote item with relations
+    const orderToteItem = (await tx.getRepository(OrderToteItem).findOne({
+      where: { domain, id: orderToteItemId },
+      relations: ['orderTote', 'orderInventory']
+    })) as OrderToteItem | null
+
+    if (!orderToteItem) {
+      throw new Error('Order tote item not found')
+    }
+
+    // Check if tote is sealed - cannot undo if sealed
+    if (orderToteItem.orderTote?.closedDate) {
+      throw new Error('Cannot remove item from sealed tote.')
+    }
+
+    const orderInventory: OrderInventory = orderToteItem.orderInventory
+    const qtyToRemove = orderToteItem.qty
+
+    if (!orderInventory) {
+      throw new Error('Associated order inventory not found')
+    }
+
+    // Validate that we can reduce the sorted quantity
+    if (orderInventory.sortedQty < qtyToRemove) {
+      throw new Error(`Cannot remove ${qtyToRemove} items. Current sorted quantity is ${orderInventory.sortedQty}`)
+    }
+
+    // Calculate new sorted quantity
+    const newSortedQty = orderInventory.sortedQty - qtyToRemove
+
+    // Determine new status - revert to PICKED if no more sorted items
+    let newStatus = orderInventory.status
+    if (newSortedQty === 0 && orderInventory.status === ORDER_INVENTORY_STATUS.LOADING) {
+      // Check if there are other order tote items for this order inventory
+      const otherToteItems = await tx.getRepository(OrderToteItem).count({
+        where: {
+          domain,
+          orderInventory: { id: orderInventory.id },
+          id: Not(orderToteItemId)
+        }
+      })
+
+      // Only revert to PICKED if this is the last tote item (no more sorted items)
+      if (otherToteItems === 0) {
+        newStatus = ORDER_INVENTORY_STATUS.SORTING
+      }
+    }
+
+    // Update the order inventory
+    await tx.getRepository(OrderInventory).update(orderInventory.id, {
+      sortedQty: newSortedQty,
+      status: newStatus,
+      updatedAt: new Date(),
+      updater: user
+    })
+
+    // Delete the order tote item
+    await tx.getRepository(OrderToteItem).delete(orderToteItem.id)
+
+    // Log the undo action if reason provided
+    if (reason) {
+      console.log(
+        `[UNSORT] User ${user.name} removed ${qtyToRemove} items from tote ${orderToteItem.orderTote?.name}. Reason: ${reason}`
+      )
+    }
+
+    return true
+  }
+}

package/server/graphql/resolvers/reports/tote-loading-qc-report.ts

@@ -62,7 +62,8 @@ export const loadingQcReport = {
                 ELSE NULL
                 END
           END`,
-          'totalCarton')
+          'totalCarton'
+        )
         .addSelect('case when oti.qty is null then oi.release_qty else oti.qty end', 'orderQuantity')
         .addSelect('ot.name', 'tote')
         .addSelect('case when ot.tote_id is null then false else true end', 'toteBox')
@@ -74,14 +75,17 @@ export const loadingQcReport = {
         .leftJoin('order_totes', 'ot', 'ot.id = oti.order_tote_id')
         .leftJoin('order_tote_seals', 'ots', 'ots.order_tote_id = ot.id')
         .innerJoin('product_details', 'pd', 'oi.product_detail_id = pd.id')
-        .where('rg.status = :status', { status: 'LOADING' })
-        .andWhere('bizplace.id = :bizplaceId', { bizplaceId: bizplaceFilter.value })
+        .where('bizplace.id = :bizplaceId', { bizplaceId: bizplaceFilter.value })
         .andWhere('rg.release_date <= :toDate', { toDate: toDateFilter.value })
         .andWhere('rg.release_date >= :fromDate', { fromDate: fromDateFilter.value })
         .andWhere('w.type = :type', { type: 'LOADING' })
         .andWhere('rg.domain_id = :domainId', { domainId: domain.id })
+        .andWhere('rg.name IS NOT NULL')
+        .andWhere('rg.status NOT IN (:...excludedStatuses)', {
+          excludedStatuses: ['PENDING_CANCEL', 'CANCELLED', 'PENDING_WORKSHEET', 'READY_TO_PICK']
+        })
         .groupBy('bizplace.name')
-        .addGroupBy('rg.name ')
+        .addGroupBy('rg.name')
         .addGroupBy('rg.route_id')
         .addGroupBy('rg.stop_id')
         .addGroupBy('rg.release_date')
@@ -121,21 +125,40 @@ export const loadingQcReport = {
 
       items = items.reduce((prev, curr, idx) => {
         if (curr.tote) {
-          let reducedItemIndex = prev.findIndex(itm => itm.releaseGoodNo == curr.releaseGoodNo && itm.tote == curr.tote)
+          // Find duplicate by releaseGoodNo, tote, and additional fields to ensure proper grouping
+          let reducedItemIndex = prev.findIndex(
+            itm =>
+              itm.releaseGoodNo === curr.releaseGoodNo &&
+              itm.tote === curr.tote &&
+              itm.bizplaceName === curr.bizplaceName
+          )
           if (reducedItemIndex == -1) {
-            prev.push(curr)
-            prev[prev.length - 1].totalSeal = 1
+            // Ensure numeric fields are properly typed when adding new item
+            prev.push({
+              ...curr,
+              orderQuantity: Number(curr.orderQuantity) || 0,
+              totalCarton: Number(curr.totalCarton) || 0,
+              totalSeal: curr.sealId ? 1 : 0
+            })
           } else {
-            prev[reducedItemIndex].orderQuantity += curr.orderQuantity
-            prev[reducedItemIndex].totalCarton += curr.totalCarton
-            if (!prev[reducedItemIndex].sealId.includes(curr.sealId)) {
+            // Aggregate quantities with explicit numeric conversion
+            prev[reducedItemIndex].orderQuantity += Number(curr.orderQuantity) || 0
+            prev[reducedItemIndex].totalCarton += Number(curr.totalCarton) || 0
+            // Concatenate seal IDs only if they're unique and not null
+            if (curr.sealId && !prev[reducedItemIndex].sealId.includes(curr.sealId)) {
               prev[reducedItemIndex].sealId = prev[reducedItemIndex].sealId.concat(', ', curr.sealId)
               prev[reducedItemIndex].totalSeal++
             }
           }
           return prev
         } else {
-          prev.push(curr)
+          // Ensure numeric fields are properly typed for items without totes
+          prev.push({
+            ...curr,
+            orderQuantity: Number(curr.orderQuantity) || 0,
+            totalCarton: Number(curr.totalCarton) || 0,
+            totalSeal: 0
+          })
           return prev
         }
       }, [])

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

@@ -19,6 +19,10 @@ export const Mutation = `
     worksheetDetails: [Object!]
     toteNo: String
   ): Boolean @transaction
+  unsortItem(
+    orderToteItemId: String!
+    reason: String
+  ): Boolean @transaction
   loadByQty(worksheetDetailPatch: LoadingWorksheetDetails): Boolean @transaction
   undoLoad(doId: String!): Boolean @transaction
   warehouseReturn (releaseGoodNo: String!, worksheetDetails: [Object!]): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction

package/translations/en.json

@@ -1258,6 +1258,7 @@
   "label.transfer_inventory": "transfer inventory",
   "label.transfer_qty": "transfer qty",
   "label.transfer": "transfer",
+  "label.aggregation-function": "aggregation",
   "label.transport_type": "transport type",
   "label.transport_vehicle": "transport vehicle",
   "label.transporter": "transporter",
@@ -1907,6 +1908,13 @@
   "text.tote_is_not_scanned": "tote is not scanned",
   "text.tote_number": "tote number",
   "text.tote_status_does_not_exist": "tote status does not exist",
+  "text.are_you_sure_to_remove_x_from_tote": "are you sure you want to remove {x} from this tote?",
+  "text.item_removed_from_tote": "item removed from tote",
+  "text.items_removed_from_tote": "{count} items removed from tote",
+  "text.nothing_selected": "nothing selected",
+  "text.please_select_items_to_undo": "please select items to undo",
+  "text.viewing_items_in_tote": "viewing items in tote",
+  "text.list_refreshed": "list refreshed",
   "text.tracking_no_added_successfully": "tracking no added successfully",
   "text.tracking_no_already_exist_in_manifest_list": "tracking no already exist in manifest list",
   "text.tracking_no_already_exist_in_other_manifest_list": "tracking no already exist in other manifest list",

package/translations/ko.json

@@ -1249,6 +1249,7 @@
   "label.transfer_inventory": "재고 이동",
   "label.transfer_qty": "[ko]transfer qty",
   "label.transfer": "재고 이동",
+  "label.aggregation-function": "집계함수",
   "label.transport_type": "운송 유형",
   "label.transport_vehicle": "[ko] transport vehicle",
   "label.transporter": "[ko] transporter",
@@ -1892,6 +1893,12 @@
   "text.tote_is_not_scanned": "[ko] tote is not scanned",
   "text.tote_number": "[ko] tote number",
   "text.tote_status_does_not_exist": "[ko] tote status does not exist",
+  "text.are_you_sure_to_remove_x_from_tote": "[ko] are you sure you want to remove {x} from this tote?",
+  "text.item_removed_from_tote": "[ko] item removed from tote",
+  "text.items_removed_from_tote": "[ko] {count} items removed from tote",
+  "text.please_select_items_to_undo": "[ko] please select items to undo",
+  "text.viewing_items_in_tote": "[ko] viewing items in tote",
+  "text.list_refreshed": "[ko] list refreshed",
   "text.tracking_no_added_successfully": "[ko] tracking no added successfully",
   "text.tracking_no_already_exist_in_manifest_list": "[ko] tracking no already exist in manifest list",
   "text.tracking_no_already_exist_in_other_manifest_list": "[ko]tracking no already exist in other manifest list",

package/translations/ms.json

@@ -1275,6 +1275,7 @@
   "label.transfer": "pemindahan",
   "label.transfer_inventory": "pemindahan inventori",
   "label.transfer_qty": "transfer qty",
+  "label.aggregation-function": "aggregation",
   "label.transport_type": "jenis pengangkutan",
   "label.transport_vehicle": "transport vehicle",
   "label.transporter": "transporter",
@@ -1944,6 +1945,12 @@
   "text.tote_is_not_scanned": "kotak tote tidak dipindai",
   "text.tote_number": "nombor tote",
   "text.tote_status_does_not_exist": "status tote tidak wujud",
+  "text.are_you_sure_to_remove_x_from_tote": "[ms] are you sure you want to remove {x} from this tote?",
+  "text.item_removed_from_tote": "[ms] item removed from tote",
+  "text.items_removed_from_tote": "[ms] {count} items removed from tote",
+  "text.please_select_items_to_undo": "[ms] please select items to undo",
+  "text.viewing_items_in_tote": "[ms] viewing items in tote",
+  "text.list_refreshed": "[ms] list refreshed",
   "text.tracking_no_added_successfully": "no. penjejak telah ditambah",
   "text.tracking_no_already_exist_in_manifest_list": "no. penjejak sudah wujud dalam senarai manifest",
   "text.tracking_no_already_exist_in_other_manifest_list": "no. penjejak sudah wujud dalam senarai manifest lain",

package/translations/zh.json

@@ -1293,6 +1293,7 @@
   "label.transfer": "转移",
   "label.transfer_inventory": "转移库存",
   "label.transfer_qty": "转移数量",
+  "label.aggregation-function": "聚合函数",
   "label.transport_type": "运输类型",
   "label.transport_vehicle": "运输车辆",
   "label.transporter": "运输商",
@@ -1977,6 +1978,12 @@
   "text.tote_is_not_scanned": "箱子未扫描",
   "text.tote_number": "箱子编号",
   "text.tote_status_does_not_exist": "箱子状态不存在",
+  "text.are_you_sure_to_remove_x_from_tote": "[zh] are you sure you want to remove {x} from this tote?",
+  "text.item_removed_from_tote": "[zh] item removed from tote",
+  "text.items_removed_from_tote": "[zh] {count} items removed from tote",
+  "text.please_select_items_to_undo": "[zh] please select items to undo",
+  "text.viewing_items_in_tote": "[zh] viewing items in tote",
+  "text.list_refreshed": "[zh] list refreshed",
   "text.tracking_no_added_successfully": "跟踪号已添加成功",
   "text.tracking_no_already_exist_in_manifest_list": "跟踪号已存在于清单列表中",
   "text.tracking_no_already_exist_in_other_manifest_list": "跟踪号已存在于其他清单列表中",