@things-factory/product-base 8.0.94 → 8.0.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-base",
-  "version": "8.0.94",
+  "version": "8.0.99",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,9 +24,9 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^8.0.94",
-    "@things-factory/env": "^8.0.88",
-    "@things-factory/routing-base": "^8.0.94"
+    "@things-factory/biz-base": "^8.0.97",
+    "@things-factory/env": "^8.0.97",
+    "@things-factory/routing-base": "^8.0.97"
   },
-  "gitHead": "8624fb1b8c9d979f1b5edf747c5ee1d08cf79a6f"
+  "gitHead": "ee24bba374af0ef69f9dbc126748346211bc4eca"
 }

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

@@ -121,6 +121,8 @@ export class ProductQuery {
         .leftJoinAndSelect('Product.routing', 'Routing')
         .leftJoinAndSelect('Product.deliverTo', 'deliverTo')
         .leftJoinAndSelect('Product.manufacturedBy', 'manufacturedBy')
+        .leftJoinAndSelect('Product.stockRefProduct', 'stockRefProduct')
+        .leftJoinAndSelect('Product.defaultContactPoint', 'defaultContactPoint')
         .getManyAndCount()
 
       items = items.map(itm => {

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

@@ -238,6 +238,30 @@ export class NewProduct {
 
   @Field({ nullable: true })
   defaultPrintUomUnit?: string
+
+  // 발주버튼(2F)
+  @Field(type => Boolean, { nullable: true })
+  isPurchaseOrder?: boolean
+
+  // 발주수율(2F, %)
+  @Field(type => Float, { nullable: true })
+  purchaseYield?: number
+
+  // 발주배수(2F)
+  @Field(type => Float, { nullable: true })
+  purchaseMultiple?: number
+
+  // 실발주 하위지정(2F)
+  @Field(type => ObjectRef, { nullable: true })
+  stockRefProduct?: ObjectRef
+
+  // 기본거래처(2F)
+  @Field(type => ObjectRef, { nullable: true })
+  defaultContactPoint?: ObjectRef
+
+  // 2층구분(2F)
+  @Field({ nullable: true })
+  secondFloorType?: string
 }
 
 @ObjectType()
@@ -489,6 +513,30 @@ export class ProductPatch {
   @Field({ nullable: true })
   defaultPrintUomUnit?: string
 
+  // 발주버튼(2F)
+  @Field(type => Boolean, { nullable: true })
+  isPurchaseOrder?: boolean
+
+  // 발주수율(2F, %)
+  @Field(type => Float, { nullable: true })
+  purchaseYield?: number
+
+  // 발주배수(2F)
+  @Field(type => Float, { nullable: true })
+  purchaseMultiple?: number
+
+  // 실발주 하위지정(2F)
+  @Field(type => ObjectRef, { nullable: true })
+  stockRefProduct?: ObjectRef
+
+  // 기본거래처(2F)
+  @Field(type => ObjectRef, { nullable: true })
+  defaultContactPoint?: ObjectRef
+
+  // 2층구분(2F)
+  @Field({ nullable: true })
+  secondFloorType?: string
+
   @Field({ nullable: true })
   cuFlag?: string
 }

package/server/service/product/product.ts

@@ -31,6 +31,15 @@ export enum pickStrategy {
   LOCATION = 'LOCATION'
 }
 
+// 2층구분 (승화 2층 발주/작업지시 시스템)
+export enum SecondFloorProductType {
+  NORMAL = 'NORMAL', // 기본
+  FINISHED_2F = 'FINISHED_2F', // 2층완제품
+  HALB_2F = 'HALB_2F', // 2층반제품
+  SAUCE_2F = 'SAUCE_2F', // 2층소스
+  SAUCE_DIVIDE_2F = 'SAUCE_DIVIDE_2F' // 2층소스소분
+}
+
 @Entity()
 @Index(
   'ix_product_0',
@@ -105,6 +114,49 @@ export class Product {
   @Field({ nullable: true })
   category?: string
 
+  // 발주버튼(2F) - 승화 2층 구매팀 발주시스템 취합 대상 여부
+  @Column({ nullable: true, default: false, comment: '발주버튼(2F) - 구매팀 발주시스템에 뜨는지 여부' })
+  @Field({ nullable: true })
+  isPurchaseOrder?: boolean
+
+  // 발주수율(2F, %) - 발주대비필요량 계산의 분모 (기존 auxUnit2 수율과 별개)
+  // 기본값 100 = 수율 손실 없음(나눗셈에 영향 없음)
+  @Column('float', { nullable: true, default: 100, transformer: roundTransformer, comment: '발주수율(2F, %)' })
+  @Field({ nullable: true })
+  purchaseYield?: number
+
+  // 발주배수(2F) - 배수감안량 = 발주대비필요량 x 발주배수
+  // 기본값 1 = 배수 미적용(곱셈에 영향 없음)
+  @Column('float', { nullable: true, default: 1, transformer: roundTransformer, comment: '발주배수(2F)' })
+  @Field({ nullable: true })
+  purchaseMultiple?: number
+
+  // 실발주 하위지정(2F) - 가공품에 설정하고 하위 원자재를 지정한다(예: [세척]깐양파 → 깐양파).
+  // 발주 화면에서 지정된 원자재 줄의 재고량에 이 제품의 재고가 합산된다
+  @ManyToOne(type => Product, { nullable: true })
+  @Field({ nullable: true })
+  stockRefProduct?: Product
+
+  @RelationId((product: Product) => product.stockRefProduct)
+  stockRefProductId?: string
+
+  // 기본거래처(2F) - 발주 시 우선 표시되는 거래처(수정 가능)
+  @ManyToOne(type => ContactPoint, { nullable: true })
+  @Field({ nullable: true })
+  defaultContactPoint?: ContactPoint
+
+  @RelationId((product: Product) => product.defaultContactPoint)
+  defaultContactPointId?: string
+
+  // 2층구분(2F) - SecondFloorProductType(NORMAL 기본/FINISHED_2F 2층완제품/HALB_2F 2층반제품/SAUCE_2F 2층소스/SAUCE_DIVIDE_2F 2층소스소분)
+  @Column({
+    nullable: true,
+    default: SecondFloorProductType.NORMAL,
+    comment: '2층구분(NORMAL/FINISHED_2F/HALB_2F/SAUCE_2F/SAUCE_DIVIDE_2F)'
+  })
+  @Field({ nullable: true })
+  secondFloorType?: string
+
   // 경매입고
   @Column({ nullable: true, default: false })
   @Field({ nullable: true })