@things-factory/sales-base 4.3.576 → 4.3.579

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

@@ -1,16 +1,16 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { EntityManager, getRepository, In, SelectQueryBuilder } from 'typeorm'
+import { EntityManager, getRepository, In, Raw, SelectQueryBuilder } from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
 import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
 import { Bizplace, getCompanyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { ProductDetail } from '@things-factory/product-base'
 import { buildQuery, Domain, ListParam } from '@things-factory/shell'
 
 import { ArrivalNoticeList, NewArrivalNotice, RawArrivalNotice } from '../'
 import { ATTACHMENT_TYPE, ORDER_STATUS } from '../../constants'
 import { OrderInventory, OrderProduct } from '../../service'
 import { ArrivalNotice } from './arrival-notice'
+import { Setting } from '@things-factory/setting-base'
 
 @Resolver(ArrivalNotice)
 export class ArrivalNoticeQuery {
@@ -365,11 +365,39 @@ export async function validateBulkArrivalNoticesFunction(
         uom: raw.uom || null,
         pack_qty: raw.packQty || null,
         pallet_qty: raw.palletQty || null,
+        pallet_id: raw.palletId || null,
         unit_price: raw.unitPrice === undefined ? (isNaN(raw.unitPrice) ? '' : null) : raw.unitPrice,
         manufacture_date: raw.manufactureDate || null
       }
     })
   )
+  
+  const enableLotIdInput: Setting = await trxMgr.getRepository(Setting).findOne({
+    where: { domain, category: 'id-rule', name: 'enable-lot-id-input' }
+  })
+
+  //check if palletId is entered but enablelotidinput setting is false
+  let lotIdInputSettingChecker = ''
+  if (rawArrivalNotices.some(record => record.palletId) && enableLotIdInput.value == 'false') {
+    lotIdInputSettingChecker = 'Please enable the setting to create orders with a custom Lot ID';
+  }
+
+    // uncomment this to show error message as popup 
+
+    // for (let item of rawArrivalNotices) {
+    //   if (item.palletId) {
+    //     const foundOrderProductsPallet = await trxMgr.getRepository(OrderProduct).findOne({
+    //       where: {
+    //         domain,
+    //         palletId: item.palletId
+    //       }
+    //     })
+  
+    //     if (foundOrderProductsPallet) {
+    //       throw new Error(('Lot ID is already in used. Please enter new Lot ID.'))
+    //     }
+    //   }
+    // }
 
   await trxMgr.query(
     `
@@ -393,6 +421,7 @@ export async function validateBulkArrivalNoticesFunction(
         uom VARCHAR(10),
         pack_qty INT,
         pallet_qty INT,
+        pallet_id VARCHAR(50),
         unit_price VARCHAR(50),
         manufacture_date DATE
       );
@@ -431,7 +460,7 @@ export async function validateBulkArrivalNoticesFunction(
       SELECT 
         js.ref_no, js.ref_no_2, js.ref_no_3, js.eta_date, js.truck_no, js.own_transport, js.container,
         js.container_no, js.container_size, js.import_cargo, js.loose_item, js.sku, js.batch_id,
-        js.batch_id_ref, js.packing_type, js.packing_size, js.uom, js.pack_qty, js.pallet_qty,
+        js.batch_id_ref, js.packing_type, js.packing_size, js.uom, js.pack_qty, js.pallet_qty, js.pallet_id,
         js.unit_price, js.manufacture_date
       FROM 
         JSON_POPULATE_RECORDSET(NULL:: raw_arrival_notices, $1) js;
@@ -470,6 +499,7 @@ export async function validateBulkArrivalNoticesFunction(
 	        pd.packing_size, 
           pd.cost_price,
 	        sum(raw.pack_qty) AS pack_qty, 
+          raw.pallet_id,
 	        sum(pd.uom_value) AS uom_value,
 	        pd.uom,  
 	        sum(raw.pallet_qty) AS pallet_qty, 
@@ -499,25 +529,80 @@ export async function validateBulkArrivalNoticesFunction(
 	        END
         WHERE pr.bizplace_id = $1
 	      GROUP BY raw.ref_no, raw.ref_no_2, raw.ref_no_3, raw.eta_date, raw.truck_no, raw.own_transport, raw.container, raw.container_no, raw.container_size, raw.import_cargo, raw.loose_item,
-	        pr.id, pd.id, raw.sku, pr.name, pr.description, raw.batch_id, raw.batch_id_ref, raw.packing_type, raw.packing_size, raw.uom, raw.unit_price, raw.manufacture_date, an.ref_no, an.name
-      ) SELECT foo.*, 
-	       CONCAT(COALESCE(ROUND(foo.uom_value:: numeric, 2), 0) * COALESCE(foo.pack_qty, 0), ' ', foo.uom) AS total_uom_value,
-         CASE WHEN foo.gan_ref_no NOTNULL THEN concat('order duplicated with ', foo.gan_name)
-         WHEN foo.manufacture_date > current_date THEN 'invalid manufacture date'
-         WHEN foo.product_id ISNULL OR foo.product_detail_id ISNULL OR foo.sku ISNULL THEN 'product not found'
-         WHEN foo.pack_qty ISNULL OR foo.pack_qty <= 0 THEN 'invalid pack qty'
-         WHEN foo.batch_id ISNULL THEN 'batch no. is required'
-         WHEN foo.ref_no ISNULL OR foo.ref_no = '' THEN 'ref no. is required'
-         WHEN foo.eta_date ISNULL THEN 'eta date is required'
-         WHEN foo.unit_price ISNULL THEN 'invalid unit price (not a number)'
-         WHEN foo.unit_price::FLOAT < 0  THEN 'invalid unit price (negative value)'
-         WHEN foo.container_no NOTNULL AND foo.container_size ISNULL OR foo.container_no ISNULL AND foo.container_size NOTNULL THEN 'incomplete container information'
-         WHEN foo.pallet_qty < 0 THEN 'invalid pallet qty'
-       ELSE '' END AS error_msg
-      FROM foo
+	        pr.id, pd.id, raw.sku, pr.name, pr.description, raw.batch_id, raw.batch_id_ref, raw.packing_type, raw.pallet_id, raw.packing_size, raw.uom, raw.unit_price, raw.manufacture_date, an.ref_no, an.name
+      ), foo_duplicates AS (
+        SELECT 
+          pallet_id, 
+          COUNT(*) AS duplicate_count
+        FROM foo
+        GROUP BY pallet_id
+      )
+        SELECT foo.*, 
+       CONCAT(COALESCE(ROUND(foo.uom_value:: numeric, 2), 0) * COALESCE(foo.pack_qty, 0), ' ', foo.uom) AS total_uom_value,
+       TRIM(
+         BOTH ',' FROM (
+           CASE 
+             WHEN foo.gan_ref_no IS NOT NULL THEN 'order duplicated with ' || foo.gan_name || ','
+             ELSE ''
+           END ||
+           CASE 
+             WHEN foo.manufacture_date > current_date THEN 'invalid manufacture date,'
+             ELSE ''
+           END ||
+           CASE 
+             WHEN foo.product_id IS NULL OR foo.product_detail_id IS NULL OR foo.sku IS NULL THEN 'product not found,'
+             ELSE ''
+           END ||
+           CASE 
+             WHEN foo.pack_qty IS NULL OR foo.pack_qty <= 0 THEN 'invalid pack qty,'
+             ELSE ''
+           END ||
+           CASE 
+             WHEN foo.batch_id IS NULL THEN 'batch no. is required,'
+             ELSE ''
+           END ||
+           CASE 
+             WHEN foo.ref_no IS NULL OR foo.ref_no = '' THEN 'ref no. is required,'
+             ELSE ''
+           END ||
+           CASE 
+             WHEN foo.eta_date IS NULL THEN 'eta date is required,'
+             ELSE ''
+           END ||
+           CASE 
+             WHEN foo.unit_price IS NULL THEN 'invalid unit price (not a number),'
+             ELSE ''
+           END ||
+           CASE 
+             WHEN foo.unit_price::FLOAT < 0 THEN 'invalid unit price (negative value),'
+             ELSE ''
+           END ||
+           CASE 
+             WHEN (foo.container_no IS NOT NULL AND foo.container_size IS NULL) OR (foo.container_no IS NULL AND foo.container_size IS NOT NULL) THEN 'incomplete container information,'
+             ELSE ''
+           END ||
+           CASE 
+             WHEN foo.pallet_qty < 0 THEN 'invalid pallet qty,'
+             ELSE ''
+           END ||
+           CASE
+             WHEN (SELECT duplicate_count FROM foo_duplicates WHERE foo_duplicates.pallet_id = foo.pallet_id) > 1 THEN 'duplicate Lot ID within current data,'
+             ELSE ''
+           END ||
+           CASE 
+             WHEN EXISTS (
+                SELECT *
+                FROM order_products op
+                WHERE op.domain_id = $2 AND op.pallet_id = foo.pallet_id
+             ) THEN 'Lot ID is already in use. Please enter new Lot ID,'
+             ELSE ''
+           END
+         )
+       ) AS error_msg
+FROM foo
       ORDER BY foo.ref_no, foo.ref_no_2, foo.ref_no_3, foo.sku
     `,
-    [companyBizplace.id]
+    [companyBizplace.id,domain.id]
   )
 
   await trxMgr.query('DROP TABLE raw_arrival_notices, temp_gan')
@@ -548,9 +633,10 @@ export async function validateBulkArrivalNoticesFunction(
       uomValue: item.uom_value,
       totalUomValue: item.total_uom_value,
       palletQty: item.pallet_qty,
+      palletId: item.pallet_id,
       unitPrice: item.unit_price,
       manufactureDate: item.manufacture_date,
-      errorMsg: item.error_msg
+      errorMsg: lotIdInputSettingChecker ? lotIdInputSettingChecker + (item.error_msg ? ',' + item.error_msg : '') : item.error_msg
     }
   })
 }

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

@@ -1,8 +1,10 @@
 import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
+import {  OneToMany } from 'typeorm'
 
 import { ObjectRef } from '@things-factory/shell'
 
 import { NewOrderProduct } from '../order-product/order-product-types'
+import { OrderProduct } from '../order-product/order-product'
 import { NewOrderVas } from '../order-vas/order-vas-types'
 import { ArrivalNotice } from './arrival-notice'
 
@@ -122,6 +124,9 @@ export class NewArrivalNotice {
   @Field(type => Int, { nullable: true })
   palletQty?: number
 
+  @Field({ nullable: true })
+  palletId?: string
+
   @Field(type => Float, { nullable: true })
   unitPrice?: number
 
@@ -302,6 +307,9 @@ export class RawArrivalNotice {
   @Field(type => Int, { nullable: true })
   palletQty?: number
 
+  @Field({ nullable: true })
+  palletId?: string
+
   @Field(type => Float, { nullable: true })
   unitPrice?: number
 

package/server/service/invoice/invoice.ts

@@ -226,4 +226,16 @@ export class Invoice {
 
   @RelationId((invoice: Invoice) => invoice.updater)
   updaterId: string
+
+  @Column('float', { default: 0 })
+  @Field({ nullable: true })
+  sellerVoucherAmount: number
+
+  @Column('float', { default: 0 })
+  @Field({ nullable: true })
+  platformVoucherAmount: number
+
+  @Column('float', { default: 0 })
+  @Field({ nullable: true })
+  platformCoins: number
 }

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

@@ -156,6 +156,9 @@ export class OrderProductPatch {
   @Field({ nullable: true })
   adjustedTotalUomValue: string
 
+  @Field({ nullable: true })
+  palletId: string
+
   @Field({ nullable: true })
   totalUomValue: string
 
@@ -300,6 +303,9 @@ export class NewOrderProduct {
   @Field(type => Int, { nullable: true })
   adjustedPalletQty: number
 
+  @Field({ nullable: true })
+  palletId: string
+
   @Field({ nullable: true })
   adjustedTotalUomValue: string
 

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

@@ -314,6 +314,10 @@ export class OrderProduct {
   @Field({ nullable: true })
   actualPalletQty: number
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  palletId: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   totalUomValue: string

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

@@ -341,6 +341,7 @@ export class OtherQuery {
             packing_type: orderProduct.packingType,
             pack_qty: orderProduct.packQty,
             pallet_qty: orderProduct.palletQty,
+            pallet_id: orderProduct.palletId,
             unit_price: orderProduct.unitPrice,
             batch_id: orderProduct.batchId,
             uom: orderProduct.uom,
@@ -359,6 +360,7 @@ export class OtherQuery {
             packing_type VARCHAR(50),
             pack_qty FLOAT,
             pallet_qty FLOAT,
+            pallet_id VARCHAR(50),
             unit_price FLOAT,
             batch_id VARCHAR(50),
             uom VARCHAR(10),
@@ -405,6 +407,7 @@ export class OtherQuery {
           js.sku,
           js.pack_qty as "packQty",
           js.pallet_qty as "palletQty",
+          js.pallet_id as "palletId",
           js.unit_price as "unitPrice",
           js.batch_id as "batchId",
           js.manufacture_date as "manufactureDate",

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

@@ -58,6 +58,9 @@ export class InventoryProductGroup {
   @Field(type => Int, { nullable: true })
   palletQty: number
 
+  @Field({ nullable: true })
+  palletId: string
+
   @Field(type => Float, { nullable: true })
   remainQty: number