@things-factory/sales-base 4.3.656 → 4.3.660

package/server/service/arrival-notice/arrival-notice-query.ts

@@ -51,7 +51,7 @@ export class ArrivalNoticeQuery {
     //separate query to improve typeorm mapping performance. Search for Related Order Product
     let orderProducts = await getRepository(OrderProduct).find({
       where: { arrivalNotice: foundGAN },
-      relations: ['product', 'productDetail', 'productDetail.productBarcodes']
+      relations: ['product', 'productDetail', 'productDetail.productBarcodes', 'warehouse', 'location', 'adjustedWarehouse','adjustedLocation']
     })
     foundGAN.orderProducts = await Promise.all(
       orderProducts.map(async orderProduct => {
@@ -59,6 +59,10 @@ export class ArrivalNoticeQuery {
         orderProduct.adjustedUnitPrice = orderProduct?.adjustedUnitPrice
           ? parseFloat(orderProduct.adjustedUnitPrice.toFixed(2))
           : null
+        orderProduct.warehouse = orderProduct?.warehouse
+        orderProduct.location = orderProduct?.location
+        orderProduct.adjustedWarehouse = orderProduct?.adjustedWarehouse
+        orderProduct.adjustedLocation = orderProduct?.adjustedLocation
         return orderProduct
       })
     )

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

@@ -4,6 +4,8 @@ import { ObjectRef, ScalarDate } from '@things-factory/shell'
 
 import { OrderProduct } from './order-product'
 
+import { Warehouse, Location } from '@things-factory/warehouse-base'
+
 @ObjectType()
 export class OrderProductList {
   @Field(type => [OrderProduct], { nullable: true })
@@ -197,6 +199,25 @@ export class OrderProductPatch {
 
   @Field({ nullable: true })
   cuFlag: string
+
+  @Field(type => ScalarDate, { nullable: true })
+  expDate: Date
+
+  @Field(type =>ScalarDate, { nullable: true })
+  adjustedExpDate: Date
+
+  @Field(type => ObjectRef, { nullable: true })
+  warehouse: ObjectRef
+
+  @Field(type => ObjectRef, { nullable: true })
+  location: ObjectRef
+
+  @Field(type => ObjectRef, { nullable: true })
+  adjustedWarehouse: ObjectRef
+
+  @Field(type => ObjectRef, { nullable: true })
+  adjustedLocation: ObjectRef
+
 }
 
 @InputType()
@@ -342,6 +363,12 @@ export class NewOrderProduct {
   @Field({ nullable: true })
   status: string
 
+  @Field(type => ScalarDate, { nullable: true })
+  expDate: Date
+
+  @Field(type => ScalarDate, { nullable: true })
+  adjustedExpDate: Date
+
   @Field(type => ScalarDate, { nullable: true })
   manufactureDate: Date
 
@@ -350,4 +377,22 @@ export class NewOrderProduct {
 
   @Field(type => Float, { nullable: true })
   paidAmount: number
+
+  @Field(type => ObjectRef, { nullable: true })
+  warehouse: ObjectRef
+
+  @Field(type => ObjectRef, { nullable: true })
+  adjustedWarehouse: ObjectRef
+
+  @Field(type => String, { nullable: true })
+  warehouseName: String
+
+  @Field(type => ObjectRef, { nullable: true })
+  location: ObjectRef
+
+  @Field(type => ObjectRef, { nullable: true })
+  adjustedLocation: ObjectRef
+
+  @Field(type => String, { nullable: true })
+  locationName: String
 }

package/server/service/order-product/order-product.ts

@@ -15,7 +15,7 @@ import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Product, ProductBundle, ProductDetail } from '@things-factory/product-base'
 import { Domain, ScalarDate } from '@things-factory/shell'
-import { Inventory } from '@things-factory/warehouse-base'
+import { Inventory, Warehouse, Location } from '@things-factory/warehouse-base'
 
 import { ArrivalNotice } from '../arrival-notice/arrival-notice'
 import { CollectionOrder } from '../collection-order/collection-order'
@@ -238,6 +238,42 @@ export class OrderProduct {
   @Field(type => ScalarDate, { nullable: true })
   manufactureDate: Date
 
+  @Column('date', { nullable: true })
+  @Field(type => ScalarDate, { nullable: true })
+  expDate: Date
+
+  @Column('date', { nullable: true })
+  @Field( type => ScalarDate, { nullable: true })
+  adjustedExpDate: Date
+
+  @ManyToOne(type => Warehouse, { nullable: true })
+  @Field(type => Warehouse, { nullable: true })
+  warehouse: Warehouse
+
+  @RelationId((orderProduct: OrderProduct) => orderProduct.warehouse)
+  warehouseId: string
+
+  @ManyToOne(type=> Warehouse, { nullable: true })
+  @Field(type=> Warehouse, { nullable: true })
+  adjustedWarehouse: Warehouse
+
+  @RelationId((orderProduct: OrderProduct) => orderProduct.adjustedWarehouse)
+  adjustedWarehouseId: string
+  
+  @ManyToOne(type => Location, { nullable: true })
+  @Field(type => Location, { nullable: true })
+  location: Location
+
+  @RelationId((orderProduct: OrderProduct) => orderProduct.location)
+  locationId: string
+
+  @ManyToOne(type => Location, { nullable: true })
+  @Field(type => Location, { nullable: true })
+  adjustedLocation: Location
+
+  @RelationId((orderProduct: OrderProduct) => orderProduct.adjustedLocation)
+  adjustedLocationId: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   uom: string

package/server/service/others/other-query.ts

@@ -18,6 +18,7 @@ import {
   OrderProduct
 } from '../'
 import { InventoryUtil } from '../../utils'
+import { Location } from '@things-factory/warehouse-base'
 
 @Resolver()
 export class OtherQuery {
@@ -292,8 +293,8 @@ export class OtherQuery {
   @Query(returns => [InventoryProductGroup])
   async bulkUploadValidateOrderProducts(
     @Ctx() context: any,
-    @Arg('partnerBizplaceId') partnerBizplaceId: string,
-    @Arg('orderProducts', type => [NewOrderProduct], { nullable: true }) orderProducts: NewOrderProduct[]
+    @Arg('orderProducts', type => [NewOrderProduct], { nullable: true }) orderProducts: NewOrderProduct[],
+    @Arg('partnerBizplaceId', { nullable: true }) partnerBizplaceId?: string
   ): Promise<OrderProduct[]> {
     try {
       const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
@@ -334,8 +335,16 @@ export class OtherQuery {
 
       if (partnerStrictProductSelectionSetting) strictProduct = partnerStrictProductSelectionSetting.value
 
+      const directGanOrderSetting: Setting = await tx.getRepository(Setting).findOne({
+        where: { domain, category: 'id-rule', name: 'enable-direct-gan-order' }
+      })
+
+      let directGanOrder = 'false'
+      if (directGanOrderSetting) directGanOrder = directGanOrderSetting.value
+
       const json_op = JSON.stringify(
         orderProducts.map(orderProduct => {
+          
           return {
             sku: orderProduct.productSKU,
             packing_type: orderProduct.packingType,
@@ -348,7 +357,12 @@ export class OtherQuery {
             uom_value: orderProduct.uomValue,
             manufacture_date: orderProduct.manufactureDate,
             batch_id_ref: orderProduct.batchIdRef,
-            remark: orderProduct.remark
+            remark: orderProduct.remark,
+            ...(directGanOrder && {
+              warehouse_name: orderProduct.warehouseName,
+              location_name: orderProduct.location ? orderProduct.location.name : orderProduct.locationName,
+              location_id: orderProduct.location? orderProduct.location.id : ''
+            })
           }
         })
       )
@@ -366,6 +380,13 @@ export class OtherQuery {
             uom VARCHAR(10),
             uom_value FLOAT,
             manufacture_date DATE,
+            ${
+              directGanOrder.toLocaleLowerCase() === 'true'
+                ? `warehouse_name VARCHAR(150),
+              location_name VARCHAR(150),
+              location_id VARCHAR(150),`
+                : ``
+            }
             batch_id_ref VARCHAR(50),
             remark VARCHAR(50)
           );
@@ -380,6 +401,61 @@ export class OtherQuery {
         [json_op]
       )
 
+      //validate and show error message in popup
+      if (directGanOrder && partnerBizplaceId == undefined) {
+        let results = await tx.query(
+          `
+          SELECT
+          rop.*,
+              TRIM(BOTH ' | ' FROM -- Trim leading/trailing ' | ' from the concatenated error messages
+                  COALESCE(CASE WHEN p.sku IS NULL THEN 'Invalid SKU or Packing Type | ' ELSE '' END, '') ||
+                  COALESCE(CASE WHEN pd.uom IS NULL THEN 'Invalid UOM or UOM Value | ' ELSE '' END, '') ||
+                  COALESCE(CASE WHEN rop.manufacture_date > CURRENT_DATE THEN 'Manufacture Date in Future | ' ELSE '' END, '') ||
+                  COALESCE(CASE WHEN rop.unit_price <= 0 THEN 'Unit Price must be greater than 0 | ' ELSE '' END, '') ||
+                  COALESCE(CASE WHEN rop.pack_qty <= 0 THEN 'Pack Quantity must be greater than 0 | ' ELSE '' END, '') ||
+                  COALESCE(CASE WHEN rop.pallet_qty < 0 THEN 'Pallet Quantity must be positive | ' ELSE '' END, '') ||
+                  COALESCE(CASE WHEN w.name IS NULL THEN 'Location not found in Master Data | ' ELSE '' END, '') ||
+                  COALESCE(CASE WHEN l.name IS NULL OR l.warehouse_id IS DISTINCT FROM w.id THEN 'Location-Warehouse Mismatch | ' ELSE '' END, '')
+              ) AS error_message -- The new column containing concatenated error messages
+          FROM
+              raw_order_products rop
+          LEFT JOIN
+              products p ON LOWER(rop.sku) = LOWER(p.sku) AND rop.packing_type = p.packing_type
+          LEFT JOIN
+              product_details pd ON pd.product_id = p.id AND rop.uom = pd.uom AND rop.uom_value = pd.uom_value
+          LEFT JOIN
+              warehouses w ON rop.warehouse_name = w.name and w.domain_id = $1
+          LEFT JOIN
+              locations l ON l.warehouse_id = w.id AND rop.location_name = l.name
+          `,
+          [domain.id]
+        )
+
+        await tx.query(`DROP TABLE raw_order_products`)
+
+        const newOrderProducts: any[] = results.map(result => {
+          return {
+            // Remapping keys to the new spelling
+            packingType: result.packing_type,
+            uom: result.uom,
+            uomValue: result.uom_value,
+            packQty: result.pack_qty,
+            palletQty: result.pallet_qty,
+            manufactureDate: result.manufacture_date,
+            batchId: result.batch_id,
+            batchIdRef: result.batch_id_ref,
+            unitPrice: result.unit_price,
+            remark: result.remark,
+            productSKU: result.sku, // 'sku' from results maps to 'productSKU'
+            errMsg: result.error_message, // 'error_message' from results maps to 'errMsg'
+            pallet_id: result.pallet_id, // Keeping original key for pallet_id as it's not in new key spelling list
+            warehouseName: result.warehouse_name,
+            location: {name:result.location_name, id:result.location_id }
+          }
+        })
+
+        return newOrderProducts
+      }
       // find closest matching product details from input data
       await tx.query(
         `
@@ -450,6 +526,24 @@ export class OtherQuery {
       await tx.query(`DROP TABLE matching_product_details`)
       await tx.query(`DROP TABLE raw_order_products`)
 
+      if (directGanOrder == 'true') {
+        let location: Location
+        for (let i = 0; i < results.length; i++) {  
+          location = await tx.getRepository(Location).findOne({
+            where: {
+              domain: domain,
+              name: orderProducts[i].location.name
+            },
+            relations: ['warehouse']
+          })      
+          results[i].location = location
+          results[i].warehouse = location.warehouse
+          if (!location) {
+            throw new Error(`Location not found for ${orderProducts[i]?.location?.name} `)
+          }
+        }
+      }
+
       // build output structure
       const newOrderProducts: any[] = results.map(result => {
         return {

package/server/service/others/other-types.ts

@@ -1,5 +1,7 @@
 import { Field, Float, Int, ObjectType } from 'type-graphql'
 import { Product, ProductDetail } from '@things-factory/product-base'
+import { Location, Warehouse } from '@things-factory/warehouse-base'
+
 import { ScalarDate } from '@things-factory/shell'
 
 @ObjectType()
@@ -120,4 +122,16 @@ export class InventoryProductGroup {
 
   @Field(type => ProductDetail, { nullable: true })
   productDetail: ProductDetail
+
+  @Field(type => Location, { nullable: true })
+  location: Location
+
+   @Field(type => Warehouse, { nullable: true })
+  warehouse: Warehouse
+
+  @Field(type => String, { nullable: true })
+  warehouseName: String
+
+  @Field(type => String, { nullable: true })
+  errMsg: String
 }

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

@@ -1048,6 +1048,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
         AND i.domain_id = $1
         AND i.bizplace_id = $2
         WHERE l.type NOT IN ($3, $4)
+        AND i.status = 'STORED'
         AND i.obsolete = false
         AND i.transfer_qty <= 0
         AND i.transfer_uom_value <= 0