@things-factory/sales-base 4.3.60 → 4.3.64

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

@@ -30,7 +30,6 @@ import {
   ShippingOrder,
   ShippingOrderInfo
 } from '../'
-
 import { ReleaseOrderType } from '../../constants'
 
 const ORMCONFIG = config.get('ormconfig', {})
@@ -96,8 +95,8 @@ export class ReleaseGood {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-        ? 'varchar2'
-        : 'smallint',
+          ? 'varchar2'
+          : 'smallint',
     enum: ReleaseOrderType,
     default: ReleaseOrderType.B2B
   })
@@ -124,6 +123,10 @@ export class ReleaseGood {
   @Field()
   crossDocking: Boolean
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  orderMethod: string
+
   @ManyToOne(type => ArrivalNotice)
   @Field(type => ArrivalNotice, { nullable: true })
   arrivalNotice: ArrivalNotice
@@ -164,16 +167,14 @@ export class ReleaseGood {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-        ? 'varchar2'
-        : 'smallint',
+          ? 'varchar2'
+          : 'smallint',
     enum: DispatchmentStatus,
     default: DispatchmentStatus.READY_TO_DISPATCH
   })
   dispatchmentStatus: DispatchmentStatus
 
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  releaseDateTime: Date
+
 
   @Column({ nullable: true })
   @Field({ nullable: true })
@@ -311,6 +312,10 @@ export class ReleaseGood {
   @Field({ nullable: true })
   invoice: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  recall: boolean
+
   @Column({ nullable: true })
   bundleInfo: string
 
@@ -438,6 +443,17 @@ export class ReleaseGood {
   @Field({ nullable: true })
   stopId: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  manifestedAt: Date
+
+  @ManyToOne(type => User)
+  @Field(type => User, { nullable: true })
+  manifestedBy: User
+
+  @RelationId((releaseGood: ReleaseGood) => releaseGood.manifestedBy)
+  manifestedById: string
+
   @Field({ nullable: true })
   orderRemark: Boolean
 

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

@@ -54,21 +54,36 @@ export class ShippingOrderPatch {
   @Field({ nullable: true })
   containerNo: string
 
+  @Field({ nullable: true })
+  containerSize: string
+
   @Field({ nullable: true })
   containerArrivalDate: string
 
   @Field({ nullable: true })
   containerLeavingDate: string
 
+  @Field({ nullable: true })
+  containerClosureDate: string
+
   @Field({ nullable: true })
   containerArrivalDateTime: string
 
   @Field({ nullable: true })
-  containerLeavingDateTime: string
+  containerLeavingDateTime: Date
+
+  @Field({ nullable: true })
+  containerClosureDateTime: Date
 
   @Field({ nullable: true })
   remark: string
 
+  @Field({ nullable: true })
+  exportRemark: string
+
   @Field({ nullable: true })
   status: string
+
+  @Field({ nullable: true })
+  remindContainerDeparture: boolean
 }

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

@@ -41,14 +41,18 @@ export class ShippingOrder {
   @Field()
   name: string
 
-  @Column()
-  @Field()
+  @Column({ nullable: true })
+  @Field({ nullable: true })
   shipName: string
 
   @Column()
   @Field()
   containerNo: string
 
+  @Column({ nullable: true })
+  @Field()
+  containerSize: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   containerArrivalDate: string
@@ -65,6 +69,18 @@ export class ShippingOrder {
   @Field({ nullable: true })
   containerLeavingDateTime: Date
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  containerClosureDate: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  containerClosureDateTime: Date
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  remindContainerDeparture: boolean
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   from: string

package/server/utils/inventory-util.ts

@@ -127,16 +127,15 @@ export const InventoryUtil = {
             ) bp on i.product_id = bp.product_id
             WHERE p.bizplace_id IN (${bizplaceIds})
               ${productDetailWhereClause}
-              ${
-                productFilter
-                  ? `AND (
+              ${productFilter
+          ? `AND (
                 lower(p.sku) ilike '${productFilter.value}'
                 OR lower(p.name) ilike '${productFilter.value}'
                 OR lower(p.description) ilike '${productFilter.value}'
               )
             `
-                  : ``
-              }
+          : ``
+        }
             GROUP BY
               p.id,
               pd.packing_type,
@@ -165,16 +164,15 @@ export const InventoryUtil = {
             ) pbs ON pbs.product_bundle_id = pb.id
             ${bundleWhereClause}
             AND pb.bizplace_id IN (${bizplaceIds}) 
-            ${
-              productFilter
-                ? `AND (
+            ${productFilter
+          ? `AND (
               lower(pb.sku) ilike '${productFilter.value}'
               OR lower(pb.name) ilike '${productFilter.value}'
               OR lower(pb.description) ilike '${productFilter.value}'
               )
             `
-                : ``
-            }
+          : ``
+        }
             GROUP BY 
               pb.packing_type, 
               pb.packing_size, 
@@ -227,6 +225,8 @@ export const InventoryUtil = {
         trxMgr
       )
 
+      const _groupType = filters.find(res => res.name == 'groupType')
+
       let queryStrings = `
         CREATE TEMP TABLE temp_inventory_product_group AS (
           SELECT * FROM (
@@ -324,18 +324,48 @@ export const InventoryUtil = {
         )
       `
 
+      let filterGroupTypeQuery
+
+      if (_groupType) {
+        if (_groupType.value === 'SINGLE') {
+          filterGroupTypeQuery = `where "groupType"= 'SINGLE' `
+        } else {
+          filterGroupTypeQuery = `where "groupType"= 'BUNDLE' `
+        }
+      }
+
+      let sortingArr = params.sortings || []
+
+      let sortedBy = []
+
+      if (sortingArr.length > 0) {
+        sortingArr.forEach(element => {
+          if (element.desc) {
+            sortedBy.push(`"${element.name}" DESC `)
+          } else {
+            sortedBy.push(`"${element.name}" `)
+          }
+        })
+      }
+
       await trxMgr.query(queryStrings, [domain.id])
 
-      const [{ total }]: any = await trxMgr.query(`select count(*) as total from temp_inventory_product_group`)
+      const [{ total }]: any = await trxMgr.query(
+        `select count(*) as total from temp_inventory_product_group ${filterGroupTypeQuery ? filterGroupTypeQuery : ''}`
+      )
       let items: any[] = []
 
       if (params?.pagination) {
-        items = await trxMgr.query(`select * from temp_inventory_product_group OFFSET $1 LIMIT $2`, [
-          (params.pagination.page - 1) * params.pagination.limit,
-          params.pagination.limit
-        ])
+        items = await trxMgr.query(
+          `select * from temp_inventory_product_group  ${filterGroupTypeQuery ? filterGroupTypeQuery : ''} ${sortingArr.length > 0 ? ' Order by ' + sortedBy.toString() : ''
+          } OFFSET $1 LIMIT $2`,
+          [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit]
+        )
       } else {
-        items = await trxMgr.query(`select * from temp_inventory_product_group`)
+        items = await trxMgr.query(
+          `select * from temp_inventory_product_group ${filterGroupTypeQuery ? filterGroupTypeQuery : ''} ${sortingArr.length > 0 ? ' Order by ' + sortedBy.toString() : ''
+          }`
+        )
       }
 
       await trxMgr.query(`drop table temp_inventory_product_group`)
@@ -551,7 +581,8 @@ export const InventoryUtil = {
     locationSortingRules: any = [],
     customerBizplace: Bizplace,
     domain: Domain,
-    trxMgr: EntityManager
+    trxMgr: EntityManager,
+    batchId?: string
   ): Promise<OrderInventory[]> {
     let qb: SelectQueryBuilder<Inventory> = trxMgr.getRepository(Inventory).createQueryBuilder('iv')
     qb.leftJoinAndSelect('iv.location', 'loc')
@@ -571,30 +602,50 @@ export const InventoryUtil = {
         locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
       })
 
-    if (locationSortingRules?.length) {
-      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 {
-      switch (product?.pickingStrategy) {
-        case 'FIFO':
-          qb.addOrderBy('"iv"."created_at"', 'ASC')
-          break
-        case 'FEFO':
-          qb.addOrderBy('"iv"."expiration_date"', 'ASC')
-          break
-        case 'LIFO':
-          qb.addOrderBy('"iv"."created_at"', 'DESC')
-          break
-        case 'FMFO':
-          qb.addOrderBy('"iv"."manufacture_date"', 'ASC')
-          break
-        default:
-          qb.addOrderBy('"iv"."created_at"', 'ASC')
-          break
+    if (batchId) {
+      qb.andWhere('"iv"."batch_id" = :batchId', { batchId: batchId })
+    }
+
+    let locationSorting = function (qb: SelectQueryBuilder<Inventory>, locationSortingRules) {
+      if (locationSortingRules?.length) {
+        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('"loc"."name"', 'ASC')
+        qb.addOrderBy('"iv"."created_at"', 'ASC')
       }
+      return qb
+    }
+
+    switch (product?.pickingStrategy) {
+      case 'FIFO':
+        qb.addOrderBy('"iv"."created_at"', 'ASC')
+        qb = locationSorting(qb, locationSortingRules)
+        break
+      case 'LIFO':
+        qb.addOrderBy('"iv"."created_at"', 'DESC')
+        qb = locationSorting(qb, locationSortingRules)
+        break
+      case 'FEFO':
+        qb.addOrderBy('"iv"."expiration_date"', 'ASC')
+        qb.addOrderBy('"iv"."created_at"', 'ASC')
+        qb = locationSorting(qb, locationSortingRules)
+        break
+      case 'FMFO':
+        qb.addOrderBy('"iv"."manufacture_date"', 'ASC')
+        qb.addOrderBy('"iv"."created_at"', 'ASC')
+        qb = locationSorting(qb, locationSortingRules)
+        break
+      case 'LOCATION':
+        qb = locationSorting(qb, locationSortingRules)
+        break
+      default:
+        qb.addOrderBy('"iv"."created_at"', 'ASC')
+        qb = locationSorting(qb, locationSortingRules)
+        break
     }
 
     let inventories: Inventory[] = await qb.getMany()
@@ -709,6 +760,9 @@ async function getConditions(
             whereClause += `AND LOWER("productBrand") LIKE '${value.toLowerCase()}'`
             break
 
+          case 'productSKU':
+            whereClause += `AND LOWER("productSKU") LIKE '${value.toLowerCase()}'`
+
           case 'productName':
             const products: Product[] = await trxMgr.getRepository(Product).find({
               select: ['id'],
@@ -797,32 +851,31 @@ async function getConditions(
           case 'batch_product':
             productWhereClause += `
               AND (i.batch_id, p.id, i.packing_type, i.packing_size) ${operator === 'in' ? 'IN' : 'NOT IN'} (${value
-              .map(
-                (v: { batchId: string; productId: string; packingType: string; packingSize: string }) =>
-                  `('${v.batchId}', '${v.productId}', '${v.packingType}', '${v.packingSize}')`
-              )
-              .join()})
+                .map(
+                  (v: { batchId: string; productId: string; packingType: string; packingSize: string }) =>
+                    `('${v.batchId}', '${v.productId}', '${v.packingType}', '${v.packingSize}')`
+                )
+                .join()})
             `
             break
 
           case 'batch_bundle':
             bundleWhereClause += `
               ${bundleWhereClause == '' ? 'WHERE' : 'AND'} pb.id ${operator === 'in' ? 'IN' : 'NOT IN'} (${value
-              .map((v: { productId: string }) => `('${v.productId}')`)
-              .join()})
+                .map((v: { productId: string }) => `('${v.productId}')`)
+                .join()})
             `
             break
 
           case 'product':
             productDetailWhereClause += `
-              AND (pd.product_id, pd.packing_type, pd.packing_size, pd.uom) ${
-                operator === 'in' ? 'IN' : 'NOT IN'
+              AND (pd.product_id, pd.packing_type, pd.packing_size, pd.uom) ${operator === 'in' ? 'IN' : 'NOT IN'
               } (${value
-              .map(
-                (v: { productId: string; packingType: string; packingSize: string; uom: string }) =>
-                  `('${v.productId}', '${v.packingType}', '${v.packingSize}', '${v.uom}')`
-              )
-              .join()})
+                .map(
+                  (v: { productId: string; packingType: string; packingSize: string; uom: string }) =>
+                    `('${v.productId}', '${v.packingType}', '${v.packingSize}', '${v.uom}')`
+                )
+                .join()})
             `
             break
         }