@things-factory/warehouse-base 6.0.127 → 6.0.133

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-base",
-  "version": "6.0.127",
+  "version": "6.0.133",
   "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.0.125",
-    "@things-factory/id-rule-base": "^6.0.125",
-    "@things-factory/integration-sellercraft": "^6.0.127",
-    "@things-factory/marketplace-base": "^6.0.127",
-    "@things-factory/product-base": "^6.0.125",
-    "@things-factory/setting-base": "^6.0.125"
+    "@things-factory/biz-base": "^6.0.133",
+    "@things-factory/id-rule-base": "^6.0.133",
+    "@things-factory/integration-sellercraft": "^6.0.133",
+    "@things-factory/marketplace-base": "^6.0.133",
+    "@things-factory/product-base": "^6.0.133",
+    "@things-factory/setting-base": "^6.0.133"
   },
-  "gitHead": "ad9678bc8d579de5907db7970515532a6fb56adf"
+  "gitHead": "c08bf83d00cbb66e1338cdfeed8ca91d4e130c97"
 }

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

@@ -197,6 +197,62 @@ export class InventoryQuery {
     })
   }
 
+  @Directive('@privilege(category: "inventory", privilege: "query", domainOwnerGranted: true)')
+  @Query(returns => InventoryList)
+  async renewInventoriesGroupByProduct(
+    @Args() params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<InventoryList> {
+    const { domain } = context.state
+
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(Inventory),
+      params,
+      alias: 'i',
+      domain,
+      searchables: ['productName', 'productSKU'],
+      filtersMap: {
+        productName: {
+          relationColumn: 'product',
+          columnName: 'name'
+        },
+        productSKU: {
+          relationColumn: 'product',
+          columnName: 'sku'
+        }
+      }
+    })
+
+    queryBuilder
+      .select('product.id', 'productId')
+      .addSelect('product.name', 'productName')
+      .addSelect('product.sku', 'productSKU')
+      .addSelect('product.type', 'productType')
+      .addSelect('product.primaryValue', 'primaryValue')
+      .addSelect('product.primaryUnit', 'primaryUnit')
+      .addSelect('product.auxUnit1', 'auxUnit1')
+      .addSelect('i.product_color', 'productColor')
+      .addSelect('i.product_quality', 'productQuality')
+      .addSelect('i.packing_type', 'packingType')
+      .addSelect('COALESCE(SUM(i.qty), 0)', 'qty')
+      .addSelect('COALESCE(SUM(i.locked_qty), 0)', 'lockQty')
+      .addSelect('COALESCE(SUM(i.uom_value), 0)', 'uomValue')
+      .addSelect('COALESCE(SUM(i.locked_uom_value), 0)', 'lockedUomValue')
+      .innerJoin('i.product', 'product', 'i.product_id = product.id')
+      .andWhere('i.status = :status', { status: INVENTORY_STATUS.STORED })
+      .andWhere('i.expiration_date >= now()')
+      .andWhere('product.domain_id = :domain', { domain: domain.id })
+      .groupBy('product.id')
+      .addGroupBy('i.product_color')
+      .addGroupBy('i.product_quality')
+      .addGroupBy('i.packing_type')
+
+    queryBuilder.orderBy('product.sku', 'ASC')
+
+    const items = await queryBuilder.getRawMany()
+    return { items, total: items.length }
+  }
+
   @Directive('@privilege(category: "inventory", privilege: "query", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Query(returns => InventoryList)

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

@@ -1,18 +1,8 @@
-import {
-  Field,
-  Float,
-  InputType,
-  Int,
-  ObjectType
-} from 'type-graphql'
+import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
 
 import { User } from '@things-factory/auth-base'
 import { ProductBundleSetting } from '@things-factory/product-base'
-import {
-  Domain,
-  ObjectRef,
-  ScalarDate
-} from '@things-factory/shell'
+import { Domain, ObjectRef, ScalarDate } from '@things-factory/shell'
 
 import { Inventory } from './inventory'
 
@@ -144,6 +134,15 @@ export class InventoryPatch {
   @Field({ nullable: true })
   updater?: string
 
+  @Field({ nullable: true })
+  productColor?: string
+
+  @Field({ nullable: true })
+  productQuality?: string
+
+  @Field({ nullable: true })
+  auxInfo2?: string
+
   @Field({ nullable: true })
   cuFlag?: string
 }

package/server/service/inventory/inventory.ts

@@ -216,9 +216,38 @@ export class Inventory {
   @Field({ nullable: true })
   productSKU: string
 
+  @Field({ nullable: true })
+  productType: string
+
+  @Field({ nullable: true })
+  primaryValue: string
+
+  @Field({ nullable: true })
+  primaryUnit: string
+
+  @Field({ nullable: true })
+  auxUnit1: string
+
   @Field({ nullable: true })
   productBrand: string
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  productColor?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  productQuality?: string
+
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  auxInfo1?: string
+
+  // 자호
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  auxInfo2?: 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 } from 'typeorm'
+import { In, MoreThan, Not, Equal } from 'typeorm'
 
 import { Bizplace } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
@@ -274,7 +274,7 @@ export class InventoryChangeMutation {
           const updateRecord = _updateRecords[i]
 
           let existingRecord = await tx.getRepository(Inventory).findOne({
-            where: { domain: { id: domain.id }, palletId: updateRecord?.palletId },
+            where: { domain: { id: domain.id }, palletId: Equal(updateRecord?.palletId) },
             relations: ['location', 'warehouse', 'product', 'bizplace']
           })
 
@@ -501,7 +501,7 @@ async function upsertInventoryItems(context, inventoryChange, approvalStatus, tx
   const { domain, user } = context.state
 
   let inventoryItemChanges: InventoryItemChange[] = await tx.getRepository(InventoryItemChange).find({
-    where: { domain: { id: domain.id }, inventoryChange: inventoryChange, status: 'PENDING' },
+    where: { domain: { id: domain.id }, inventoryChange: { id: inventoryChange.id }, status: 'PENDING' },
     relations: ['domain', 'inventoryItem', 'inventory', 'inventory.product', 'inventoryChange']
   })
   await Promise.all(

package/translations/ja.json

@@ -0,0 +1,21 @@
+{
+  "field.location": "ロケーション",
+  "field.product_batch": "製品配置",
+  "field.lot": "ロット",
+  "field.warehouse": "工場",
+  "field.zone": "ゾーン",
+  "field.section": "セクション",
+  "field.unit": "ユニット",
+  "field.shelf": "棚",
+  "field.bizplace": "作業空間",
+  "field.start_qty": "開始数量",
+  "field.in_qty": "入荷数量",
+  "field.out_qty": "出庫数量",
+  "field.end_qty": "完了数量",
+  "field.product": "商品",
+  "field.qty": "数量",
+  "field.state": "国",
+  "field.date": "日付",
+  "field.type": "タイプ",
+  "error.no_location_found": "見つかったロケーションがありません"
+}