@things-factory/sales-base 4.3.0 → 4.4.0-alpha.0

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

@@ -264,7 +264,6 @@ export class ReleaseGoodQuery {
       const noOfItemsFilter = params.filters.find(param => param.name === 'noOfItems')
       const skuFilter = params.filters.find(param => param.name === 'sku')
       const routeId = params.filters.find(param => param.name === 'routeId')
-      const orderRemarkFilter = params.filters.find(param => param.name === 'orderRemark')
 
       if (await checkUserBelongsDomain(domain, user)) {
         if (!statusFilter && !params.filters.some(e => e.name === 'name')) {
@@ -299,27 +298,6 @@ export class ReleaseGoodQuery {
         }
       }
 
-      if (orderRemarkFilter) {
-        const orderRemarkIdx = params.filters.findIndex(param => param.name === 'orderRemark')
-        if (orderRemarkFilter.value == true) {
-          params.filters.splice(orderRemarkIdx, 1)
-          params.filters.push({
-            name: 'remark',
-            operator: 'is_not_null',
-            value: null,
-            relation: false
-          })
-        } else {
-          params.filters.splice(orderRemarkIdx, 1)
-          params.filters.push({
-            name: 'remark',
-            operator: 'is_null',
-            value: null,
-            relation: false
-          })
-        }
-      }
-
       const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
       if (fromDateParamIdx >= 0) {
         let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
@@ -400,14 +378,7 @@ export class ReleaseGoodQuery {
 
       qb.orderBy(sort)
 
-      let [items, total] = await qb.getManyAndCount()
-
-      items = items.map(item => {
-        return {
-          ...item,
-          orderRemark: item?.remark ? true : false
-        }
-      })
+      const [items, total] = await qb.getManyAndCount()
 
       return { items, total }
     } catch (error) {
@@ -467,24 +438,27 @@ export class ReleaseGoodQuery {
         ${batchId ? `AND LOWER(${INV_ALIAS}.batch_id) LIKE '%${batchId.toLowerCase()}%'` : ''}
         ${packingType ? `AND LOWER(${INV_ALIAS}.packing_type) LIKE '%${packingType.toLowerCase()}%'` : ''}
         ${containerNo ? `AND LOWER(${GAN_ALIAS}.container_no) LIKE '%${containerNo.toLowerCase()}%'` : ''}
-        ${product?.length > 0 && product[0]
-        ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => `'${id}'`).join(', ')})`
-        : product[0] === null
-          ? `AND ${PROD_ALIAS}.id isnull`
-          : ''
-      }
-        ${inventory?.length > 0
-        ? `
-              AND (${INV_ALIAS}.batch_id, ${PROD_ALIAS}.id) ${filters.find((filter: { name: string; operator: string; value: any }) => filter.name === 'inventory')
-          .operator
-        } (
+        ${
+          product?.length > 0 && product[0]
+            ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => `'${id}'`).join(', ')})`
+            : product[0] === null
+            ? `AND ${PROD_ALIAS}.id isnull`
+            : ''
+        }
+        ${
+          inventory?.length > 0
+            ? `
+              AND (${INV_ALIAS}.batch_id, ${PROD_ALIAS}.id) ${
+                filters.find((filter: { name: string; operator: string; value: any }) => filter.name === 'inventory')
+                  .operator
+              } (
                 ${inventory
-          .map((inv: { batchId: string; productId: string }) => `('${inv.batchId}', '${inv.productId}')`)
-          .join(', ')}
+                  .map((inv: { batchId: string; productId: string }) => `('${inv.batchId}', '${inv.productId}')`)
+                  .join(', ')}
               )
             `
-        : ''
-      }
+            : ''
+        }
     `
 
     // ${product?.length > 0 ? `AND ${PROD_ALIAS}.id IN (${product.map((id: string) => id ? `'${id}'` : null).join(', ')})` : ''}
@@ -658,8 +632,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
         packing_type: raw.packingType,
         packing_size: raw.packingSize,
         uom: raw.uom,
-        releaseQty: raw.releaseQty,
-        release_qty: raw.releaseQty,
+        release_qty: raw.releaseQty
       }
     })
   )
@@ -839,16 +812,16 @@ function _extractData(rawData, validatedData) {
         !raw.productId || !raw.productDetailId
           ? 'inventory or product not found'
           : raw.releaseQty <= 0
-            ? 'invalid release qty'
-            : raw.assignedQty < raw.releaseQty
-              ? 'insufficient stock'
-              : raw.releaseDate == ''
-                ? 'release date is empty'
-                : releaseDate < _getStdDateStr(new Date())
-                  ? 'backdate is not allowed'
-                  : !raw.refNo
-                    ? 'ref no is empty'
-                    : ''
+          ? 'invalid release qty'
+          : raw.assignedQty < raw.releaseQty
+          ? 'insufficient stock'
+          : raw.releaseDate == ''
+          ? 'release date is empty'
+          : releaseDate < _getStdDateStr(new Date())
+          ? 'backdate is not allowed'
+          : !raw.refNo
+          ? 'ref no is empty'
+          : ''
     }
   })
 }

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

@@ -28,29 +28,25 @@ import {
   OrderProduct,
   OrderVas,
   ShippingOrder,
-  ShippingOrderInfo,
+  ShippingOrderInfo
 } from '../'
 
-import { ReleaseOrderType } from '../../constants'
-
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
 
-// export enum ReleaseOrderType {
-//   B2B = 'b2b',
-//   B2C = 'b2c'
-// }
+export enum ReleaseOrderType {
+  B2B = 'b2b',
+  B2C = 'b2c'
+}
 
 export enum DispatchmentStatus {
   READY_TO_DISPATCH = 'READY_TO_DISPATCH',
   DISPATCHED = 'DISPATCHED'
 }
-
 @Entity()
 @Index('ix_release-good_0', (releaseGood: ReleaseGood) => [releaseGood.domain, releaseGood.name], { unique: true })
 @Index('ix_release-good_1', (releaseGood: ReleaseGood) => [releaseGood.domain, releaseGood.refNo])
 @Index('ix_release-good_2', (releaseGood: ReleaseGood) => [releaseGood.domain, releaseGood.refNo2])
-@Index('ix_release-good_3', (releaseGood: ReleaseGood) => [releaseGood.domain, releaseGood.remark])
 @ObjectType()
 export class ReleaseGood {
   @PrimaryGeneratedColumn('uuid')
@@ -96,8 +92,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
   })
@@ -164,8 +160,8 @@ 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
   })
@@ -310,18 +306,6 @@ export class ReleaseGood {
   @Field()
   updatedAt: Date
 
-  @ManyToOne(type => User)
-  @Field(type => User, { nullable: true })
-  checkedRemarkUser: User
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  checkedRemarkBy: string
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  checkedRemarkAt: Date
-
   @ManyToOne(type => User)
   @Field(type => User, { nullable: true })
   acceptedBy: User
@@ -421,7 +405,4 @@ export class ReleaseGood {
   @Column({ nullable: true })
   @Field({ nullable: true })
   stopId: string
-
-  @Field({ nullable: true })
-  orderRemark: Boolean
 }