@things-factory/sales-base 4.3.144 → 4.3.151

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,
@@ -96,8 +97,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
   })
@@ -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
@@ -168,8 +173,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
   })
@@ -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
@@ -486,6 +495,10 @@ export class ReleaseGood {
   @Field({ nullable: true })
   manifestedAt: Date
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  marketPackCallSuccess: Date
+
   @ManyToOne(type => User)
   @Field(type => User, { nullable: true })
   manifestedBy: User

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()}`
   }