@things-factory/operato-wms 4.3.797 → 4.3.798

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

@@ -2,8 +2,9 @@ import { EntityManager } from 'typeorm'
 import { In } from 'typeorm'
 
 import { Domain } from '@things-factory/shell'
+import { ProductDetail } from '@things-factory/product-base'
 import { ReleaseGood, ORDER_INVENTORY_STATUS, ORDER_STATUS } from '@things-factory/sales-base'
-import { Worksheet, WorksheetDetail, WORKSHEET_TYPE, WORKSHEET_STATUS } from '@things-factory/worksheet-base'
+import { Worksheet, WorksheetDetail, WORKSHEET_TYPE, WORKSHEET_STATUS, computeConversionString } from '@things-factory/worksheet-base'
 import { Setting } from '@things-factory/setting-base'
 
 const FILTER_TYPES = {
@@ -33,6 +34,7 @@ interface WorksheetInfo {
     refNo2?: string
     refNo3?: string
     remark?: string
+    rtm?: string
   }
 }
 
@@ -47,6 +49,7 @@ interface WorksheetDetailInfo {
   status: string
   packingType: string
   packingSize: string
+  conversion: string
   expirationDate?: string
   binLocation: {
     name?: string
@@ -141,6 +144,8 @@ export const loadingWorksheetv2 = {
       .leftJoinAndSelect('targetInventory.product', 'product')
       .leftJoinAndSelect('targetInventory.productDetail', 'productDetail')
       .leftJoinAndSelect('productDetail.productBarcodes', 'productBarcodes')
+      .leftJoinAndSelect('productDetail.childProductDetail', 'childProductDetail')
+      .leftJoinAndSelect('productDetail.parentProductDetails', 'parentProductDetails')
       .leftJoin('targetInventory.inventory', 'inventory')
       .addSelect('inventory.expirationDate')
       .where('worksheetDetail.domain_id = :domainId', { domainId: domain.id })
@@ -220,7 +225,8 @@ async function mapdata(
       refNo: releaseGood?.refNo,
       refNo2: releaseGood?.refNo2,
       refNo3: releaseGood?.refNo3,
-      remark: releaseGood?.remark
+      remark: releaseGood?.remark,
+      rtm: releaseGood?.rtm
     }
   }
 
@@ -240,6 +246,7 @@ async function mapdata(
     status: wsd.status,
     packingType: wsd.targetInventory.packingType,
     packingSize: wsd.targetInventory.packingSize,
+    conversion: computeConversionString(wsd.targetInventory.releaseQty, wsd.targetInventory.productDetail as ProductDetail),
     expirationDate: wsd.targetInventory?.inventory?.expirationDate,
     binLocation: {
       name: wsd.targetInventory.binLocation?.name

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

@@ -1,8 +1,9 @@
 import { EntityManager, getRepository, In, Not } from 'typeorm'
 import { Domain } from '@things-factory/biz-base'
-import { Worksheet, WorksheetDetail, WORKSHEET_TYPE } from '@things-factory/worksheet-base'
+import { Worksheet, WorksheetDetail, WORKSHEET_TYPE, computeConversionString } from '@things-factory/worksheet-base'
 import { Inventories, InventoryChange } from '@things-factory/warehouse-base'
 import { OrderInventory, ReleaseGood, ORDER_STATUS, ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
+
 export const zoneWorksheetOverview = {
   async zoneWorksheetOverview(_: any, { releaseGoods }, context: any) {
     const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
@@ -81,6 +82,9 @@ export const zonePickingWorksheet = {
       .innerJoinAndSelect('oi.inventory', 'i', 'oi.inventory_id = i.id')
       .innerJoinAndSelect('i.location', 'l', 'i.location_id = l.id')
       .leftJoin('oi.releaseGood', 'rg', 'oi.release_good_id = rg.id')
+      .leftJoinAndSelect('oi.productDetail', 'pd')
+      .leftJoinAndSelect('pd.childProductDetail', 'cpd')
+      .leftJoinAndSelect('pd.parentProductDetails', 'ppd')
       .where('ref_worksheet_id = :worksheetId', { worksheetId: worksheet.id })
 
     //get all oi to find inventory changes and determine if the worksheet is completable
@@ -135,30 +139,35 @@ export const zonePickingWorksheet = {
     }
 
     //group oi based on inventory id
-    zoneWorksheet.groupedOrderInventories = Object.values(
-      items?.reduce((group, oi) => {
-        const inventoryId = oi.inventory?.id
-        if (inventoryId) {
-          if (!group[inventoryId]) {
-            group[inventoryId] = {
-              product: oi.product,
-              inventory: oi.inventory,
-              packingType: oi.packingType,
-              packingSize: oi.packingSize,
-              releaseQty: 0,
-              pickedQty: 0,
-              releaseUomValue: 0
-            }
+    const grouped = items?.reduce((group, oi) => {
+      const inventoryId = oi.inventory?.id
+      if (inventoryId) {
+        if (!group[inventoryId]) {
+          group[inventoryId] = {
+            product: oi.product,
+            inventory: oi.inventory,
+            packingType: oi.packingType,
+            packingSize: oi.packingSize,
+            productDetail: oi.productDetail,
+            releaseQty: 0,
+            pickedQty: 0,
+            releaseUomValue: 0
           }
-
-          //sum up the quantities and uom value
-          group[inventoryId].releaseQty += oi.releaseQty || 0
-          group[inventoryId].pickedQty += oi.pickedQty || 0
-          group[inventoryId].releaseUomValue += oi.releaseUomValue || 0
         }
-        return group
-      }, {})
-    )
+
+        //sum up the quantities and uom value
+        group[inventoryId].releaseQty += oi.releaseQty || 0
+        group[inventoryId].pickedQty += oi.pickedQty || 0
+        group[inventoryId].releaseUomValue += oi.releaseUomValue || 0
+      }
+      return group
+    }, {})
+
+    //compute conversion string for each grouped item
+    zoneWorksheet.groupedOrderInventories = Object.values(grouped).map((item: any) => ({
+      ...item,
+      conversion: computeConversionString(item.releaseQty, item.productDetail)
+    }))
 
     return zoneWorksheet
   }

package/translations/en.json

@@ -523,6 +523,7 @@
   "field.own_collection": "own collection",
   "field.own_transport": "own transport",
   "field.owner": "owner",
+  "field.pack_conversion": "pack conversion",
   "field.pack_in_qty": "pack in qty",
   "field.pack_qty": "pack qty",
   "field.pack_quantity": "pack quantity",
@@ -656,6 +657,7 @@
   "field.route_id": "route id",
   "field.route_label": "route label",
   "field.route": "route",
+  "field.rtm": "Route To Market",
   "field.routing_type": "routing type",
   "field.routing": "routing",
   "field.row_end": "row end",

package/translations/ko.json

@@ -516,6 +516,7 @@
   "field.own_collection": "직접 취합",
   "field.own_transport": "자사 운송",
   "field.owner": "관리자",
+  "field.pack_conversion": "팩 환산",
   "field.pack_in_qty": "팩 수량",
   "field.pack_qty": "팩 수량",
   "field.pack_quantity": "팩 수량",
@@ -645,6 +646,7 @@
   "field.route_id": "[ko] route id",
   "field.route_label": "[ko] route label",
   "field.route": "[ko] route",
+  "field.rtm": "시장진출경로",
   "field.routing_type": "라우팅 유형",
   "field.routing": "라우팅",
   "field.row_end": "끝 행",

package/translations/ms.json

@@ -543,6 +543,7 @@
   "field.own_collection": "msleksi sendiri",
   "field.own_transport": "pengangkutan sendiri",
   "field.owner": "pemilik",
+  "field.pack_conversion": "penukaran pek",
   "field.pack_in_qty": "kuantiti dalam pek",
   "field.pack_qty": "kuantiti dalam pek",
   "field.pack_quantity": "kuantiti dalam pek",
@@ -679,6 +680,7 @@
   "field.ro_type": "jenis RO",
   "field.rounded_uom_value": "nilai uom pembulatan",
   "field.route": "rute",
+  "field.rtm": "Laluan Ke Pasaran",
   "field.route_id": "id rute",
   "field.route_label": "label rute",
   "field.routing": "rute",

package/translations/zh.json

@@ -543,6 +543,7 @@
   "field.own_collection": "自提",
   "field.own_transport": "自运",
   "field.owner": "所有者",
+  "field.pack_conversion": "包装转换",
   "field.pack_in_qty": "包装数量",
   "field.pack_qty": "包装数量",
   "field.pack_quantity": "包装数量",
@@ -679,6 +680,7 @@
   "field.ro_type": "RO 类型",
   "field.rounded_uom_value": "圆整单位值",
   "field.route": "路线",
+  "field.rtm": "市场路线",
   "field.route_id": "路线ID",
   "field.route_label": "路线标签",
   "field.routing": "路由",