@things-factory/sales-base 4.3.143 → 4.3.146

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

@@ -0,0 +1,51 @@
+import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
+
+import { OrderPackageItem } from './order-package-item'
+
+@InputType()
+export class NewOrderPackageItem {
+  @Field()
+  name: string
+
+  @Field({ nullable: true })
+  status?: string
+}
+
+@InputType()
+export class OrderPackageItemPatch {
+  @Field(type => ID, { nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  name?: string
+
+  @Field({ nullable: true })
+  releaseQty?: number
+
+  @Field({ nullable: true })
+  status?: string
+
+  @Field()
+  cuFlag: string
+}
+
+@ObjectType()
+export class OrderPackageItemList {
+  @Field(type => [OrderPackageItem])
+  items: OrderPackageItem[]
+
+  @Field(type => Int)
+  total: number
+}
+
+@ObjectType()
+export class TrackingInformation {
+  @Field(type => String)
+  trackingNo: string
+
+  @Field(type => String)
+  sku: string
+
+  @Field(type => String)
+  releaseQty: number
+}

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

@@ -0,0 +1,102 @@
+import { Field, ID, ObjectType } from 'type-graphql'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Bizplace } from '@things-factory/biz-base'
+import { Domain } from '@things-factory/shell'
+
+import { OrderPackage, OrderProduct } from '../'
+
+@Entity()
+@Index(
+  'ix_order_package_item_0',
+  (orderPackageItem: OrderPackageItem) => [orderPackageItem.domain, orderPackageItem.name],
+  { unique: true }
+)
+@ObjectType({ description: 'Entity for OrderPackageItem' })
+export class OrderPackageItem {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @ManyToOne(type => Domain)
+  @Field({ nullable: true })
+  domain?: Domain
+
+  @RelationId((orderPackageItem: OrderPackageItem) => orderPackageItem.domain)
+  domainId?: string
+
+  @ManyToOne(type => Bizplace)
+  @Field(type => Bizplace, { nullable: true })
+  bizplace?: Bizplace
+
+  @RelationId((orderPackageItem: OrderPackageItem) => orderPackageItem.bizplace)
+  bizplaceId?: string
+
+  @ManyToOne(type => OrderPackage)
+  @Field(type => OrderPackage, { nullable: true })
+  orderPackage?: OrderPackage
+
+  @RelationId((orderPackageItem: OrderPackageItem) => orderPackageItem.orderPackage)
+  orderPackageId?: string
+
+  @ManyToOne(type => OrderProduct)
+  @Field(type => OrderProduct, { nullable: true })
+  orderProduct?: OrderProduct
+
+  @RelationId((orderPackageItem: OrderPackageItem) => orderPackageItem.orderProduct)
+  orderProductId?: string
+
+  @Column()
+  @Field()
+  name: string
+
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  status?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  releaseQty: number
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  packedQty: number
+
+  @CreateDateColumn()
+  @Field({ nullable: true })
+  createdAt?: Date
+
+  @UpdateDateColumn()
+  @Field({ nullable: true })
+  updatedAt?: Date
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  @Field({ nullable: true })
+  creator?: User
+
+  @RelationId((orderPackageItem: OrderPackageItem) => orderPackageItem.creator)
+  creatorId?: string
+
+  @ManyToOne(type => User, {
+    nullable: true
+  })
+  @Field({ nullable: true })
+  updater?: User
+
+  @RelationId((orderPackageItem: OrderPackageItem) => orderPackageItem.creator)
+  updaterId?: string
+}

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

@@ -22,6 +22,7 @@ import { CollectionOrder } from '../collection-order/collection-order'
 import { DeliveryOrder } from '../delivery-order/delivery-order'
 import { DraftReleaseGood } from '../draft-release-good/draft-release-good'
 import { OrderInventory } from '../order-inventory/order-inventory'
+import { OrderPackageItem } from '../order-package-item/order-package-item'
 import { PurchaseOrder } from '../purchase-order/purchase-order'
 import { ReleaseGood } from '../release-good/release-good'
 import { RetailReplenishmentOrder } from '../retail-replenishment-order/retail-replenishment-order'
@@ -131,6 +132,10 @@ export class OrderProduct {
   @Field(type => [OrderInventory], { nullable: true })
   orderInventories: OrderInventory
 
+  @OneToMany(type => OrderPackageItem, orderPackageItem => orderPackageItem.orderProduct)
+  @Field(type => [OrderPackageItem], { nullable: true })
+  orderPackageItems: OrderPackageItem[]
+
   @ManyToOne(type => RetailReplenishmentOrder)
   @Field(type => RetailReplenishmentOrder, { nullable: true })
   retailReplenishmentOrder: RetailReplenishmentOrder

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

@@ -206,30 +206,30 @@ export class OtherQuery {
 
       let packageUomValue = availableItem ? availableItem.remainUomValue / availableItem.remainQty : null
       const newOrderInventory: any = {
-        product:
-          total > 0 ? { id: items[0].productId, sku: items[0].productSKU, name: items[0].productName } : { id: null },
-        productDetail: total > 0 ? { id: items[0].productDetailId } : null,
-        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 : ''
-              }
-            : null,
-        productId: total > 0 ? items[0].productId : null,
-        productDetailID: total > 0 ? items[0].productDetailId : null,
-        productSKU: total > 0 ? items[0].productSKU : orderInventory.productSKU,
-        productName: total > 0 ? items[0].productName : null,
-        uom: total > 0 ? items[0].uom : null,
-        remainQty: total > 0 ? items[0].remainQty : null,
-        remainUomValue: total > 0 ? items[0].remainUomValue : null,
-        remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : '',
-        batchId: total > 0 ? items[0].batchId : null,
-        batchIdRef: total > 0 ? items[0].batchIdRef : null,
-        packingType: total > 0 ? items[0].packingType : orderInventory.packingType,
-        packingSize: total > 0 ? items[0].packingSize : 1,
+        product: availableItem
+          ? { id: availableItem.productId, sku: availableItem.productSKU, name: availableItem.productName }
+          : { id: null },
+        productDetail: availableItem ? { id: availableItem.productDetailId } : null,
+        inventory: availableItem
+          ? {
+              ...availableItem,
+              remainQty: availableItem ? availableItem.remainQty : null,
+              remainUomValue: availableItem ? availableItem.remainUomValue : null,
+              remainUomValueWithUom: availableItem ? availableItem.remainUomValueWithUom : ''
+            }
+          : null,
+        productId: availableItem ? availableItem.productId : null,
+        productDetailID: availableItem ? availableItem.productDetailId : null,
+        productSKU: availableItem ? availableItem.productSKU : orderInventory.productSKU,
+        productName: availableItem ? availableItem.productName : null,
+        uom: availableItem ? availableItem.uom : null,
+        remainQty: availableItem ? availableItem.remainQty : null,
+        remainUomValue: availableItem ? availableItem.remainUomValue : null,
+        remainUomValueWithUom: availableItem ? availableItem.remainUomValueWithUom : '',
+        batchId: availableItem ? availableItem.batchId : null,
+        batchIdRef: availableItem ? availableItem.batchIdRef : null,
+        packingType: availableItem ? availableItem.packingType : orderInventory.packingType,
+        packingSize: availableItem ? availableItem.packingSize : 1,
         releaseQty: orderInventory.releaseQty
           ? Number.isInteger(orderInventory.releaseQty)
             ? orderInventory.releaseQty
@@ -241,7 +241,7 @@ export class OtherQuery {
             : null
           : null,
         groupType: availableItem ? availableItem.groupType : null,
-        isError: !availableItem || !orderInventory.releaseQty || !orderInventory.packingType ? true : false
+        isError: !availableItem || !orderInventory.releaseQty ? true : false
       }
 
       newOrderInventories.push(newOrderInventory)

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

@@ -10,6 +10,7 @@ import { Inventory, LOCATION_TYPE } from '@things-factory/warehouse-base'
 
 import { ATTACHMENT_TYPE, ORDER_INVENTORY_STATUS, ORDER_STATUS } from '../../constants'
 import { OrderInventory } from '../order-inventory/order-inventory'
+import { OrderPackage } from '../order-package/order-package'
 import { ShippingOrder } from '../shipping-order/shipping-order'
 import { ReleaseGood } from './release-good'
 import { NewReleaseGood, ReleasableInventoryList, ReleaseGoodList } from './release-good-types'
@@ -182,6 +183,7 @@ export class ReleaseGoodQuery {
           'arrivalNotice',
           'orderProducts',
           'orderProducts.product',
+          'orderPackages',
           'orderVass',
           'orderVass.vas',
           'orderVass.targetProduct',
@@ -492,16 +494,30 @@ export class ReleaseGoodQuery {
 
       let [items, total] = await qb.getManyAndCount()
 
-      items = items
-        .filter(item => {
-          return item.domainId === domain.id
-        })
-        .map(item => {
-          return {
-            ...item,
-            orderRemark: item?.remark ? true : false
-          }
-        })
+      items = await Promise.all(
+        items
+          .filter(item => {
+            return item.domainId === domain.id
+          })
+          .map(async item => {
+            const orderPackages: OrderPackage[] = await getRepository(OrderPackage).find({
+              where: { releaseGood: item, domain, bizplace: item.bizplace }
+            })
+            return {
+              ...item,
+              transporter: orderPackages?.length
+                ? [
+                    ...new Set(
+                      orderPackages.map(op => {
+                        return op.transporter
+                      })
+                    )
+                  ].join(', ')
+                : null,
+              orderRemark: item?.remark ? true : false
+            }
+          })
+      )
       console.timeEnd('t1')
       return { items, total }
     } catch (error) {

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

@@ -25,6 +25,7 @@ import {
   InventoryInfos,
   Manifest,
   OrderInventory,
+  OrderPackage,
   OrderProduct,
   OrderVas,
   ShippingOrder,
@@ -159,6 +160,10 @@ export class ReleaseGood {
   @Field(type => [OrderProduct], { nullable: true })
   orderProducts: OrderProduct[]
 
+  @OneToMany(type => OrderPackage, orderPackage => orderPackage.releaseGood)
+  @Field(type => [OrderPackage], { nullable: true })
+  orderPackages: OrderPackage[]
+
   @Column()
   @Field()
   status: string
@@ -307,6 +312,10 @@ export class ReleaseGood {
   @Field({ nullable: true })
   packageId: string
 
+  @Column({ nullable: true, default: false })
+  @Field({ nullable: true })
+  packOrderFail: Boolean
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   transporter: string

package/server/utils/order-no-generator.ts

@@ -50,6 +50,13 @@ export class OrderNoGenerator {
     }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
   }
 
+  static orderPackage() {
+    const currentDate = new Date()
+    return `OPK-${currentDate.getFullYear()}${
+      currentDate.getMonth() + 1
+    }${currentDate.getDate()}${currentDate.getHours()}${currentDate.getMinutes()}${currentDate.getSeconds()}${currentDate.getMilliseconds()}`
+  }
+
   static orderInventory() {
     return uuidv4()
   }
@@ -58,6 +65,10 @@ export class OrderNoGenerator {
     return `OP-${uuidv4()}`
   }
 
+  static orderPackageItem() {
+    return `OPKI-${uuidv4()}`
+  }
+
   static invoiceProduct() {
     return `IP-${uuidv4()}`
   }