@things-factory/sales-base 4.2.12 → 4.3.0

package/server/service/order-tote-seal/order-tote-seal.ts

@@ -0,0 +1,46 @@
+import { Field, ObjectType } from 'type-graphql'
+import { Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+import { OrderTote } from '../order-tote/order-tote'
+
+@Entity()
+@Index('ix_order_tote_seal_0', (orderToteSeal: OrderToteSeal) => [orderToteSeal.name], { unique: true })
+@ObjectType()
+export class OrderToteSeal {
+  @PrimaryGeneratedColumn('uuid')
+  @Field()
+  id: string
+
+  @ManyToOne(type => Domain)
+  @Field()
+  domain: Domain
+
+  @RelationId((orderToteSeal: OrderToteSeal) => orderToteSeal.domain)
+  domainId: string
+
+  @Column()
+  @Field()
+  name: string
+
+  @ManyToOne(type => OrderTote)
+  @Field(type => OrderTote, { nullable: true })
+  orderTote?: OrderTote
+
+  @RelationId((orderToteSeal: OrderToteSeal) => orderToteSeal.orderTote)
+  orderToteId: string
+
+  @UpdateDateColumn()
+  @Field({ nullable: true })
+  updatedAt: Date
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  @Field({ nullable: true })
+  updater: User
+
+  @RelationId((orderToteSeal: OrderToteSeal) => orderToteSeal.updater)
+  updaterId: string
+}

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

@@ -20,6 +20,41 @@ import { InventoryUtil } from '../../utils'
 
 @Resolver()
 export class OtherQuery {
+  @Directive('@privilege(category: "inventory", privilege: "query")')
+  @Directive('@transaction')
+  @Query(returns => InventoryProductGroupList)
+  async allBizplaceProductInventory(@Ctx() context: any, @Args() params: ListParam): Promise<InventoryProductGroupList> {
+    const { domain, user, tx, bizplace }: { domain: Domain; user: User; tx: EntityManager; bizplace: Bizplace } =
+      context.state
+
+    let permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
+
+    let bizplaceId: any = params.filters.find(filter => filter.name === 'bizplace_id').value
+    let foundPermittedBizplace: Bizplace
+    let companyBizplace: Bizplace
+
+    if (bizplaceId) {
+      foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == bizplaceId)
+
+      if (foundPermittedBizplace) {
+        if (!foundPermittedBizplace.company?.id) {
+          foundPermittedBizplace = await tx.getRepository(Bizplace).findOne(foundPermittedBizplace.id, {
+            relations: ['company', 'company.domain']
+          })
+        }
+        const companyDomain: Domain = foundPermittedBizplace.company.domain
+        companyBizplace = await tx.getRepository(Bizplace).findOne({ where: { domain: companyDomain } })
+      }
+    }
+
+    const bizplaces: Bizplace[] = [foundPermittedBizplace, companyBizplace]
+    if (bizplace) bizplaces.push(bizplace)
+
+    const { items, total } = await InventoryUtil.bizplaceProductInventory(bizplaces, params, context, tx)
+
+    return { items, total }
+  }
+
   @Directive('@privilege(category: "inventory", privilege: "query")')
   @Directive('@transaction')
   @Query(returns => InventoryProductGroupList)
@@ -165,11 +200,11 @@ export class OtherQuery {
         inventory:
           total > 0
             ? {
-                ...items[0],
-                remainQty: total > 0 ? items[0].remainQty : null,
-                remainUomValue: total > 0 ? items[0].remainUomValue : null,
-                remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : ''
-              }
+              ...items[0],
+              remainQty: total > 0 ? items[0].remainQty : null,
+              remainUomValue: total > 0 ? items[0].remainUomValue : null,
+              remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : ''
+            }
             : null,
         productId: total > 0 ? items[0].productId : null,
         productSKU: total > 0 ? items[0].productSKU : orderInventory.productSKU,
@@ -304,7 +339,7 @@ export class OtherQuery {
         let productDetail: ProductDetail
         const hasConditions: boolean = Boolean(
           (orderProduct?.packingType && orderProduct?.packingType.trim() != '') ||
-            (orderProduct?.uom && orderProduct?.uom.trim() != '')
+          (orderProduct?.uom && orderProduct?.uom.trim() != '')
         )
         let productDetailCondition: any = { product: foundProduct }
 
@@ -327,8 +362,8 @@ export class OtherQuery {
               ? productDetail.uomValue
               : null
             : orderProduct?.uomValue
-            ? orderProduct.uomValue
-            : productDetail.uomValue
+              ? orderProduct.uomValue
+              : productDetail.uomValue
 
         newOrderProduct = {
           ...orderProduct,

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

@@ -134,7 +134,7 @@ export class ReleaseGoodMutation {
           context,
           tx
         )
-      } catch (error) {}
+      } catch (error) { }
 
     if (errorsCaught.length)
       throw new ValidationError({
@@ -226,7 +226,8 @@ export class ReleaseGoodMutation {
 
     foundReleaseGood = await tx.getRepository(ReleaseGood).save({
       ...foundReleaseGood,
-      ...releaseGood
+      ...releaseGood,
+      remark: releaseGood?.remark ? releaseGood.remark : null
     })
 
     return foundReleaseGood
@@ -300,6 +301,27 @@ export class ReleaseGoodMutation {
 
     return receivedRO
   }
+
+  @Directive('@privilege(category: "order_customer", privilege: "mutation")')
+  @Directive('@transaction')
+  @Mutation(returns => Boolean)
+  async executeOrderRemark(@Arg('releaseGoodNo') releaseGoodNo: string, @Ctx() context: any): Promise<boolean> {
+    const { domain, tx, user } = context.state
+
+    await tx.getRepository(ReleaseGood).update(
+      {
+        domain,
+        name: releaseGoodNo
+      },
+      {
+        checkedRemarkAt: new Date(),
+        checkedRemarkUser: user,
+        checkedRemarkBy: user.name
+      }
+    )
+
+    return true
+  }
 }
 
 export async function deleteReleaseGood(tx: EntityManager, name: string, user: User, domain: Domain): Promise<boolean> {

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

@@ -264,6 +264,7 @@ 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')) {
@@ -298,6 +299,27 @@ 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)
@@ -378,7 +400,14 @@ export class ReleaseGoodQuery {
 
       qb.orderBy(sort)
 
-      const [items, total] = await qb.getManyAndCount()
+      let [items, total] = await qb.getManyAndCount()
+
+      items = items.map(item => {
+        return {
+          ...item,
+          orderRemark: item?.remark ? true : false
+        }
+      })
 
       return { items, total }
     } catch (error) {
@@ -438,27 +467,24 @@ 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(', ')})` : ''}
@@ -632,7 +658,8 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
         packing_type: raw.packingType,
         packing_size: raw.packingSize,
         uom: raw.uom,
-        release_qty: raw.releaseQty
+        releaseQty: raw.releaseQty,
+        release_qty: raw.releaseQty,
       }
     })
   )
@@ -812,16 +839,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,25 +28,29 @@ 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')
@@ -92,8 +96,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
   })
@@ -160,8 +164,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
   })
@@ -306,6 +310,18 @@ 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
@@ -405,4 +421,7 @@ export class ReleaseGood {
   @Column({ nullable: true })
   @Field({ nullable: true })
   stopId: string
+
+  @Field({ nullable: true })
+  orderRemark: Boolean
 }