@things-factory/sales-base 4.3.60 → 4.3.64

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

@@ -25,6 +25,7 @@ import { Inventory } from '@things-factory/warehouse-base'
 import {
   ATTACHMENT_TYPE,
   ORDER_INVENTORY_STATUS,
+  ORDER_METHOD,
   ORDER_NUMBER_RULE_TYPE,
   ORDER_NUMBER_SETTING_KEY,
   ORDER_PRODUCT_STATUS,
@@ -47,6 +48,7 @@ import { ShippingOrderPatch } from '../shipping-order/shipping-order-types'
 import { Vas } from '../vas/vas'
 import { ReleaseGood } from './release-good'
 import { bulkReleaseGoodsAvailableItemsFunction } from './release-good-query'
+import { NewOrderProduct } from '../order-product/order-product-types'
 
 @Resolver(ReleaseGood)
 export class ReleaseGoodMutation {
@@ -134,7 +136,7 @@ export class ReleaseGoodMutation {
           context,
           tx
         )
-      } catch (error) {}
+      } catch (error) { }
 
     if (errorsCaught.length)
       throw new ValidationError({
@@ -211,6 +213,12 @@ export class ReleaseGoodMutation {
     }
 
     // case to update existing shippingOrder
+    if (shippingOrder !== null) {
+      shippingOrder.remark = shippingOrder.exportRemark
+      shippingOrder.containerClosureDateTime = new Date(shippingOrder.containerClosureDate)
+      delete shippingOrder.exportRemark
+    }
+
     if (foundReleaseGood.shippingOrder && shippingOrder) {
       await tx.getRepository(ShippingOrder).update(foundReleaseGood.shippingOrder.id, shippingOrder)
     }
@@ -345,7 +353,7 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
     ]
   })
 
-  if (!foundReleaseOrder) throw new Error(`Arrival notice doesn't exists.`)
+  if (!foundReleaseOrder) throw new Error(`Release order doesn't exists.`)
   const foundOIs: OrderInventory[] = foundReleaseOrder.orderInventories
   const foundOVs: OrderVas[] = foundReleaseOrder.orderVass
   const foundSO: ShippingOrder = foundReleaseOrder.shippingOrder
@@ -417,7 +425,7 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
 export async function generateReleaseGoodFunction(
   _: any,
   releaseGood: any,
-  shippingOrder: any,
+  shippingOrder: ShippingOrderPatch,
   shippingOrderInfo: any,
   attachments: FileUpload[],
   context: any,
@@ -434,6 +442,7 @@ export async function generateReleaseGoodFunction(
 
     let bizplace: Bizplace
     let warehouseDomain: Domain = domain
+    let finalOrderInventories: OrderInventory[] = []
 
     /** Validate user permitted Bizplace */
     if (releaseGood.warehouseId) {
@@ -530,6 +539,12 @@ export async function generateReleaseGoodFunction(
 
     /** Generate Shipping Order */
     if (shippingOrder) {
+      shippingOrder.remark = shippingOrder.exportRemark
+      if (shippingOrder.containerClosureDate !== undefined) {
+        shippingOrder.containerClosureDateTime = new Date(shippingOrder.containerClosureDate)
+      }
+      delete shippingOrder.exportRemark
+
       const createdSO: ShippingOrder = await tx.getRepository(ShippingOrder).save({
         ...shippingOrder,
         name: OrderNoGenerator.shippingOrder(),
@@ -564,6 +579,7 @@ export async function generateReleaseGoodFunction(
       exportOption: releaseGood.exportOption,
       ownTransport: releaseGood.ownTransport,
       packingOption: releaseGood.packingOption,
+      recall: releaseGood.recall,
       marketplaceOrderStatus: releaseGood?.marketplaceOrderStatus || null,
       billingAddress:
         releaseGood.type == 'b2c' ? releaseGood?.billingAddress || null : shippingOrderInfo.billingAddress || null,
@@ -605,6 +621,11 @@ export async function generateReleaseGoodFunction(
       bundleInfo: releaseGood?.bundleInfo || [],
       orderInventories: releaseGood.orderInventories,
       type: releaseGood?.type ? releaseGood.type : 'b2b',
+      orderMethod: releaseGood?.orderMethod
+        ? releaseGood.orderMethod
+        : releaseGood.orderInventories[0]?.inventory?.id
+          ? ORDER_METHOD.SELECT_BY_PALLET
+          : ORDER_METHOD.SELECT_BY_PRODUCT,
       status: ORDER_STATUS.PENDING,
       packageId: releaseGood?.packageId,
       storeName: releaseGood?.storeName,
@@ -692,17 +713,6 @@ export async function generateReleaseGoodFunction(
         updater: user
       }
 
-      if (newOrderInv.inventory?.id) {
-        const foundInv: Inventory = await tx.getRepository(Inventory).findOne(newOrderInv.inventory.id)
-        newOrderInv.inventory = foundInv
-
-        foundInv.lockedQty = Number(foundInv.lockedQty) + newOrderInv.releaseQty
-        foundInv.lockedUomValue = Number(foundInv.lockedUomValue) + newOrderInv.releaseUomValue
-        foundInv.updater = user
-
-        await tx.getRepository(Inventory).save(foundInv)
-      }
-
       let newOrderProduct: OrderProduct = Object.assign(new OrderProduct(), newOrderInv)
       newOrderProduct = {
         ...newOrderProduct,
@@ -710,12 +720,74 @@ export async function generateReleaseGoodFunction(
         actualPackQty: 0,
         palletQty: 0,
         actualPalletQty: 0,
-        status: newOrderInv.inventory?.id ? ORDER_PRODUCT_STATUS.ASSIGNED : ORDER_PRODUCT_STATUS.PENDING_ASSIGN
+        status: ORDER_PRODUCT_STATUS.ASSIGNED
       }
 
       newOrderProduct = await tx.getRepository(OrderProduct).save(newOrderProduct)
 
-      await tx.getRepository(OrderInventory).save({ ...newOrderInv, orderProduct: newOrderProduct })
+      if (newOrderInv.inventory?.id) {
+        const foundInv: Inventory = await tx.getRepository(Inventory).findOne(newOrderInv.inventory.id)
+        newOrderInv.inventory = foundInv
+        newOrderInv.orderProduct = newOrderProduct
+
+        finalOrderInventories.push(newOrderInv)
+      } else {
+        // Preassign Inventories
+        const inventoryAssignmentSetting: Setting = await tx.getRepository(Setting).findOne({
+          where: { domain, name: 'rule-for-inventory-assignment' }
+        })
+
+        let locationSortingRules = []
+        if (inventoryAssignmentSetting) {
+          let locationSetting = JSON.parse(inventoryAssignmentSetting.value)
+          for (const key in locationSetting) {
+            locationSortingRules.push({ name: key, desc: locationSetting[key] == 'ASC' ? false : true })
+          }
+        }
+
+        let assignedOrderInventories: OrderInventory[] = await InventoryUtil.autoAssignInventoryForRelease(
+          newOrderInv.product,
+          oi,
+          oi.packingType,
+          locationSortingRules,
+          bizplace,
+          warehouseDomain,
+          tx,
+          oi.batchId
+        )
+
+        assignedOrderInventories = assignedOrderInventories.map(aoi => {
+          return {
+            ...aoi,
+            orderProduct: newOrderProduct
+          }
+        })
+
+        finalOrderInventories.push(...assignedOrderInventories)
+      }
+    }
+
+    for (let oi of finalOrderInventories) {
+      let generatedOI: OrderInventory = Object.assign(new OrderInventory(), oi)
+      generatedOI = {
+        ...generatedOI,
+        domain: warehouseDomain,
+        bizplace,
+        status: ORDER_INVENTORY_STATUS.PENDING,
+        name: OrderNoGenerator.orderInventory(),
+        releaseGood: newReleaseGood,
+        creator: user,
+        updater: user
+      }
+
+      await tx.getRepository(OrderInventory).save({ ...generatedOI })
+
+      // update inventory locked qty and uom value
+      await tx.getRepository(Inventory).update(oi.inventory.id, {
+        lockedQty: (oi.inventory?.lockedQty || 0) + generatedOI.releaseQty,
+        lockedUomValue: (oi.inventory?.lockedUomValue || 0) + generatedOI.releaseUomValue,
+        updater: user
+      })
     }
 
     if (orderVass?.length) {
@@ -821,7 +893,10 @@ export async function confirmReleaseGood(name: string, context: any, tx?: Entity
   })
 
   if (foundReleaseGood.type == 'b2c') {
-    if (!sellercraft) {
+    if (sellercraft) {
+      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+      foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...foundReleaseGood, orderProducts: foundOPs })
+    } else {
       // find for any existing marketplace store connections
       let marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
         where: { domain: companyDomain, status: 'ACTIVE' },
@@ -1172,11 +1247,11 @@ export async function bulkGenerateReleaseGood(
   roNoSetting: any,
   domain: Domain,
   user: User,
-  tx?: EntityManager
+  tx?: EntityManager,
 ): Promise<ReleaseGood> {
   try {
     let warehouseDomain: Domain = domain
-    let { orderInventories } = releaseGood
+    let { orderInventories, shippingOrder } = releaseGood
 
     let bizplace: Bizplace = await tx.getRepository(Bizplace).findOne(bizplaceId)
 
@@ -1212,7 +1287,30 @@ export async function bulkGenerateReleaseGood(
     }
 
     newReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
-    let finalOrderInventories: OrderInventory[] = []
+
+
+    /** Generate Shipping Order */
+    if (shippingOrder) {
+      shippingOrder.remark = shippingOrder.exportRemark
+      if (shippingOrder.containerClosureDate !== undefined) {
+        shippingOrder.containerClosureDateTime = new Date(shippingOrder.containerClosureDate)
+      }
+      delete shippingOrder.exportRemark
+
+      const createdSO: ShippingOrder = await tx.getRepository(ShippingOrder).save({
+        ...shippingOrder,
+        name: OrderNoGenerator.shippingOrder(),
+        domain,
+        bizplace,
+        status: ORDER_STATUS.PENDING,
+        creator: user,
+        updater: user
+      })
+
+      newReleaseGood.shippingOrder = createdSO
+    }
+
+    let finalOrderInventories: Partial<OrderInventory>[] = []
 
     // pre assign inventory to orderInventories
     for (let oi of orderInventories) {
@@ -1230,16 +1328,23 @@ export async function bulkGenerateReleaseGood(
 
       const product: Product = await tx.getRepository(Product).findOne(oi.productId)
 
+      let assignedResult = await InventoryUtil.autoAssignInventoryForRelease(
+        product,
+        oi,
+        oi.packingType,
+        locationSortingRules,
+        bizplace,
+        warehouseDomain,
+        tx
+      )
+
       finalOrderInventories.push(
-        ...(await InventoryUtil.autoAssignInventoryForRelease(
-          product,
-          oi,
-          oi.packingType,
-          locationSortingRules,
-          bizplace,
-          warehouseDomain,
-          tx
-        ))
+        ...assignedResult.map(itm => {
+          return {
+            ...itm,
+            orderProduct: oi?.orderProduct
+          }
+        })
       )
     }
 
@@ -1256,28 +1361,38 @@ export async function bulkGenerateReleaseGood(
         updater: user
       }
 
-      let newOrderProduct: Partial<OrderProduct> = {
-        name: generatedOI.name,
-        product: generatedOI.product,
-        batchId: generatedOI.batchId,
-        packingType: generatedOI.packingType,
-        packingSize: generatedOI.packingSize,
-        uom: generatedOI.uom,
-        domain: warehouseDomain,
-        bizplace,
-        releaseQty: generatedOI.releaseQty,
-        releaseUomValue: generatedOI.releaseUomValue,
-        packQty: 0,
-        actualPackQty: 0,
-        palletQty: 0,
-        actualPalletQty: 0,
-        status: ORDER_PRODUCT_STATUS.PENDING_ASSIGN,
-        releaseGood: newReleaseGood,
-        creator: user,
-        updater: user
-      }
+      let newOrderProduct: Partial<OrderProduct>
+      if (!oi?.orderProduct) {
+        newOrderProduct = {
+          name: generatedOI.name,
+          product: generatedOI.product,
+          batchId: generatedOI.batchId,
+          packingType: generatedOI.packingType,
+          packingSize: generatedOI.packingSize,
+          uom: generatedOI.uom,
+          domain: warehouseDomain,
+          bizplace,
+          releaseQty: generatedOI.releaseQty,
+          releaseUomValue: generatedOI.releaseUomValue,
+          packQty: 0,
+          actualPackQty: 0,
+          palletQty: 0,
+          actualPalletQty: 0,
+          status: ORDER_PRODUCT_STATUS.ASSIGNED,
+          releaseGood: newReleaseGood,
+          creator: user,
+          updater: user
+        }
 
-      newOrderProduct = await tx.getRepository(OrderProduct).save(newOrderProduct)
+        newOrderProduct = await tx.getRepository(OrderProduct).save(newOrderProduct)
+      } else {
+        newOrderProduct = await tx.getRepository(OrderProduct).save({
+          ...oi.orderProduct,
+          totalUomValue: `${oi.orderProduct.releaseUomValue} ${oi.orderProduct.uom}`,
+          status: ORDER_PRODUCT_STATUS.ASSIGNED,
+          updater: user
+        })
+      }
 
       await tx.getRepository(OrderInventory).save({ ...generatedOI, orderProduct: newOrderProduct })
 

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

@@ -179,6 +179,8 @@ export class ReleaseGoodQuery {
         'bizplace',
         'shippingOrder',
         'arrivalNotice',
+        'orderProducts',
+        'orderProducts.product',
         'orderInventories',
         'orderInventories.inventory',
         'orderInventories.product',
@@ -236,10 +238,20 @@ export class ReleaseGoodQuery {
                 invStatus: inventory.status,
                 releaseQty: orderInv.releaseQty,
                 releaseUomValue: orderInv.releaseUomValue,
-                status: orderInv.status
+                status: orderInv.status,
+                refWorksheetId: orderInv.refWorksheetId
               }
             } else {
-              const { batchId, batchIdRef, product, packingType, packingSize, releaseQty, releaseUomValue } = orderInv
+              const {
+                batchId,
+                batchIdRef,
+                product,
+                packingType,
+                packingSize,
+                releaseQty,
+                releaseUomValue,
+                refWorksheetId
+              } = orderInv
               const { id: productIdRef, name: productName }: Product = product
               const { qty, uomValue, uom } = await getAvailableAmount(roBizId, productIdRef, batchId, packingType, tx)
 
@@ -255,7 +267,8 @@ export class ReleaseGoodQuery {
                 uom,
                 uomValue,
                 releaseQty,
-                releaseUomValue
+                releaseUomValue,
+                refWorksheetId
               }
             }
           })
@@ -266,9 +279,13 @@ export class ReleaseGoodQuery {
         attachment: foundAttachments,
         shippingOrderInfo: {
           containerNo: shippingOrder?.containerNo || '',
+          containerSize: shippingOrder?.containerSize || '',
           containerLeavingDate: shippingOrder?.containerLeavingDate || '',
           containerArrivalDate: shippingOrder?.containerArrivalDate || '',
-          shipName: shippingOrder?.shipName || ''
+          containerClosureDate: shippingOrder?.containerClosureDate || '',
+          shipName: shippingOrder?.shipName || '',
+          remark: shippingOrder?.remark || '',
+          remindContainerDeparture: shippingOrder?.remindContainerDeparture || null
         },
         inventoryInfos: orderBy<InventoryInfos>(invInfos, ['product.sku'], ['asc'])
       }
@@ -291,6 +308,8 @@ export class ReleaseGoodQuery {
       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')
+      const manifestedFilter = params.filters.find(param => param.name === 'manifested')
+      const orderInfoFilter = params.filters.find(param => param.name === 'name')
 
       if (await checkUserBelongsDomain(domain, user)) {
         if (!statusFilter && !params.filters.some(e => e.name === 'name')) {
@@ -316,6 +335,10 @@ export class ReleaseGoodQuery {
         params.filters = params.filters.filter(param => param.name !== 'sku')
       }
 
+      if (orderInfoFilter) {
+        params.filters = params.filters.filter(param => param.name !== 'name')
+      }
+
       if (routeId) {
         if (routeId.value == true) {
           params.filters.find(param => param.name === 'routeId').value = 'null'
@@ -346,6 +369,27 @@ export class ReleaseGoodQuery {
         }
       }
 
+      if (manifestedFilter) {
+        const manifestedIdx = params.filters.findIndex(param => param.name === 'manifested')
+        if (manifestedFilter.value == true) {
+          params.filters.splice(manifestedIdx, 1)
+          params.filters.push({
+            name: 'manifestId',
+            operator: 'is_not_null',
+            value: null,
+            relation: false
+          })
+        } else {
+          params.filters.splice(manifestedIdx, 1)
+          params.filters.push({
+            name: 'manifestId',
+            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)
@@ -401,18 +445,56 @@ export class ReleaseGoodQuery {
       )
 
       if (skuFilter) {
+        let removeSymbol = skuFilter.value
+          .split('')
+          .filter(res => res !== '%')
+          .join('')
+
+        let products = removeSymbol
+          .toLowerCase()
+          .split(',')
+          .map(prod => {
+            return "'%" + prod.trim().replace(/'/g, "''") + "%'"
+          })
+          .join(',')
+
         qb.andWhere(
           `
         exists (select * from  order_inventories oi  
         inner join products p on oi.product_id = p.id
         inner join inventories i on i.product_id = p.id
         where oi.release_good_id = rg.id
-        and lower(p.sku) like :sku)
-        `,
-          { sku: skuFilter.value.toLowerCase() }
+        and (lower(p.sku) like any(array[${products}])
+        or lower(p.brand_sku) like any(array[${products}])
+        or lower(p.name) like any(array[${products}])
+        or lower(p.description) like any(array[${products}]))
+        )
+        `
         )
       }
 
+      if (orderInfoFilter) {
+        let removeSymbol = orderInfoFilter.value
+          .split('')
+          .filter(res => res !== '%')
+          .join('')
+
+        let orderInfos = removeSymbol
+          .toLowerCase()
+          .split(',')
+          .map(prod => {
+            return "'%" + prod.trim().replace(/'/g, "''") + "%'"
+          })
+          .join(',')
+
+        qb.andWhere(`(
+          lower(rg.name) like any(array[${orderInfos}])
+          or lower(rg.ref_no) like any(array[${orderInfos}])
+          or lower(rg.ref_no_2) like any(array[${orderInfos}])
+          or lower(rg.ref_no_3) like any(array[${orderInfos}])
+        )`)
+      }
+
       const arrChildSortData = ['bizplace', 'creator']
       const sort = (params.sortings || []).reduce(
         (acc, sort) => ({
@@ -428,12 +510,18 @@ export class ReleaseGoodQuery {
 
       let [items, total] = await qb.getManyAndCount()
 
-      items = items.map(item => {
-        return {
-          ...item,
-          orderRemark: item?.remark ? true : false
-        }
-      })
+      items = items
+        .filter(item => {
+          return item.domainId === domain.id
+        })
+        .map(item => {
+          return {
+            ...item,
+            orderRemark: item?.remark ? true : false
+          }
+        })
+
+      total = items.length
 
       return { items, total }
     } catch (error) {
@@ -493,27 +581,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(', ')})` : ''}
@@ -868,16 +953,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-types.ts

@@ -127,6 +127,9 @@ export class InventoryInfos {
 
   @Field({ nullable: true })
   lockedUomValue?: number
+
+  @Field({ nullable: true })
+  refWorksheetId?: string
 }
 
 @ObjectType()
@@ -137,12 +140,18 @@ export class ShippingOrderInfo {
   @Field({ nullable: true })
   containerNo?: string
 
+  @Field({ nullable: true })
+  containerSize?: string
+
   @Field({ nullable: true })
   containerLeavingDate?: string
 
   @Field({ nullable: true })
   containerArrivalDate?: string
 
+  @Field({ nullable: true })
+  containerClosureDate?: string
+
   @Field({ nullable: true })
   containerLeavingDateTime?: string
 
@@ -151,6 +160,12 @@ export class ShippingOrderInfo {
 
   @Field({ nullable: true })
   shipName?: string
+
+  @Field({ nullable: true })
+  remark?: string
+
+  @Field({ nullable: true })
+  remindContainerDeparture: boolean
 }
 
 @InputType()
@@ -168,7 +183,9 @@ export class NewReleaseGood {
   type: string
 
   @Field({ nullable: true })
-  releaseDateTime: string
+  orderMethod: string
+
+
 
   @Field({ nullable: true })
   collectionOrderNo: string
@@ -371,6 +388,9 @@ export class NewReleaseGood {
 
   @Field({ nullable: true })
   billingState: string
+
+  @Field({ nullable: true })
+  recall: boolean
 }
 
 @InputType()
@@ -384,9 +404,6 @@ export class ReleaseGoodPatch {
   @Field({ nullable: true })
   releaseDate: string
 
-  @Field({ nullable: true })
-  releaseDateTime: string
-
   @Field({ nullable: true })
   collectionOrderNo: string
 
@@ -399,6 +416,9 @@ export class ReleaseGoodPatch {
   @Field({ nullable: true })
   type: string
 
+  @Field({ nullable: true })
+  orderMethod: string
+
   @Field({ nullable: true })
   truckNo: string
 
@@ -542,8 +562,7 @@ export class ReleaseGoodPatch {
 }
 
 @InputType()
-//** Comment: @Oscar, this class name title is not conform to the naming convention set, kindly change. */
-export class exportInformationPatch {
+export class ExportInformationPatch {
   @Field({ nullable: true })
   id?: string