@things-factory/sales-base 4.3.37 → 4.3.40

package/server/service/purchase-order/purchase-order-mutation.ts

@@ -6,7 +6,7 @@ import { Attachment, createAttachments, deleteAttachmentsByRef } from '@things-f
 import { User } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint, getPermittedBizplaces } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
-import { Product } from '@things-factory/product-base'
+import { Product, ProductDetail } from '@things-factory/product-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Location } from '@things-factory/warehouse-base'
@@ -433,12 +433,16 @@ export async function upsertPurchaseOrderProducts(
     orderProducts = await Promise.all(
       orderProducts.map(async (op: OrderProduct) => {
         if (!op?.id) delete op.id
+        let foundProductDetail: ProductDetail = await tx
+          .getRepository(ProductDetail)
+          .findOne({ where: { product: op.product.id, packingType: op.packingType } })
         return {
           ...op,
           domain,
           bizplace: bizplace,
           name: op?.id ? op.name : OrderNoGenerator.orderProduct(),
           product: await productRepo.findOne(op.product.id),
+          packingSize: foundProductDetail?.packingSize || 1,
           purchaseOrder: purchaseOrder,
           status: purchaseOrder.status,
           creator: op?.id ? op.creator : user,

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

@@ -41,7 +41,7 @@ import { confirmArrivalNoticeFunction, deleteArrivalNotice } from '../arrival-no
 import { OrderInventory } from '../order-inventory/order-inventory'
 import { OrderProduct } from '../order-product/order-product'
 import { OrderVas } from '../order-vas/order-vas'
-import { NewReleaseGood, ReleaseGoodPatch } from '../release-good/release-good-types'
+import { NewReleaseGood, ReleaseGoodPatch, ShippingOrderInfoPatch } from '../release-good/release-good-types'
 import { ShippingOrder } from '../shipping-order/shipping-order'
 import { ShippingOrderPatch } from '../shipping-order/shipping-order-types'
 import { Vas } from '../vas/vas'
@@ -134,7 +134,7 @@ export class ReleaseGoodMutation {
           context,
           tx
         )
-      } catch (error) {}
+      } catch (error) { }
 
     if (errorsCaught.length)
       throw new ValidationError({
@@ -172,13 +172,16 @@ export class ReleaseGoodMutation {
     @Ctx() context: any,
     @Arg('attachments', type => [GraphQLUpload], { nullable: true }) attachments?: FileUpload[],
     @Arg('releaseGood', type => NewReleaseGood, { nullable: true }) releaseGood?: NewReleaseGood,
-    @Arg('shippingOrder', type => ShippingOrderPatch, { nullable: true }) shippingOrder?: ShippingOrderPatch
+    @Arg('shippingOrder', type => ShippingOrderPatch, { nullable: true }) shippingOrder?: ShippingOrderPatch,
+    @Arg('shippingOrderInfo', type => ShippingOrderInfoPatch, { nullable: true })
+    shippingOrderInfo?: ShippingOrderInfoPatch
   ): Promise<ReleaseGood> {
     const { tx }: { tx: EntityManager } = context.state
     const createdReleaseGood: ReleaseGood = await generateReleaseGoodFunction(
       null,
       releaseGood,
       shippingOrder,
+      shippingOrderInfo,
       attachments,
       context,
       tx
@@ -193,7 +196,9 @@ export class ReleaseGoodMutation {
   async updateReleaseGoodDetails(
     @Ctx() context: any,
     @Arg('releaseGood', type => ReleaseGoodPatch, { nullable: true }) releaseGood?: ReleaseGoodPatch,
-    @Arg('shippingOrder', type => ShippingOrderPatch, { nullable: true }) shippingOrder?: ShippingOrderPatch
+    @Arg('shippingOrder', type => ShippingOrderPatch, { nullable: true }) shippingOrder?: ShippingOrderPatch,
+    @Arg('shippingOrderInfo', type => ShippingOrderInfoPatch, { nullable: true })
+    shippingOrderInfo?: ShippingOrderInfoPatch
   ): Promise<ReleaseGood> {
     const { tx, domain, user } = context.state
     let foundReleaseGood = await tx.getRepository(ReleaseGood).findOne({
@@ -224,9 +229,18 @@ export class ReleaseGoodMutation {
       releaseGood.shippingOrder = newShippingOrder
     }
 
+    shippingOrderInfo.deliveryAddress1 = shippingOrderInfo.deliveryFullAddress
+    shippingOrderInfo.country = shippingOrderInfo.deliveryCountry
+    shippingOrderInfo.state = shippingOrderInfo.deliveryState
+    shippingOrderInfo.city = shippingOrderInfo.deliveryCity
+    shippingOrderInfo.phone1 = shippingOrderInfo.contact
+    shippingOrderInfo.postalCode = shippingOrderInfo.deliveryPostalCode
+    shippingOrderInfo.attentionCompany = shippingOrderInfo.companyName
+
     foundReleaseGood = await tx.getRepository(ReleaseGood).save({
       ...foundReleaseGood,
       ...releaseGood,
+      ...shippingOrderInfo,
       remark: releaseGood?.remark ? releaseGood.remark : null
     })
 
@@ -412,6 +426,7 @@ export async function generateReleaseGoodFunction(
   _: any,
   releaseGood: any,
   shippingOrder: any,
+  shippingOrderInfo: any,
   attachments: FileUpload[],
   context: any,
   tx?: EntityManager
@@ -545,6 +560,36 @@ export async function generateReleaseGoodFunction(
       }
     })
 
+    let attentionToBind = releaseGood?.attentionTo
+    let billingAddressBind = releaseGood?.billingAddress
+    let deliveryAddressBind = releaseGood?.deliveryAddress1
+    let attentionCompanyBind = releaseGood?.companyName
+    let cityBind = releaseGood?.city
+    let stateBind = releaseGood?.state
+    let postalCodeBind = releaseGood?.postalCode
+    let countryBind = releaseGood?.country
+    let contactBind = releaseGood?.phone1
+    let billingCityBind = releaseGood?.billingCity
+    let billingCountryBind = releaseGood?.billingCountry
+    let billingPostalCodeBind = releaseGood?.billingPostalCode
+    let billingStateBind = releaseGood?.billingState
+
+    if (Object.keys(shippingOrderInfo).length > 0) {
+      attentionToBind = shippingOrderInfo.attentionTo
+      billingAddressBind = shippingOrderInfo.billingAddress
+      deliveryAddressBind = shippingOrderInfo.deliveryAddress
+      attentionCompanyBind = shippingOrderInfo.companyName
+      cityBind = shippingOrderInfo.deliveryCity
+      stateBind = shippingOrderInfo.deliveryState
+      postalCodeBind = shippingOrderInfo.deliveryPostalCode
+      countryBind = shippingOrderInfo.deliveryCountry
+      contactBind = shippingOrderInfo.contact
+      billingCityBind = shippingOrderInfo.billingCity
+      billingCountryBind = shippingOrderInfo.billingCountry
+      billingPostalCodeBind = shippingOrderInfo.billingPostalCode
+      billingStateBind = shippingOrderInfo.billingState
+    }
+
     newReleaseGood = {
       ...newReleaseGood,
       name: roNoSetting
@@ -558,21 +603,25 @@ export async function generateReleaseGoodFunction(
       ownTransport: releaseGood.ownTransport,
       packingOption: releaseGood.packingOption,
       marketplaceOrderStatus: releaseGood?.marketplaceOrderStatus || null,
-      billingAddress: releaseGood?.billingAddress || null,
-      deliveryAddress1: releaseGood?.deliveryAddress1 || null,
+      billingAddress: billingAddressBind || null,
+      deliveryAddress1: deliveryAddressBind || null,
       deliveryAddress2: releaseGood?.deliveryAddress2 || null,
       deliveryAddress3: releaseGood?.deliveryAddress3 || null,
       deliveryAddress4: releaseGood?.deliveryAddress4 || null,
       deliveryAddress5: releaseGood?.deliveryAddress5 || null,
-      attentionTo: releaseGood?.attentionTo || null,
-      attentionCompany: releaseGood?.attentionCompany || null,
-      city: releaseGood?.city || null,
-      state: releaseGood?.state || null,
-      postalCode: releaseGood?.postalCode || null,
-      country: releaseGood?.country || null,
-      phone1: releaseGood?.phone1 || null,
+      attentionTo: attentionToBind || null,
+      attentionCompany: attentionCompanyBind || null,
+      city: cityBind || null,
+      state: stateBind || null,
+      postalCode: postalCodeBind || null,
+      country: countryBind || null,
+      phone1: contactBind || null,
       phone2: releaseGood?.phone2 || null,
       email: releaseGood?.email || null,
+      billingCity: billingCityBind || null,
+      billingCountry: billingCountryBind || null,
+      billingPostalCode: billingPostalCodeBind || null,
+      billingState: billingStateBind || null,
       transporter: releaseGood?.transporter,
       trackingNo: releaseGood?.trackingNo,
       airwayBill: releaseGood?.airwayBill,
@@ -1416,6 +1465,11 @@ function extractRawReleaseGoods(rawReleaseGoods): Partial<ReleaseGood[]> {
         deliveryAddress2: item.deliveryAddress2,
         deliveryAddress3: item.deliveryAddress3,
         deliveryAddress4: item.deliveryAddress4,
+        billingAddress: item.billingAddress,
+        billingCity: item.billingPostalCode,
+        billingState: item.billingState,
+        billingCountry: item.billingCountry,
+        billingPostalCode: item.billingPostalCode,
         city: item.city,
         postalCode: item.postalCode,
         state: item.state,

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

@@ -359,6 +359,18 @@ export class NewReleaseGood {
 
   @Field({ nullable: true })
   stopId: string
+
+  @Field({ nullable: true})
+  billingCity: string
+
+  @Field({ nullable: true})
+  billingPostalCode: string
+
+  @Field({ nullable: true})
+  billingCountry: string
+  
+  @Field({ nullable: true})
+  billingState: string
 }
 
 @InputType()
@@ -528,3 +540,103 @@ export class ReleaseGoodPatch {
   @Field({ nullable: true })
   stopId: string
 }
+
+@InputType()
+export class ShippingOrderInformationPatch {
+  @Field({ nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  containerNo?: string
+
+  @Field({ nullable: true })
+  containerLeavingDate?: string
+
+  @Field({ nullable: true })
+  containerArrivalDate?: string
+
+  @Field({ nullable: true })
+  containerLeavingDateTime?: string
+
+  @Field({ nullable: true })
+  containerArrivalDateTime?: string
+
+  @Field({ nullable: true })
+  shipName?: string
+}
+
+@InputType()
+export class ShippingOrderInfoPatch {
+  @Field({ nullable: true })
+  billingAddress: string
+
+  @Field({ nullable: true })
+  billingCity: string
+
+  @Field({ nullable: true })
+  billingPostalCode: string
+
+  @Field({ nullable: true })
+  billingState: string
+
+  @Field({ nullable: true })
+  billingCountry: string
+  
+  @Field({ nullable: true })
+  companyName: string
+
+  @Field({ nullable: true })
+  contact: string
+
+  @Field({ nullable: true })
+  deliveryAddress: string
+
+  @Field({ nullable: true })
+  deliveryCity: string
+
+  @Field({ nullable: true })
+  deliveryCountry: string
+
+  @Field({ nullable: true })
+  deliveryPostalCode: string
+
+  @Field({ nullable: true })
+  deliveryState: string
+
+  @Field({ nullable: true })
+  attentionTo: string
+
+  @Field({ nullable: true })
+  deliveryAddress1: string
+
+  @Field({ nullable: true })
+  country: string
+
+  @Field({ nullable: true })
+  city: string
+
+  @Field({ nullable: true })
+  state: string
+
+  @Field({ nullable: true })
+  phone1: string
+
+  @Field({ nullable: true })
+  postalCode: string
+  
+  @Field({ nullable: true })
+  attentionCompany: string
+  
+  @Field({ nullable: true})
+  collectionOrderNo: string
+
+  @Field({ nullable: true})
+  billingFullAddress: string
+
+  @Field({ nullable: true})
+  deliveryFullAddress: string
+
+  @Field(type => ShippingOrderInformationPatch, { nullable: true })
+  shippingOrder: ShippingOrderInformationPatch
+}
+

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

@@ -203,6 +203,22 @@ export class ReleaseGood {
   @Field({ nullable: true })
   billingAddress: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingCountry: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingPostalCode: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingState: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  billingCity: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   pickupAddress: string

package/server/utils/datetime-util.ts

@@ -0,0 +1,54 @@
+export class DateGenerator {
+  static generateDate() {
+    const today = new Date()
+    const year = today.getFullYear()
+    const month = today.getMonth()
+    const day = today.getDate()
+
+    const yy = String(year).substr(String(year).length - 2)
+    const mm = String(month + 1).padStart(2, '0')
+    const dd = String(day).padStart(2, '0')
+
+    return yy + mm + dd
+  }
+}
+
+export class DateTimeConverter {
+  static date(dateTime) {
+    let unloadDate = ''
+    if (dateTime) {
+      const unloadDateTime: Date = new Date(dateTime)
+      var year = unloadDateTime.getFullYear()
+
+      var month = (1 + unloadDateTime.getMonth()).toString()
+      month = month.length > 1 ? month : '0' + month
+
+      var day = unloadDateTime.getDate().toString()
+      day = day.length > 1 ? day : '0' + day
+
+      unloadDate = day + '-' + month + '-' + year
+    }
+    return unloadDate
+  }
+
+  static datetime(dateTime, timezone) {
+    let unloadDate = ''
+    if (dateTime) {
+      const datetime = Number(dateTime)
+      const timezoneOffset = timezone * 60000
+      const newUnloadDate = new Date(datetime - timezoneOffset).toISOString().slice(0, -1)
+
+      var dateTimeParts: any = newUnloadDate.split('T')
+
+      //handle date parts
+      var dateParts = dateTimeParts[0].split('-')
+      var newDate = DateTimeConverter.date(dateParts)
+
+      //handle time part
+      var timeParts = dateTimeParts[1].slice(0, -7)
+
+      unloadDate = newDate + ' ' + timeParts
+    }
+    return unloadDate
+  }
+}

package/server/utils/index.ts

@@ -1,2 +1,3 @@
 export * from './order-no-generator'
 export * from './inventory-util'
+export * from './datetime-util'

package/server/utils/inventory-util.ts

@@ -578,7 +578,23 @@ export const InventoryUtil = {
           : qb.addOrderBy(`loc.${rule.name}`, rule.desc ? 'DESC' : 'ASC')
       })
     } else {
-      qb.addOrderBy('"iv"."created_at"', 'ASC')
+      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
+      }
     }
 
     let inventories: Inventory[] = await qb.getMany()
@@ -1007,8 +1023,9 @@ export function _composeTargetInventories(product: Product, record: any, invento
       packingType,
       packingSize,
       batchId,
+      batchIdRef,
       uom
-    }: { packingType: string; packingSize: number; batchId: string; uom: string } = inventory
+    }: { packingType: string; packingSize: number; batchId: string; batchIdRef: string; uom: string } = inventory
 
     let orderInventory: OrderInventory = new OrderInventory()
 
@@ -1042,6 +1059,7 @@ export function _composeTargetInventories(product: Product, record: any, invento
       packingType,
       packingSize,
       batchId,
+      batchIdRef,
       uom,
       product,
       type: ORDER_TYPES.RELEASE_OF_GOODS