@things-factory/operato-hub 4.1.41 → 4.2.2

package/server/routers/api/restful-apis/v1/add-release-order.ts

@@ -12,7 +12,7 @@ import { WorksheetDetail } from '@things-factory/worksheet-base'
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
 
-const debug = require('debug')('things-factory:operato-hub:restful-api:unstable:add-release-order')
+const debug = require('debug')('things-factory:operato-hub:restful-api:v1:add-release-order')
 
 router.post(
   '/v1/warehouse/:warehouseId/add-release-order',
@@ -65,12 +65,13 @@ router.post(
 
       const orderInventories: OrderInventory[] = bodyReq.orderInventories
       let newOrderInventories: OrderInventory[] = []
+      let bundleInfo: any[] = []
 
       await Promise.all(
         orderInventories.map(async orderInventory => {
           const sku: string = orderInventory.product?.sku
           const refCode: string = orderInventory.product?.refCode
-          const packingType: string = orderInventory.packingType
+          const { packingType, packingSize }: { packingType: string; packingSize: number } = orderInventory
 
           const qb: SelectQueryBuilder<ProductDetail> = tx
             .getRepository(ProductDetail)
@@ -94,6 +95,10 @@ router.post(
             qb.andWhere('PD.packing_type = :packingType', { packingType })
           }
 
+          if (packingSize) {
+            qb.andWhere('PD.packing_size = :packingSize', { packingSize })
+          }
+
           if (!packingType && !refCode) {
             qb.andWhere('PD.is_default = :isDefault', { isDefault: true })
           }
@@ -138,6 +143,11 @@ router.post(
             const foundProductBundle: ProductBundle = await qb.getOne()
 
             if (foundProductBundle) {
+              bundleInfo.push({
+                productBundleId: foundProductBundle.id,
+                sku: foundProductBundle.sku,
+                releaseQty: orderInventory.releaseQty
+              })
               const bundleProductSettings: any[] = foundProductBundle.productBundleSettings
               bundleProductSettings.map(bundleProductSetting => {
                 const productDetailBundle: ProductDetail = bundleProductSetting.productDetail
@@ -151,9 +161,15 @@ router.post(
                 newOrderInventories.push(newOrderInventory)
               })
             } else {
+              if (sku && refCode) {
+                context.throw(404, t(`error.sku ${sku} and refCode ${refCode} not exist in product / bundle master`))
+              }
+
               if (sku) {
                 context.throw(404, t(`error.sku ${sku} not exist in product / bundle master`))
-              } else if (refCode) {
+              }
+
+              if (refCode) {
                 context.throw(404, t(`error.refCode ${refCode} not exist in product / bundle master`))
               }
             }
@@ -185,11 +201,35 @@ router.post(
               }
             ]
 
+            let sortings: any = []
+
+            switch (orderInventory.product.pickingStrategy) {
+              case 'FIFO':
+                sortings.push({ name: 'created_at', desc: false })
+                break
+
+              case 'LIFO':
+                sortings.push({ name: 'created_at', desc: true })
+                break
+
+              case 'FEFO':
+                sortings.push({ name: 'expiration_date', desc: false })
+                break
+
+              case 'FMFO':
+                sortings.push({ name: 'manufacture_date', desc: false })
+                break
+            }
+
             // 2. get all inventory data according to SKU and batchId
             const response = await client.query({
               query: gql`
-                query inventoriesByPallet($filters: [Filter]) {
-                  inventoriesByPallet(filters: $filters) {
+                query inventoriesByPallet($filters: [Filter], $sortings: [Sorting], $locationSortingRules: [Sorting]) {
+                  inventoriesByPallet(
+                    filters: $filters
+                    sortings: $sortings
+                    locationSortingRules: $locationSortingRules
+                  ) {
                     items {
                       product {
                         id
@@ -199,14 +239,13 @@ router.post(
                       batchId
                       packingType
                       remainQty
-                      remainWeight
                       remainUomValue
                     }
                     total
                   }
                 }
               `,
-              variables: { filters, locationSortingRules },
+              variables: { filters, sortings, locationSortingRules },
               context: {
                 ...context,
                 state: {
@@ -255,8 +294,8 @@ router.post(
 
         for (let i: number = 0; i < newOrderInventories.length; i++) {
           const orderInventory: OrderInventory = newOrderInventories[i]
-          const product: Product = orderInventory.product
-          const packingType: string = orderInventory.packingType
+          const { product, packingType }: { product: Product; packingType: string } = orderInventory
+          const pickingStrategy: string = product.pickingStrategy
 
           if (isAutoAssign) {
             let qb: SelectQueryBuilder<Inventory> = tx.getRepository(Inventory).createQueryBuilder('iv')
@@ -276,14 +315,54 @@ router.post(
                 locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
               })
 
-            if (locationSortingRules?.length > 0) {
-              locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
-                idx === 0
-                  ? qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-                  : qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-              })
-            } else {
-              qb.addOrderBy('"iv"."created_at"', 'ASC')
+            switch (pickingStrategy) {
+              case 'FIFO':
+                qb.orderBy('"iv"."created_at"', 'ASC')
+                if (locationSortingRules?.length > 0) {
+                  locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+                    qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                  })
+                }
+                break
+
+              case 'LIFO':
+                qb.orderBy('"iv"."created_at"', 'DESC')
+                if (locationSortingRules?.length > 0) {
+                  locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+                    qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                  })
+                }
+                break
+
+              case 'FEFO':
+                qb.orderBy('"iv"."expiration_date"', 'ASC')
+                if (locationSortingRules?.length > 0) {
+                  locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+                    qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                  })
+                }
+                break
+
+              case 'FMFO':
+                qb.orderBy('"iv"."manufacture_date"', 'ASC')
+                if (locationSortingRules?.length > 0) {
+                  locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+                    qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                  })
+                }
+                break
+
+              case 'LOCATION':
+                if (locationSortingRules?.length > 0) {
+                  locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+                    idx === 0
+                      ? qb.orderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                      : qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                  })
+                } else {
+                  qb.orderBy('"loc"."name"', 'DESC')
+                }
+                break
             }
 
             let inventories: Inventory[] = await qb.getMany()
@@ -334,7 +413,6 @@ router.post(
                       batchId
                       packingType
                       remainQty
-                      remainWeight
                       remainUomValue
                     }
                     total
@@ -417,6 +495,10 @@ router.post(
                   airwayBill
                   invoice
                   type
+                  storeName
+                  storeId
+                  routeId
+                  stopId
                   arrivalNotice {
                     name
                   }
@@ -477,6 +559,7 @@ router.post(
                 releaseDate: bodyReq.releaseDate,
                 type: bodyReq.type,
                 marketplaceOrderStatus: bodyReq?.marketplaceOrderStatus,
+                remark: bodyReq?.remark || null,
                 billingAddress: bodyReq?.billTo?.billingAddress || null,
                 deliveryAddress1: bodyReq?.deliverTo?.deliveryAddress1 || null,
                 deliveryAddress2: bodyReq?.deliverTo?.deliveryAddress2 || null,
@@ -495,7 +578,12 @@ router.post(
                 transporter: bodyReq?.transporter,
                 trackingNo: bodyReq?.trackingNo,
                 airwayBill: bodyReq?.airwayBill,
-                invoice: bodyReq?.invoice
+                invoice: bodyReq?.invoice,
+                bundleInfo: JSON.stringify(bundleInfo),
+                storeName: bodyReq?.storeName,
+                storeId: bodyReq?.storeId,
+                routeId: bodyReq?.routeId,
+                stopId: bodyReq?.stopId
               }
             },
             context: {

package/server/routers/api/restful-apis/v2/add-release-order.ts

@@ -12,7 +12,7 @@ import { WorksheetDetail } from '@things-factory/worksheet-base'
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
 
-const debug = require('debug')('things-factory:operato-hub:restful-api:unstable:add-release-order')
+const debug = require('debug')('things-factory:operato-hub:restful-api:v2:add-release-order')
 
 router.post(
   '/v2/warehouse/:warehouseId/add-release-order',
@@ -65,12 +65,13 @@ router.post(
 
       const orderInventories: OrderInventory[] = bodyReq.orderInventories
       let newOrderInventories: OrderInventory[] = []
+      let bundleInfo: any[] = []
 
       await Promise.all(
         orderInventories.map(async orderInventory => {
           const sku: string = orderInventory.product?.sku
           const refCode: string = orderInventory.product?.refCode
-          const packingType: string = orderInventory.packingType
+          const { packingType, packingSize }: { packingType: string; packingSize: number } = orderInventory
 
           const qb: SelectQueryBuilder<ProductDetail> = tx
             .getRepository(ProductDetail)
@@ -97,6 +98,9 @@ router.post(
           if (!packingType && !refCode) {
             qb.andWhere('PD.is_default = :isDefault', { isDefault: true })
           }
+          if (packingSize) {
+            qb.andWhere('PD.packing_size = :packingSize', { packingSize })
+          }
 
           const productDetail: ProductDetail = await qb.getOne()
 
@@ -138,6 +142,11 @@ router.post(
             const foundProductBundle: ProductBundle = await qb.getOne()
 
             if (foundProductBundle) {
+              bundleInfo.push({
+                productBundleId: foundProductBundle.id,
+                sku: foundProductBundle.sku,
+                releaseQty: orderInventory.releaseQty
+              })
               const bundleProductSettings: any[] = foundProductBundle.productBundleSettings
               bundleProductSettings.map(bundleProductSetting => {
                 const productDetailBundle: ProductDetail = bundleProductSetting.productDetail
@@ -151,9 +160,15 @@ router.post(
                 newOrderInventories.push(newOrderInventory)
               })
             } else {
+              if (sku && refCode) {
+                context.throw(404, t(`error.sku ${sku} and refCode ${refCode} not exist in product / bundle master`))
+              }
+
               if (sku) {
                 context.throw(404, t(`error.sku ${sku} not exist in product / bundle master`))
-              } else if (refCode) {
+              }
+
+              if (refCode) {
                 context.throw(404, t(`error.refCode ${refCode} not exist in product / bundle master`))
               }
             }
@@ -185,11 +200,35 @@ router.post(
               }
             ]
 
+            let sortings: any = []
+
+            switch (orderInventory.product.pickingStrategy) {
+              case 'FIFO':
+                sortings.push({ name: 'created_at', desc: false })
+                break
+
+              case 'LIFO':
+                sortings.push({ name: 'created_at', desc: true })
+                break
+
+              case 'FEFO':
+                sortings.push({ name: 'expiration_date', desc: false })
+                break
+
+              case 'FMFO':
+                sortings.push({ name: 'manufacture_date', desc: false })
+                break
+            }
+
             // 2. get all inventory data according to SKU and batchId
             const response = await client.query({
               query: gql`
-                query inventoriesByPallet($filters: [Filter]) {
-                  inventoriesByPallet(filters: $filters) {
+                query inventoriesByPallet($filters: [Filter], $sortings: [Sorting], $locationSortingRules: [Sorting]) {
+                  inventoriesByPallet(
+                    filters: $filters
+                    sortings: $sortings
+                    locationSortingRules: $locationSortingRules
+                  ) {
                     items {
                       product {
                         id
@@ -199,14 +238,13 @@ router.post(
                       batchId
                       packingType
                       remainQty
-                      remainWeight
                       remainUomValue
                     }
                     total
                   }
                 }
               `,
-              variables: { filters, locationSortingRules },
+              variables: { filters, sortings, locationSortingRules },
               context: {
                 ...context,
                 state: {
@@ -255,8 +293,8 @@ router.post(
 
         for (let i: number = 0; i < newOrderInventories.length; i++) {
           const orderInventory: OrderInventory = newOrderInventories[i]
-          const product: Product = orderInventory.product
-          const packingType: string = orderInventory.packingType
+          const { product, packingType }: { product: Product; packingType: string } = orderInventory
+          const pickingStrategy: string = product.pickingStrategy
 
           if (isAutoAssign) {
             let qb: SelectQueryBuilder<Inventory> = tx.getRepository(Inventory).createQueryBuilder('iv')
@@ -276,14 +314,54 @@ router.post(
                 locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
               })
 
-            if (locationSortingRules?.length > 0) {
-              locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
-                idx === 0
-                  ? qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-                  : qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
-              })
-            } else {
-              qb.addOrderBy('"iv"."created_at"', 'ASC')
+            switch (pickingStrategy) {
+              case 'FIFO':
+                qb.orderBy('"iv"."created_at"', 'ASC')
+                if (locationSortingRules?.length > 0) {
+                  locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+                    qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                  })
+                }
+                break
+
+              case 'LIFO':
+                qb.orderBy('"iv"."created_at"', 'DESC')
+                if (locationSortingRules?.length > 0) {
+                  locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+                    qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                  })
+                }
+                break
+
+              case 'FEFO':
+                qb.orderBy('"iv"."expiration_date"', 'ASC')
+                if (locationSortingRules?.length > 0) {
+                  locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+                    qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                  })
+                }
+                break
+
+              case 'FMFO':
+                qb.orderBy('"iv"."manufacture_date"', 'ASC')
+                if (locationSortingRules?.length > 0) {
+                  locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+                    qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                  })
+                }
+                break
+
+              case 'LOCATION':
+                if (locationSortingRules?.length > 0) {
+                  locationSortingRules.forEach((rule: { name: string; desc: boolean }, idx: number) => {
+                    idx === 0
+                      ? qb.orderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                      : qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
+                  })
+                } else {
+                  qb.orderBy('"loc"."name"', 'DESC')
+                }
+                break
             }
 
             let inventories: Inventory[] = await qb.getMany()
@@ -334,7 +412,6 @@ router.post(
                       batchId
                       packingType
                       remainQty
-                      remainWeight
                       remainUomValue
                     }
                     total
@@ -417,6 +494,10 @@ router.post(
                   airwayBill
                   invoice
                   type
+                  storeName
+                  storeId
+                  routeId
+                  stopId
                   arrivalNotice {
                     name
                   }
@@ -477,6 +558,7 @@ router.post(
                 releaseDate: bodyReq.releaseDate,
                 type: bodyReq.type,
                 marketplaceOrderStatus: bodyReq?.marketplaceOrderStatus,
+                remark: bodyReq?.remark || null,
                 billingAddress: bodyReq?.billTo?.billingAddress || null,
                 deliveryAddress1: bodyReq?.deliverTo?.deliveryAddress1 || null,
                 deliveryAddress2: bodyReq?.deliverTo?.deliveryAddress2 || null,
@@ -495,7 +577,12 @@ router.post(
                 transporter: bodyReq?.transporter,
                 trackingNo: bodyReq?.trackingNo,
                 airwayBill: bodyReq?.airwayBill,
-                invoice: bodyReq?.invoice
+                invoice: bodyReq?.invoice,
+                bundleInfo: JSON.stringify(bundleInfo),
+                storeName: bodyReq?.storeName,
+                storeId: bodyReq?.storeId,
+                routeId: bodyReq?.routeId,
+                stopId: bodyReq?.stopId
               }
             },
             context: {

package/translations/en.json

@@ -16,6 +16,7 @@
   "field.bundle_qty": "bundle qty",
   "field.packing_type": "packing type",
   "field.parent_product_ref": "parent product ref",
+  "field.picking_strategy": "picking strategy",
   "field.uom": "uom",
   "field.uom_value": "uom value",
 

package/translations/ko.json

@@ -5,6 +5,7 @@
   "field.bundle_qty": "[ko]bundle qty",
   "field.packing_type": "[ko]packing type",
   "field.parent_product_ref": "[ko]parent product ref",
+  "field.picking_strategy": "[ko]picking strategy",
   "field.uom": "[ko]uom",
   "field.uom_value": "[ko]uom value",
 

package/translations/ms.json

@@ -14,6 +14,7 @@
   "field.bundle_qty": "[ms] bundle qty",
   "field.packing_type": "[ms] packing type",
   "field.parent_product_ref": "[ms] parent product ref",
+  "field.picking_strategy": "[ms]picking strategy",
   "field.uom": "[ms] uom",
   "field.uom_value": "[ms] uom value",
 

package/translations/zh.json

@@ -18,6 +18,7 @@
   "field.bundle_qty": "捆绑数量",
   "field.packing_type": "包装类型",
   "field.parent_product_ref": "上层产品参考",
+  "field.picking_strategy": "[zh]picking strategy",
   "field.uom": "度量单位",
   "field.uom_value": "度量单位值",