@things-factory/tax-invoice 6.2.147 → 6.2.152

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/tax-invoice",
-  "version": "6.2.147",
+  "version": "6.2.152",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -29,10 +29,10 @@
   "dependencies": {
     "@operato/graphql": "^1.0.0",
     "@operato/shell": "^1.0.0",
-    "@things-factory/auth-base": "^6.2.147",
+    "@things-factory/auth-base": "^6.2.152",
     "@things-factory/env": "^6.2.139",
     "@things-factory/export-ui-excel": "^6.2.147",
     "@things-factory/shell": "^6.2.147"
   },
-  "gitHead": "4b93b26f0edfea36d6273d1caf736477a5e2ceed"
+  "gitHead": "07e71fb59347f6dd06372f2bcfbce84f63601f5e"
 }

package/server/service/index.ts

@@ -2,6 +2,7 @@
 export * from './tax-audit-result/tax-audit-result'
 export * from './tax-invoice-item/tax-invoice-item'
 export * from './tax-invoice/tax-invoice'
+export * from './tax-invoice-company/tax-invoice-company'
 
 /* IMPORT ENTITIES AND RESOLVERS */
 import { entities as TaxAuditResultEntities, resolvers as TaxAuditResultResolvers, subscribers as TaxAuditResultSubscribers } from './tax-audit-result'

package/server/service/tax-invoice/tax-invoice-mutation.ts

@@ -135,7 +135,4 @@ export class TaxInvoiceMutation {
 
     return true
   }
-
-  // YYYYMMDD => YYYY-MM-DD
-  private _dateFormat = date => date.replace(/(\d{4})(\d{2})(\d{2})/g, '$1-$2-$3')
 }

package/server/service/tax-invoice/tax-invoice-query.ts

@@ -1,7 +1,7 @@
 import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx } from 'type-graphql'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
-import { TaxInvoice } from './tax-invoice'
+import { Category, Purpose, TaxInvoice } from './tax-invoice'
 import { TaxInvoiceList, TaxInvoiceSummary } from './tax-invoice-type'
 import { TaxInvoiceItem } from '../tax-invoice-item/tax-invoice-item'
 
@@ -34,18 +34,30 @@ export class TaxInvoiceQuery {
   @Query(returns => TaxInvoiceSummary, { description: 'To fetch TaxInvoices Summary' })
   async taxInvoicesSummary(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<TaxInvoiceSummary> {
     const { domain } = context.state
+    let category = params.filters.filter(v => v.name === 'category')?.[0]?.value
 
     const queryBuilder = getQueryBuilderFromListParams({
       domain,
       params: { ...params, pagination: {} },
       repository: await getRepository(TaxInvoice)
     })
-    const summary = await queryBuilder
-      .select('SUM(supply_amount)', 'supply_amount')
-      .addSelect('SUM(tax_amount)', 'tax_amount')
-      .addSelect('SUM(total_amount)', 'total_amount')
-      .addSelect('COUNT(id)', 'cnt')
-      .getRawOne()
+
+    // 매입/매출이 있으면 그냥 가격으로 표시, 전체 조회면 매출-매입 으로 계산
+    if (category) {
+      queryBuilder
+        .select('COUNT(id)', 'cnt')
+        .addSelect('SUM(supply_amount)', 'supply_amount')
+        .addSelect('SUM(tax_amount)', 'tax_amount')
+        .addSelect('SUM(total_amount)', 'total_amount')
+    } else {
+      queryBuilder
+        .select('COUNT(id)', 'cnt')
+        .addSelect(`SUM(CASE WHEN category = \'${Category.EXPORT}\' THEN supply_amount ELSE -1 * supply_amount END)`, 'supply_amount')
+        .addSelect(`SUM(CASE WHEN category = \'${Category.EXPORT}\' THEN tax_amount ELSE -1 * tax_amount END)`, 'tax_amount')
+        .addSelect(`SUM(CASE WHEN category = \'${Category.EXPORT}\' THEN total_amount ELSE -1 * total_amount END)`, 'total_amount')
+    }
+
+    const summary = await queryBuilder.getRawOne()
 
     return { summary }
   }

package/server/service/tax-invoice/tax-invoice-type.ts

@@ -46,6 +46,9 @@ export class NewTaxInvoice {
   @Field({ nullable: true })
   remark2?: string
 
+  @Field({ nullable: true })
+  isSentByApi?: boolean
+
   @Field({ nullable: true })
   supplierBusinessRegistrationCategory: BusinessRegistrationCategory
 

package/server/service/tax-invoice/tax-invoice-util.ts

@@ -150,6 +150,7 @@ export function parseTaxInvoiceByUnipostFormat(unipostTaxInvoice: UnipostTaxInvo
     remark0: unipostTaxInvoice.tid_desc0,
     remark1: unipostTaxInvoice.tid_desc1,
     remark2: unipostTaxInvoice.tid_desc2,
+    isSentByApi: true,
     category: category,
     supplierBusinessRegistrationCategory: unipostTaxInvoice.tit_alice_specorg_biztypecode,
     supplierBusinessRegistrationNumber: unipostTaxInvoice.tit_alice_id,

package/server/service/tax-invoice/tax-invoice.ts

@@ -146,6 +146,10 @@ export class TaxInvoice {
   @Field({ nullable: true, description: '비고2' })
   remark2?: string
 
+  @Column({ nullable: true, default: false, comment: 'API를 통한 발행 여부' })
+  @Field({ nullable: true, description: 'API를 통한 발행 여부' })
+  isSentByApi?: boolean
+
   @Column({ nullable: true, comment: '공급자 사업자등록번호 구분 코드' })
   @Field({ nullable: true, description: '공급자 사업자등록번호 구분 코드' })
   supplierBusinessRegistrationCategory?: BusinessRegistrationCategory