@things-factory/sales-base 4.0.38 → 4.0.39

package/server/service/release-good/release-good-mutation.ts

@@ -76,7 +76,7 @@ export class ReleaseGoodMutation {
 
     let releaseGoods: Partial<ReleaseGood[]> = extractRawReleaseGoods(rawReleaseGoods)
 
-    let errorsFound: any[] = []
+    let errorsCaught: any[] = []
     for (let i = 0, l = releaseGoods.length; i < l; i++) {
       // generate release good by group to avoid duplication
       // if this function is called simultaneously by different users
@@ -119,25 +119,31 @@ export class ReleaseGoodMutation {
 
           createdReleaseGoods.push(createdReleaseGood)
         })
-      } catch (e) {
-        errorsFound.push(e)
+      } catch (error) {
+        let rawReleaseGoods = formRawReleaseGoods(releaseGoods[i], error.message)
+        errorsCaught.push(...rawReleaseGoods)
       }
     }
 
     let confirmedReleaseGoods: ReleaseGood[] = []
-    try {
-      confirmedReleaseGoods = await bulkConfirmReleaseGoods(
-        createdReleaseGoods.map(rg => rg.name),
-        domain,
-        user,
-        context,
-        tx
-      )
-    } catch (e) {
-      errorsFound.push(e)
-    }
 
-    // if (errorsFound.length) { then ?? }
+    if (createdReleaseGoods.length)
+      try {
+        confirmedReleaseGoods = await bulkConfirmReleaseGoods(
+          createdReleaseGoods.map(rg => rg.name),
+          domain,
+          user,
+          context,
+          tx
+        )
+      } catch (error) {
+      }
+
+    if (errorsCaught.length)
+      throw new ValidationError({
+        ...ValidationError.ERROR_CODES.INVALID_DATA_FOUND,
+        detail: { data: JSON.stringify(errorsCaught) }
+      })
 
     return confirmedReleaseGoods
   }
@@ -1413,3 +1419,20 @@ function extractRawReleaseGoods(rawReleaseGoods): Partial<ReleaseGood[]> {
     return releaseGoods
   }, [])
 }
+
+function formRawReleaseGoods(releaseGood, errorMsg) {
+  let rawReleaseGoods = []
+  for (let i = 0, l = releaseGood.orderInventories.length; i < l; i++) {
+    let rawReleaseGood = {
+      ...releaseGood,
+      ...releaseGood.orderInventories[i],
+      errorMsg
+    }
+
+    delete rawReleaseGood.orderInventories
+    delete rawReleaseGood.product
+
+    rawReleaseGoods.push(rawReleaseGood)
+  }
+  return rawReleaseGoods
+}

package/server/service/release-good/release-good-query.ts

@@ -371,9 +371,13 @@ export class ReleaseGoodQuery {
     const PROD_ALIAS = 'PROD'
     const GAN_ALIAS = 'GAN'
     const conditions = filters
-    let { batchId = null, containerNo = null, product = [], packingType = null, inventory = [] } = getConditionValues(
-      conditions
-    )
+    let {
+      batchId = null,
+      containerNo = null,
+      product = [],
+      packingType = null,
+      inventory = []
+    } = getConditionValues(conditions)
 
     const SELECT: string = `
       SELECT
@@ -648,7 +652,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
   let availableItems = await tx.query(
     `
         WITH inv AS (
-        SELECT i.product_id, foo.product_detail_id, foo.sku, foo.product_info, i.batch_id, i.packing_type, i.packing_size, i.uom,
+        SELECT i.product_id, foo.product_detail_id, foo.sku, foo.product_info, i.packing_type, i.packing_size, i.uom,
           SUM(i.qty - COALESCE(i.locked_qty, 0)) - COALESCE(
             (
               SELECT SUM(oi.release_qty) FROM order_inventories oi 
@@ -686,7 +690,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
         AND i.domain_id = $1
         AND i.bizplace_id = $2
         WHERE l.type NOT IN ($3, $4)
-        GROUP BY i.product_id, foo.product_detail_id, foo.sku,foo.product_info, i.batch_id, i.packing_type, i.packing_size, i.uom
+        GROUP BY i.product_id, foo.product_detail_id, foo.sku,foo.product_info, i.packing_type, i.packing_size, i.uom
         ORDER BY foo.sku, remain_qty
       ) SELECT * FROM inv WHERE remain_qty > 0
       `,
@@ -701,7 +705,6 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
       productDetailId: item.product_detail_id,
       productInfo: item.product_info,
       sku: item.sku,
-      batchId: item.batch_id,
       packingType: item.packing_type,
       packingSize: Number(item.packing_size || 0),
       uom: item.uom,
@@ -766,7 +769,6 @@ function _extractData(rawData, validatedData) {
       raw.packingType = validatedData[idx].packingType
       raw.packingSize = validatedData[idx].packingSize
       raw.uom = validatedData[idx].uom
-      raw.batchId = validatedData[idx].batchId
     } else {
       raw.assignedQty = 0
       raw.assignedUomValue = 0
@@ -796,9 +798,7 @@ function _extractData(rawData, validatedData) {
   })
 }
 
-function getConditionValues(
-  conditions: Filter[]
-): {
+function getConditionValues(conditions: Filter[]): {
   batchId?: string
   containerNo?: string
   product?: string[]