@things-factory/id-rule-base 6.1.84 → 6.1.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/id-rule-base",
-  "version": "6.1.84",
+  "version": "6.1.89",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -25,13 +25,13 @@
   },
   "dependencies": {
     "@operato/data-grist": "^1.3.5",
-    "@things-factory/i18n-base": "^6.1.84",
-    "@things-factory/setting-base": "^6.1.84",
-    "@things-factory/shell": "^6.1.84",
+    "@things-factory/i18n-base": "^6.1.89",
+    "@things-factory/setting-base": "^6.1.89",
+    "@things-factory/shell": "^6.1.89",
     "codemirror": "^5.64.0"
   },
   "devDependencies": {
     "@types/codemirror": "^5.60.5"
   },
-  "gitHead": "66cd7dd022e34cbd91dcd66e71320305be11873c"
+  "gitHead": "0f7df2076bff1b4df728ecaaf288c2a692f43478"
 }

package/server/service/doc-number/doc-number-mutation.ts

@@ -0,0 +1,121 @@
+
+import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
+import { In } from 'typeorm'
+import { DocNumber } from './doc-number'
+import { NewDocNumber, DocNumberPatch } from './doc-number-type'
+import { Domain, getRepository } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
+
+@Resolver(DocNumber)
+export class DocNumberMutation {
+  @Directive('@transaction')
+  @Mutation(returns => DocNumber, { description: 'To create new DocNumber' })
+  async createDocNumber(@Arg('docNumber') docNumber: NewDocNumber, @Ctx() context: any): Promise<DocNumber> {
+    const { domain, user, tx } = context.state
+
+    return await tx.getRepository(DocNumber).save({
+      ...docNumber,
+      domain,
+      creator: user,
+      updater: user
+    })
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => DocNumber, { description: 'To modify DocNumber information' })
+  async updateDocNumber(
+    @Arg('id') id: string,
+    @Arg('patch') patch: DocNumberPatch,
+    @Ctx() context: any
+  ): Promise<DocNumber> {
+    const { domain, user, tx } = context.state
+
+    const repository = tx.getRepository(DocNumber)
+    const docNumber = await repository.findOne(
+      {
+        where: { domain: { id: domain.id }, id },
+        relations: ['domain','updater','creator']
+      }
+    )
+
+    return await repository.save({
+      ...docNumber,
+      ...patch,
+      updater: user
+    })
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => [DocNumber], { description: "To modify multiple DocNumbers' information" })
+  async updateMultipleDocNumber(
+    @Arg('patches', type => [DocNumberPatch]) patches: DocNumberPatch[],
+    @Ctx() context: any
+  ): Promise<DocNumber[]> {
+    const { domain, user, tx } = context.state
+
+    let results = []
+    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
+    const docNumberRepo = tx.getRepository(DocNumber)
+
+    if (_createRecords.length > 0) {
+      for (let i = 0; i < _createRecords.length; i++) {
+        const newRecord = _createRecords[i]
+
+        const result = await docNumberRepo.save({
+          ...newRecord,
+          domain,
+          creator: user,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: '+' })
+      }
+    }
+
+    if (_updateRecords.length > 0) {
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const updRecord = _updateRecords[i]
+        const docNumber = await docNumberRepo.findOne({
+          where: { domain: { id: domain.id }, id:updRecord.id },
+          relations: ['domain','updater','creator']
+        })
+        
+        const result = await docNumberRepo.save({
+          ...docNumber,
+          ...updRecord,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: 'M' })
+      }
+    }
+
+    return results
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => Boolean, { description: 'To delete DocNumber' })
+  async deleteDocNumber(@Arg('id') id: string, @Ctx() context: any): Promise<boolean> {
+    const { domain, tx, user } = context.state
+    await tx.getRepository(DocNumber).remove({ domain, id, updater:user })
+    return true
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => Boolean, { description: 'To delete multiple docNumbers' })
+  async deleteDocNumbers(
+    @Arg('ids', type => [String]) ids: string[],
+    @Ctx() context: any
+  ): Promise<boolean> {
+    const { domain, tx, user } = context.state
+
+    let delEntitis = ids.map(id=>{
+      return {domain,id,updater:user}
+    })
+
+    await tx.getRepository(DocNumber).remove(delEntitis)
+
+    return true
+  }
+}

package/server/service/doc-number/doc-number-query.ts

@@ -0,0 +1,146 @@
+
+import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
+import { ListParam, convertListParams, getRepository, getQueryBuilderFromListParams } from '@things-factory/shell'
+import { DocNumber } from './doc-number'
+import { DocNumberList } from './doc-number-type'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
+
+@Resolver(DocNumber)
+export class DocNumberQuery {
+  @Query(returns => DocNumber, { description: 'To fetch a DocNumber' })
+  async docNumber(@Arg('id') id: string, @Ctx() context: any): Promise<DocNumber> {
+    const { domain } = context.state
+    return await getRepository(DocNumber).findOne({
+      where: { domain: { id: domain.id }, id }
+    })
+  }
+
+  @Query(returns => DocNumberList, { description: 'To fetch multiple DocNumbers' })
+  async docNumbers(@Args() params: ListParam, @Ctx() context: any): Promise<DocNumberList> {
+    const { domain } = context.state
+
+    const queryBuilder = getQueryBuilderFromListParams({
+      domain,
+      params,
+      repository: await getRepository(DocNumber),
+      searchables: ['code', 'description']
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+    return { items, total }
+  }
+
+  @Query(returns => DocNumber, { description: 'To generate a new DocNumber' })
+  async getNewDocNumber(@Arg('id') id: string, @Ctx() context: any): Promise<DocNumber> {
+    const { domain } = context.state
+
+    // 1. find one by id - TODO by Lock
+    let docNumber = await getRepository(DocNumber).findOne({
+      where: { domain: { id: domain.id }, id }
+    })
+
+    // 2. find one by code - TODO by Lock
+    if(docNumber == null) {
+      docNumber = await getRepository(DocNumber).findOne({
+        where: { domain: { id: domain.id }, code : id }
+      })
+    }
+
+    // 3. TODO throw exception
+    if(docNumber == null) {
+      return null
+    } 
+
+    // 4. 시퀀스 증가
+    let newDocNum = docNumber.currentNo
+
+    if(docNumber.useDbSeqFlag) {
+      // TODO DATABASE SEQUENCE 호출
+      newDocNum += 1
+    } else {
+      newDocNum = docNumber.currentNo ? docNumber.currentNo + 1 : 1
+    }
+
+    // 5. 문서 번호 expression 구성
+    if(!docNumber.expression) {
+      docNumber.updateExpression()
+    }
+
+    let expression =  docNumber.expression
+
+    // 6. 시퀀스 번호 사이클 처리
+    if(newDocNum > docNumber.endNo) {
+      newDocNum = docNumber.startNo
+    }
+
+    // 7. 자리수 설정
+    let newDocNoStr = newDocNum.toString()
+    let docNumLength = newDocNoStr.length
+    let docNoDigit = docNumber.seqDigitNum ? docNumber.seqDigitNum : 1
+
+    // 8. 시퀀스 번호가 시퀀스 번호 사이즈보다 작은 경우 앞에 0을 붙임
+    if(docNoDigit > docNumLength) {
+      let addZeroCnt = docNoDigit - docNumLength
+      for(let i = 0 ; i < addZeroCnt ; i++) {
+        newDocNoStr = '0' + newDocNoStr
+      }
+    } 
+
+    // 9. 문서 번호 구성
+    let newDocNumber = expression.replace('${SEQ}', newDocNoStr)
+    let docUpdateInterval = docNumber.updateInterval
+    if(docUpdateInterval && docUpdateInterval != 'NONE') {
+      const today = new Date();
+      let todayStr = today.getFullYear() + (today.getMonth() > 9 ? '' + today.getMonth() + 1 : '0' + today.getMonth() + 1) + today.getDate()
+      let intervalVal = ''
+
+      if(docUpdateInterval == 'yy') {
+        intervalVal = todayStr.substring(2, 4)
+
+      } else if(docUpdateInterval == 'yyyy') {
+        intervalVal = todayStr.substring(0, 4)
+
+      } else if(docUpdateInterval == 'yyMM') {
+        intervalVal = todayStr.substring(2, 6)
+
+      } else if(docUpdateInterval == 'yyyyMM') {
+        intervalVal = todayStr.substring(0, 6)
+
+      } else if(docUpdateInterval == 'yyMMdd') {
+        intervalVal = todayStr.substring(2, 8)
+
+      } else if(docUpdateInterval == 'yyyyMMdd') {
+        intervalVal = todayStr
+      }
+
+      newDocNumber = newDocNumber.replace('${' + docUpdateInterval + '}', intervalVal)
+    }
+
+    // 10. 현재 시퀀스 번호 저장
+    docNumber.domain = domain
+    docNumber.currentNo = newDocNum
+    docNumber.lastDocNumber = newDocNumber
+    await getRepository(DocNumber).save(docNumber)
+
+    // 11. 최종 
+    return docNumber
+  }
+
+  @FieldResolver(type => Domain)
+  async domain(@Root() docNumber: DocNumber): Promise<Domain> {
+    return await getRepository(Domain).findOneBy({id:docNumber.domainId})
+  }
+
+  @FieldResolver(type => User)
+  async creator(@Root()  docNumber: DocNumber): Promise<User> {
+    return await getRepository(User).findOneBy({id:docNumber.creatorId})
+  }
+
+  @FieldResolver(type => User)
+  async updater(@Root()  docNumber: DocNumber): Promise<User> {
+    return await getRepository(User).findOneBy({id:docNumber.updaterId})
+  }
+}

package/server/service/doc-number/doc-number-type.ts

@@ -0,0 +1,115 @@
+
+import { ObjectType, Field, InputType, Int, ID, Float, registerEnumType } from 'type-graphql'
+import { DocNumber } from './doc-number'
+
+@InputType()
+export class NewDocNumber {
+
+  @Field({ nullable: false })
+  code: string
+
+  @Field({ nullable: false })
+  description: string
+
+  @Field(type => Int, { nullable: true })
+  startNo: number
+
+  @Field(type => Int, { nullable: true })
+  endNo: number
+
+  @Field(type => Int, { nullable: true })
+  currentNo?: number
+
+  @Field({ nullable:true })
+  prefix?: string
+
+  @Field({ nullable:true })
+  suffix?: string
+
+  @Field({ nullable: true })
+  updateInterval?: string
+
+  @Field({ nullable: true })
+  useDbSeqFlag?: boolean
+
+  @Field({ nullable: false })
+  seqName: string
+
+  @Field(type => Int, { nullable: true })
+  seqDigitNum?: number
+
+  @Field({ nullable: true })
+  separator?: string
+
+  @Field({ nullable: true })
+  expression?: string
+
+  @Field({ nullable: true })
+  lastDocNumber?: string
+
+  @Field({ nullable: true })
+  activeFlag?: boolean
+}
+
+@InputType()
+export class DocNumberPatch {
+  @Field(type => ID, { nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  code?: string
+
+  @Field({ nullable: true })
+  description?: string
+
+  @Field(type => Int, { nullable: true })
+  startNo?: number
+
+  @Field(type => Int, { nullable: true })
+  endNo?: number
+
+  @Field(type => Int, { nullable: true })
+  currentNo?: number
+
+  @Field({ nullable:true })
+  prefix?: string
+
+  @Field({ nullable:true })
+  suffix?: string
+
+  @Field({ nullable: true })
+  updateInterval?: string
+
+  @Field({ nullable: true })
+  useDbSeqFlag?: boolean
+
+  @Field({ nullable: true })
+  seqName?: string
+
+  @Field(type => Int, { nullable: true })
+  seqDigitNum?: number
+
+  @Field({ nullable: true })
+  separator?: string
+
+  @Field({ nullable: true })
+  expression?: string
+
+  @Field({ nullable: true })
+  lastDocNumber?: string
+
+  @Field({ nullable: true })
+  activeFlag?: boolean
+
+  @Field()
+  cuFlag: string
+}
+
+@ObjectType()
+export class DocNumberList {
+  @Field(type => [DocNumber])
+  items: DocNumber[]
+
+  @Field(type => Int)
+  total: number
+}

package/server/service/doc-number/doc-number.ts

@@ -0,0 +1,162 @@
+
+import {
+  CreateDateColumn,
+  UpdateDateColumn,
+  Entity,
+  Index,
+  Column,
+  RelationId,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  BeforeInsert
+} from 'typeorm'
+import { ObjectType, Field, Int, ID } from 'type-graphql'
+
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+
+@Entity('doc_numbers')
+@Index('ix_doc_number_0', (docNumber: DocNumber) => [docNumber.domain,docNumber.code], { unique: true })
+@ObjectType({ description: 'Entity for DocNumber' })
+export class DocNumber {
+
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @Column({ name:'code', type:'character varying', nullable:false })
+  @Field({ nullable:false })
+  code: string
+
+  @Column({ name:'description', type:'character varying', nullable:false })
+  @Field({ nullable:false })
+  description: string
+
+  @Column({ name:'prefix', type:'character varying', nullable:true })
+  @Field({ nullable:true })
+  prefix?: string
+
+  @Column({ name:'suffix', type:'character varying', nullable:true })
+  @Field({ nullable:true })
+  suffix?: string
+
+  @Column({ name:'start_no', type:'integer', nullable:true  })
+  @Field(type =>Int, { nullable:true })
+  startNo?: number
+
+  @Column({ name:'end_no', type:'integer', nullable:true  })
+  @Field(type =>Int, { nullable:true })
+  endNo?: number
+
+  @Column({ name:'current_no', type:'integer', nullable:true  })
+  @Field(type =>Int, { nullable:true })
+  currentNo?: number
+
+  @Column({ name:'update_interval', type:'character varying', nullable:true })
+  @Field({ nullable:true })
+  updateInterval?: string
+
+  @Column({ name:'use_db_seq_flag', type:'boolean', nullable:true, default: false})
+  @Field({ nullable:true })
+  useDbSeqFlag?: boolean
+
+  @Column({ name:'seq_name', type:'character varying', nullable:true })
+  @Field({ nullable:true })
+  seqName?: string
+
+  @Column({ name:'seq_digit_num', type:'integer', nullable:false  })
+  @Field(type =>Int, { nullable:false })
+  seqDigitNum: number
+
+  @Column({ name:'separator', type:'character varying', nullable:true })
+  @Field({ nullable:true })
+  separator?: string
+
+  @Column({ name:'expression', type:'character varying', nullable:true })
+  @Field({ nullable:true })
+  expression?: string
+
+  @Column({ name:'last_doc_number', type:'character varying', nullable:true })
+  @Field({ nullable:true })
+  lastDocNumber?: string
+
+  @Column({ name:'active_flag', type:'boolean', nullable:true  ,default:false})
+  @Field({ nullable:true })
+  activeFlag?: boolean
+
+  @ManyToOne(type => Domain, {createForeignKeyConstraints: false, nullable: false})
+  @Field({ nullable: false })
+  domain: Domain
+
+  @RelationId((docNumber: DocNumber) => docNumber.domain)
+  domainId: string
+
+  @ManyToOne(type => User, {createForeignKeyConstraints: false, nullable: true})
+  @Field({ nullable: true })
+  creator?: User
+
+  @RelationId((docNumber: DocNumber) => docNumber.creator)
+  creatorId?: string
+
+  @ManyToOne(type => User, {createForeignKeyConstraints: false, nullable: true})
+  @Field({ nullable: true })
+  updater?: User
+
+  @RelationId((docNumber: DocNumber) => docNumber.updater)
+  updaterId?: string
+
+  @CreateDateColumn()
+  @Field({ nullable: true })
+  createdAt?: Date
+
+  @UpdateDateColumn()
+  @Field({ nullable: true })
+  updatedAt?: Date
+
+  @BeforeInsert()
+  updateExpression() {
+    if(!this.expression || this.expression.length == 0) {
+      if(!this.startNo || this.startNo < 1) {
+        this.startNo = 1
+      }
+
+      if(!this.endNo || this.endNo <= 1) {
+        let maxNo = ''
+        for(let i = 0 ; i < this.seqDigitNum ; i++) {
+          maxNo = maxNo + '9'
+        }
+        this.endNo = Number(maxNo)
+      }
+
+      let expr = ''
+
+      if(this.prefix) {
+        expr = this.prefix
+        
+        if(this.separator) {
+          expr += this.separator
+        }  
+      }
+
+      if(this.updateInterval && this.updateInterval != 'NONE') {
+        expr += '${' + this.updateInterval + '}'
+
+        if(this.separator) {
+          expr += this.separator
+        }
+      }
+
+      expr += '${SEQ}'
+
+      if(this.suffix) {
+        if(this.separator) {
+          expr += this.separator
+        }
+        
+        expr += this.suffix
+      }
+
+      this.expression = expr
+    }
+  }
+}

package/server/service/doc-number/index.ts

@@ -0,0 +1,7 @@
+
+import { DocNumber } from './doc-number'
+import { DocNumberQuery } from './doc-number-query'
+import { DocNumberMutation } from './doc-number-mutation'
+
+export const entities = [DocNumber]
+export const resolvers = [DocNumberQuery, DocNumberMutation]

package/server/service/id-rule/id-rule-types.ts

@@ -1,11 +1,10 @@
 import { Field, InputType } from 'type-graphql'
 
-import { IdRuleType } from './id-rule'
 
 @InputType()
 export class IdRulePatch {
   @Field({ nullable: true })
-  type?: IdRuleType
+  type?: string
 
   @Field({ nullable: true })
   rule?: string
@@ -14,7 +13,7 @@ export class IdRulePatch {
 @InputType()
 export class NewIdRule {
   @Field()
-  type: IdRuleType
+  type: string
 
   @Field()
   rule: string

package/server/service/id-rule/id-rule.ts

@@ -14,32 +14,10 @@ import {
   UpdateDateColumn
 } from 'typeorm'
 
-import { config } from '@things-factory/env'
 import { Domain } from '@things-factory/shell'
 
-const ORMCONFIG = config.get('ormconfig', {})
-const DATABASE_TYPE = ORMCONFIG.type
-
-export enum IdRuleType {
-  PALLET_ID = 'pallet_id',
-  ADJUSTMENT_PALLET_ID = 'adjustment_pallet_id',
-  ADJUSTMENT_CARTON_ID = 'adjustment_carton_id',
-  INBOUND_PALLET_ID = 'inbound_pallet_id',
-  INBOUND_CARTON_ID = 'inbound_carton_id',
-  VAS_PALLET_ID = 'vas_pallet_id',
-  DO_NUMBER = 'do_number',
-  TASK_NO = 'task_number',
-  GAN_NUMBER = 'gan_number',
-  GRN_NUMBER = 'grn_number',
-  RO_NUMBER = 'ro_number',
-  PO_NUMBER = 'po_number',
-  LOT_NO = 'lot_no'
-}
-
 @Entity()
-@Index('ix_id_rule_0', (idRule: IdRule) => [idRule.domain, idRule.type], { unique: true })
 @Index('ix_id_rule_1', (idRule: IdRule) => [idRule.domain])
-@Index('ix_id_rule_2', (idRule: IdRule) => [idRule.type])
 @ObjectType()
 export class IdRule {
   @PrimaryGeneratedColumn('uuid')
@@ -53,19 +31,9 @@ export class IdRule {
   @RelationId((idRule: IdRule) => idRule.domain)
   domainId: string
 
-  @Column({
-    nullable: false,
-    type:
-      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
-        ? 'enum'
-        : DATABASE_TYPE == 'oracle'
-          ? 'varchar2'
-          : 'smallint',
-    enum: IdRuleType,
-    default: IdRuleType.PALLET_ID
-  })
-  @Field()
-  type: IdRuleType
+  @Column()
+  @Field({ nullable: true })
+  type: string
 
   @Column()
   @Field()

package/server/service/index.ts

@@ -1,14 +1,16 @@
 import { entities as IdRuleEntities, resolvers as IdRuleResolvers } from './id-rule'
 import { entities as SequenceEntities, resolvers as SequenceResolvers } from './sequence'
+import { entities as DocNumberEntities, resolvers as DocNumberResolvers } from './doc-number'
 
 /* EXPORT ENTITY TYPES */
 export * from './id-rule/id-rule'
 /* EXPORT TYPES */
 export * from './id-rule/id-rule-types'
 export * from './sequence/sequence'
+export * from './doc-number/doc-number'
 
-export const entities = [...IdRuleEntities, ...SequenceEntities]
+export const entities = [...IdRuleEntities, ...SequenceEntities, ...DocNumberEntities]
 
 export const schema = {
-  resolverClasses: [...IdRuleResolvers, ...SequenceResolvers]
+  resolverClasses: [...IdRuleResolvers, ...SequenceResolvers, ...DocNumberResolvers]
 }

package/translations/en.json

@@ -1,7 +1,22 @@
 {
+  "menu.doc-number": "Document Number",
+  "title.doc-number": "Document Number",
   "title.ID Rule Editor": "ID Rule Editor",
   "label.arguments": "arguments",
   "label.argument domain description": "domain ID",
   "label.argument seed description": "data for ID combination",
+  "label.prefix": "Prefix",
+  "label.update_interval": "Update Interval",
+  "label.use_db_seq_flag": "Use DB Sequence",
+  "label.seq_name": "Sequence Name",
+  "label.seq_digit_num": "Sequence Digit Number",
+  "label.start_no": "Start No.",
+  "label.end_no": "End No.",
+  "label.current_no": "Current No.",
+  "label.suffix": "Suffix",
+  "label.separator": "Separator",
+  "label.expression": "Expression",
+  "label.last_doc_number": "Last Document Number",
+  "label.active_flag": "Active",
   "text.please_save_your_modifications_first": "please save your modifications first"
 }