@things-factory/warehouse-base 6.2.140 → 6.2.147

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-base",
-  "version": "6.2.140",
+  "version": "6.2.147",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,12 +24,12 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^6.2.139",
-    "@things-factory/id-rule-base": "^6.2.139",
-    "@things-factory/integration-sellercraft": "^6.2.140",
-    "@things-factory/marketplace-base": "^6.2.140",
-    "@things-factory/product-base": "^6.2.139",
-    "@things-factory/setting-base": "^6.2.139"
+    "@things-factory/biz-base": "^6.2.147",
+    "@things-factory/id-rule-base": "^6.2.147",
+    "@things-factory/integration-sellercraft": "^6.2.147",
+    "@things-factory/marketplace-base": "^6.2.147",
+    "@things-factory/product-base": "^6.2.147",
+    "@things-factory/setting-base": "^6.2.147"
   },
-  "gitHead": "aa99f06916839efd1616697529c8b1a08bdebde1"
+  "gitHead": "4b93b26f0edfea36d6273d1caf736477a5e2ceed"
 }

package/server/service/inventory/inventory-query.ts

@@ -229,6 +229,7 @@ export class InventoryQuery {
       .addSelect('product.primaryUnit', 'primaryUnit')
       .addSelect('product.auxUnit1', 'auxUnit1')
       .addSelect('product.minQty', 'minQty')
+      .addSelect('product.maxQty', 'maxQty')
       .addSelect('i.product_color', 'productColor')
       .addSelect('i.product_quality', 'productQuality')
       .addSelect('i.work_category', 'workCategory')

package/server/service/inventory/inventory.ts

@@ -4,7 +4,7 @@ import { Column, CreateDateColumn, Entity, Index, ManyToOne, OneToMany, PrimaryG
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
-import { Domain, ScalarDate } from '@things-factory/shell'
+import { Domain, ScalarDate, roundTransformer } from '@things-factory/shell'
 
 import { InventoryChange } from '../inventory-change/inventory-change'
 import { InventoryItem } from '../inventory-item/inventory-item'
@@ -118,11 +118,11 @@ export class Inventory {
   @Field(type => ScalarDate, { nullable: true })
   manufactureDate: Date
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   costPrice: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   sellPrice: number
 
@@ -130,7 +130,7 @@ export class Inventory {
   @Field({ nullable: true })
   packingType: string
 
-  @Column('float', { nullable: true, default: 1 })
+  @Column('float', { nullable: true, default: 1, transformer: roundTransformer })
   @Field({ nullable: true })
   packingSize: number
 
@@ -142,23 +142,23 @@ export class Inventory {
   @Field({ nullable: true })
   uom: string
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   uomValue: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   lockedUomValue: number
 
-  @Column('float')
+  @Column('float', { transformer: roundTransformer })
   @Field({ nullable: true })
   qty: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   lockedQty: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   unitCost: number
 
@@ -248,6 +248,10 @@ export class Inventory {
   @Field({ nullable: true })
   auxInfo2?: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  auxInfo3?: string
+
   @Field(type => Float, { nullable: true })
   averageUnitCost: number
 

package/server/service/inventory-change/inventory-change-mutation.ts

@@ -1,5 +1,5 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { In, MoreThan, Not, Equal } from 'typeorm'
+import { Equal, In, MoreThan, Not } from 'typeorm'
 
 import { Bizplace } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
@@ -677,7 +677,7 @@ export async function approveInventoryChanges(patches: any, context: ResolverCon
         // Check Change of existing inventory quantity
         if (newRecord.qty != null && newRecord.qty != inventory.qty) {
           newHistoryRecord.qty = newRecord.qty - inventory.qty
-          if (newRecord.qty < 1) {
+          if (newRecord.qty <= 0) {
             newRecord.qty = 0
             newRecord.uomValue = 0
           }

package/server/service/inventory-change/inventory-change.ts

@@ -1,19 +1,10 @@
 import { Field, ID, ObjectType } from 'type-graphql'
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  RelationId,
-  UpdateDateColumn
-} from 'typeorm'
+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 { Product, ProductDetail } from '@things-factory/product-base'
-import { Domain, ScalarDate } from '@things-factory/shell'
+import { Domain, ScalarDate, roundTransformer } from '@things-factory/shell'
 
 import { InventoryHistory } from '../inventory-history/inventory-history'
 import { InventoryItemChange } from '../inventory-item-change/inventory-item-change'
@@ -24,10 +15,7 @@ import { Location } from '../location/location'
 @Index('ix_inventory-change_0', (inventoryChange: InventoryChange) => [inventoryChange.domain, inventoryChange.id], {
   unique: true
 })
-@Index('ix_inventory-change_1', (inventoryChange: InventoryChange) => [
-  inventoryChange.domain,
-  inventoryChange.inventory
-])
+@Index('ix_inventory-change_1', (inventoryChange: InventoryChange) => [inventoryChange.domain, inventoryChange.inventory])
 @ObjectType()
 export class InventoryChange {
   @PrimaryGeneratedColumn('uuid')
@@ -92,7 +80,7 @@ export class InventoryChange {
   @Field({ nullable: true })
   packingType: string
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   packingSize: number
 
@@ -100,19 +88,19 @@ export class InventoryChange {
   @Field({ nullable: true })
   uom: string
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   weight: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   uomValue: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   qty: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   unitCost: number
 

package/server/service/inventory-history/inventory-history.ts

@@ -1,19 +1,10 @@
 import { Field, ID, ObjectType } from 'type-graphql'
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  RelationId,
-  UpdateDateColumn
-} from 'typeorm'
+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 { Product, ProductDetail } from '@things-factory/product-base'
-import { Domain, ScalarDate } from '@things-factory/shell'
+import { Domain, ScalarDate, roundTransformer } from '@things-factory/shell'
 
 import { Inventory } from '../inventory/inventory'
 import { Location } from '../location/location'
@@ -21,20 +12,9 @@ import { Pallet } from '../pallet/pallet'
 import { Warehouse } from '../warehouse/warehouse'
 
 @Entity()
-@Index(
-  'ix_inventory-history_0',
-  (inventoryHistory: InventoryHistory) => [inventoryHistory.domain, inventoryHistory.name],
-  { unique: true }
-)
-@Index('ix_inventory-history_1', (inventoryHistory: InventoryHistory) => [
-  inventoryHistory.domain,
-  inventoryHistory.palletId
-])
-@Index('ix_inventory-history_2', (inventoryHistory: InventoryHistory) => [
-  inventoryHistory.inventory,
-  inventoryHistory.transactionType,
-  inventoryHistory.refOrderId
-])
+@Index('ix_inventory-history_0', (inventoryHistory: InventoryHistory) => [inventoryHistory.domain, inventoryHistory.name], { unique: true })
+@Index('ix_inventory-history_1', (inventoryHistory: InventoryHistory) => [inventoryHistory.domain, inventoryHistory.palletId])
+@Index('ix_inventory-history_2', (inventoryHistory: InventoryHistory) => [inventoryHistory.inventory, inventoryHistory.transactionType, inventoryHistory.refOrderId])
 @ObjectType()
 export class InventoryHistory {
   @PrimaryGeneratedColumn('uuid')
@@ -119,15 +99,15 @@ export class InventoryHistory {
   @Field()
   packingType?: string
 
-  @Column('float', { nullable: true, default: 1 })
+  @Column('float', { nullable: true, default: 1, transformer: roundTransformer })
   @Field({ nullable: true })
   packingSize?: number
 
-  @Column('float')
+  @Column('float', { transformer: roundTransformer })
   @Field({ nullable: true })
   qty?: number
 
-  @Column('float', { default: 0, nullable: true })
+  @Column('float', { default: 0, nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   openingQty?: number
 
@@ -135,15 +115,15 @@ export class InventoryHistory {
   @Field({ nullable: true })
   uom?: string
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   uomValue?: number
 
-  @Column('float', { default: 0, nullable: true })
+  @Column('float', { default: 0, nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   openingUomValue?: number
 
-  @Column('float', { nullable: true })
+  @Column('float', { nullable: true, transformer: roundTransformer })
   @Field({ nullable: true })
   unitCost?: number
 
@@ -175,6 +155,10 @@ export class InventoryHistory {
   @Field(type => ScalarDate, { nullable: true })
   manufactureDate?: Date
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  auxInfo3?: string
+
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   creator?: User

package/server/service/movement/movement.ts

@@ -1,18 +1,9 @@
 import { Field, Float, ID, ObjectType } from 'type-graphql'
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  RelationId,
-  UpdateDateColumn
-} from 'typeorm'
+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 { Domain, roundTransformer } from '@things-factory/shell'
 
 import { Inventory } from '../inventory/inventory'
 
@@ -39,11 +30,11 @@ export class Movement {
   @Field()
   inventory: Inventory
 
-  @Column('float')
+  @Column('float', { transformer: roundTransformer })
   @Field(type => Float)
   inQty: number
 
-  @Column('float')
+  @Column('float', { transformer: roundTransformer })
   @Field(type => Float)
   outQty: number