@things-factory/sales-base 4.3.257 → 4.3.261

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "4.3.257",
+  "version": "4.3.261",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -35,7 +35,7 @@
     "@things-factory/setting-base": "^4.3.253",
     "@things-factory/shell": "^4.3.253",
     "@things-factory/transport-base": "^4.3.253",
-    "@things-factory/warehouse-base": "^4.3.256"
+    "@things-factory/warehouse-base": "^4.3.261"
   },
-  "gitHead": "c1e0f8f18b88e3d9baca5edfb6214b5f97d63a8a"
+  "gitHead": "c085fa97b4a7a9abd06aab1820d4e7dbc4ed83ad"
 }

package/server/controllers/ecommerce/powrup-controller.ts

@@ -4,8 +4,8 @@ import { Bizplace } from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
 import { Platform, Powrup, PowrupAPI } from '@things-factory/integration-powrup'
 import { Product, ProductDetail } from '@things-factory/product-base'
+import { Inventory, INVENTORY_STATUS, LOCATION_TYPE, ProductDetailStock } from '@things-factory/warehouse-base'
 import { Domain, User } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
 import { ORDER_STATUS } from '../../constants'
 import { OrderPackageItem } from '../../service/order-package-item/order-package-item'
@@ -294,12 +294,16 @@ export class PowrupController {
             }
           })
 
+          const productDetailStock: ProductDetailStock = await trxMgr
+            .getRepository(ProductDetailStock)
+            .findOne({ productDetail })
+
           const powrupInvs: any[] = [
             {
               refCode: productDetail.refCode,
               stock: {
                 quantityTotal: inventoryTotalQty || 0,
-                quantityReserved: inventoryTotalLockedQty || 0,
+                quantityReserved: inventoryTotalLockedQty + (productDetailStock.unassignedQty || 0) || 0,
                 quantityBuffer: inventoryBufferQty || 0
               }
             }

package/server/service/order-vas/order-vas-mutation.ts

@@ -94,20 +94,20 @@ export class OrderVasMutation {
       select wd.*, ov.*
       from worksheet_details wd
       left join order_vass ov on wd.target_vas_id = ov.id
-      where ov.id IN ('${ ids }');
+      where ov.id IN ('${ids}');
       `
     )
-      
+
     if (foundWDs.length > 0) {
       await tx.query(
         `
         delete from worksheet_details wd
         left join order_vass or on wd.target_vas_id = ov.id
-        where ov.id IN ('${ ids }')
+        where ov.id IN ('${ids}')
         `
       )
     }
-  
+
     await tx.getRepository(OrderVas).delete(ids)
     return true
   }

package/server/service/order-vas/order-vas-types.ts

@@ -1,6 +1,7 @@
 import { ObjectRef } from '@things-factory/shell'
 import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
 import { OrderVas } from './order-vas'
+import { OrderVasItemPatch } from '../order-vas-item/order-vas-item-type'
 
 @ObjectType()
 export class OrderVasList {
@@ -154,6 +155,9 @@ export class OrderVasPatch {
   @Field(type => ObjectRef, { nullable: true })
   vas: ObjectRef
 
+  @Field(type => [OrderVasItemPatch], { nullable: true })
+  orderVasItemsPatch: OrderVasItemPatch[]
+
   @Field({ nullable: true })
   operationGuide: string
 

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

@@ -183,6 +183,7 @@ export class ReleaseGoodQuery {
           'arrivalNotice',
           'orderProducts',
           'orderProducts.product',
+          'orderProducts.productDetail',
           'orderPackages',
           'orderVass',
           'orderVass.vas',

package/server/utils/inventory-util.ts

@@ -293,8 +293,8 @@ export const InventoryUtil = {
               p.id AS "productId",
               i.product_detail_id AS "productDetailId",
               SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0)) - MAX(COALESCE(bp.bundle_product_release_qty, 0)) - SUM(COALESCE(pds.unassigned_qty, 0))  AS "remainQty",
-              SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value)) AS "remainUomValue",
-              concat(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value)), ' ', i.uom) AS "remainUomValueWithUom",
+              SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0)) AS "remainUomValue",
+              concat(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0)), ' ', i.uom) AS "remainUomValueWithUom",
               'SINGLE' AS "groupType"
             FROM
               inventories i