@things-factory/sales-base 4.1.38 → 4.2.0

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

@@ -263,6 +263,7 @@ export class ReleaseGoodQuery {
       const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
       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')
 
       if (await checkUserBelongsDomain(domain, user)) {
         if (!statusFilter && !params.filters.some(e => e.name === 'name')) {
@@ -288,6 +289,15 @@ export class ReleaseGoodQuery {
         params.filters = params.filters.filter(param => param.name !== 'sku')
       }
 
+      if (routeId) {
+        if (routeId.value == true) {
+          params.filters.find(param => param.name === 'routeId').value = 'null'
+        } else {
+          params.filters.find(param => param.name === 'routeId').operator = 'is_null'
+          params.filters.find(param => param.name === 'routeId').value = null
+        }
+      }
+
       const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate')
       if (fromDateParamIdx >= 0) {
         let fromDateVal = new Date(params.filters[fromDateParamIdx].value)
@@ -389,9 +399,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
@@ -812,9 +826,7 @@ function _extractData(rawData, validatedData) {
   })
 }
 
-function getConditionValues(
-  conditions: Filter[]
-): {
+function getConditionValues(conditions: Filter[]): {
   batchId?: string
   containerNo?: string
   product?: string[]

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

@@ -347,6 +347,18 @@ export class NewReleaseGood {
 
   @Field({ nullable: true })
   errorMsg: string
+
+  @Field({ nullable: true })
+  storeName: string
+
+  @Field({ nullable: true })
+  storeId: string
+
+  @Field({ nullable: true })
+  routeId: string
+
+  @Field({ nullable: true })
+  stopId: string
 }
 
 @InputType()
@@ -503,4 +515,16 @@ export class ReleaseGoodPatch {
 
   @Field({ nullable: true })
   description: string
+
+  @Field({ nullable: true })
+  storeName: string
+
+  @Field({ nullable: true })
+  storeId: string
+
+  @Field({ nullable: true })
+  routeId: string
+
+  @Field({ nullable: true })
+  stopId: string
 }

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

@@ -389,4 +389,20 @@ export class ReleaseGood {
 
   @Field({ nullable: true })
   errorMsg: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  storeId: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  storeName: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  routeId: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  stopId: string
 }