@things-factory/worksheet-base 5.0.13 → 6.0.0-alpha.1

package/server/controllers/render-ro-do.ts

@@ -1,7 +1,7 @@
-import _ from 'lodash'
 import FormData from 'form-data'
+import _ from 'lodash'
 import fetch from 'node-fetch'
-import { Equal, getRepository, In } from 'typeorm'
+import { EntityManager, getManager } from 'typeorm'
 
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
@@ -9,21 +9,23 @@ import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { ProductDetail } from '@things-factory/product-base'
 import { DeliveryOrder, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 import { Inventory, Pallet } from '@things-factory/warehouse-base'
-import { InventoryItem } from '@things-factory/warehouse-base'
+
 import { TEMPLATE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'
 import { DateTimeConverter } from '../utils/datetime-util'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
-export async function renderRODO({ doNo }, context: any) {
+export async function renderRODO({ doNo }, context: ResolverContext) {
+  const { user, tx } = context.state
+
   const domain: Domain = await getRepository(Domain).findOne({
     where: { id: context.state.domain.id }
   }) //.. find domain
   const foundDO: DeliveryOrder = await getRepository(DeliveryOrder).findOne({
-    where: { domain, name: doNo },
+    where: { domain: { id: domain.id }, name: doNo },
     relations: [
       'domain',
       'bizplace',
@@ -42,7 +44,7 @@ export async function renderRODO({ doNo }, context: any) {
   let foundCP: ContactPoint = null
   if (foundDO?.contactPointRefId) {
     foundCP = await getRepository(ContactPoint).findOne({
-      where: { domain, id: foundDO.contactPointRefId }
+      where: { domain: { id: domain.id }, id: foundDO.contactPointRefId }
     })
   }
 
@@ -50,9 +52,29 @@ export async function renderRODO({ doNo }, context: any) {
   const partnerBiz: Bizplace = foundDO.bizplace //customer bizplace
   const ownRefNo = foundRO.refNo
 
-  let foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
-    `select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where outbound_order_id = '${foundDO.releaseGood.id}' group by p.sku,ii.serial_number,p.brand_sku`
-  )
+  let foundInventoryItem: any
+
+  await getManager().transaction(async (trxMgr: EntityManager) => {
+    foundInventoryItem = await trxMgr.query(
+      `
+      SELECT seq, CASE WHEN total_count = seq THEN seq ELSE NULL END AS max_seq,sku,brand_sku,serial_number FROM (
+        select row_number() over(partition by p.brand_sku ORDER BY p.brand_sku, ii.serial_number) AS "seq", 
+        count(*) over(partition by p.brand_sku) AS total_count,
+        p.sku,p.brand_sku, ii.serial_number 
+        from inventory_items ii 
+        left join products p on ii.product_id = p.id 
+        where outbound_order_id = $1
+        group by p.sku,ii.serial_number,p.brand_sku
+      ) src
+      ORDER BY sku, brand_sku, serial_number, seq
+      `,
+      [foundDO.releaseGoodId]
+    )
+  })
+
+  if (foundInventoryItem.length > 0) {
+    foundInventoryItem[0].ref_no = ownRefNo || ''
+  }
 
   const partnerDomain: Partner = await getRepository(Partner).findOne({
     where: { partnerDomain: partnerBiz.domain, domain },
@@ -68,56 +90,60 @@ export async function renderRODO({ doNo }, context: any) {
 
   // 5. find domain contact point
   const foundWarehouseCP: ContactPoint = await getRepository(ContactPoint).findOne({
-    where: { domain, bizplace: domainBizplace, type: 'WAREHOUSE' }
+    where: { domain: { id: domain.id }, bizplace: domainBizplace, type: 'WAREHOUSE' }
   })
 
   const foundWS: Worksheet = await getRepository(Worksheet).findOne({
-    where: { domain, releaseGood: foundRO },
+    where: { domain: { id: domain.id }, releaseGood: foundRO },
     relations: ['updater']
   })
 
   const foundLoadingWS: Worksheet = await getRepository(Worksheet).findOne({
-    where: { domain, releaseGood: foundRO, type: WORKSHEET_TYPE.LOADING },
+    where: { domain: { id: domain.id }, releaseGood: foundRO, type: WORKSHEET_TYPE.LOADING },
     relations: ['updater']
   })
 
   //find reusable pallet
   const foundRP: Pallet[] = await getRepository(Pallet).find({
-    where: { domain, refOrderNo: foundRO.name }
+    where: { domain: { id: domain.id }, refOrderNo: foundRO.name }
   })
 
   //find list of loaded inventory
   const targetInventories: OrderInventory[] = await getRepository(OrderInventory).find({
-    where: { domain, deliveryOrder: foundDO },
+    where: { domain: { id: domain.id }, deliveryOrder: foundDO },
     relations: ['inventory']
   })
   const orderInvIds: string[] = targetInventories.map((oi: any) => oi.id)
 
-  const foundWSD: WorksheetDetail[] = await getRepository(WorksheetDetail).find({
-    where: {
-      domain,
-      targetInventory: In(orderInvIds),
-      type: WORKSHEET_TYPE.LOADING,
-      status: Equal(WORKSHEET_STATUS.DONE)
-    },
-    relations: [
-      'targetInventory',
-      'targetInventory.inventory',
-      'targetInventory.inventory.location',
-      'targetInventory.inventory.product',
-      'targetInventory.inventory.product.productDetails',
-      'targetInventory.inventory.reusablePallet',
-      'updater'
-    ]
-  })
+  const wdQb = getRepository(WorksheetDetail).createQueryBuilder('wd')
+  wdQb
+    .leftJoinAndSelect('wd.targetInventory', 'targetInventory')
+    .leftJoinAndSelect('targetInventory.inventory', 'inventory')
+    .leftJoinAndSelect('inventory.location', 'location')
+    .leftJoinAndSelect('inventory.product', 'product')
+    .leftJoinAndSelect('product.productDetails', 'productDetails')
+    .leftJoinAndSelect('inventory.reusablePallet', 'reusablePallet')
+    .leftJoinAndSelect('wd.domain', 'domain')
+    .leftJoinAndSelect('wd.creator', 'creator')
+    .leftJoinAndSelect('wd.updater', 'updater')
+    .where('wd.domain_id = :domainId', { domainId: domain.id })
+    .andWhere('wd.target_inventory_id IN (:...orderInvIds) ', { orderInvIds })
+    .andWhere('wd.type = :type ', { type: WORKSHEET_TYPE.LOADING })
+    .andWhere('wd.status = :status ', { status: WORKSHEET_STATUS.DONE })
+    .orderBy('product.sku')
+    .addOrderBy('product.name')
+    .addOrderBy('product.description')
+    .addOrderBy('inventory.batch_id')
+
+  const foundWSD: WorksheetDetail[] = await wdQb.getMany()
 
   const foundTemplate: Attachment = await getRepository(Attachment).findOne({
-    where: { domain, category: TEMPLATE_TYPE.DO_TEMPLATE }
+    where: { domain: { id: domain.id }, category: TEMPLATE_TYPE.DO_TEMPLATE }
   })
 
   const foundLogo: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.LOGO
     }
   })
@@ -222,68 +248,6 @@ export async function renderRODO({ doNo }, context: any) {
       }
     }, [])
 
-
-
-  let tempFoundInventoryItem: any = []
-
-  const sepProductList = productList.flatMap(p => Array.from({ length: p.product_qty }, () => ({ ...p })))
-
-  sepProductList.forEach((product) => {
-
-    let temp = foundInventoryItem.filter((item) => {
-      return item.sku == product.product_sku
-    })
-
-    if (temp.length > 1) {
-      temp.forEach(res => {
-        console.log(res)
-
-        if (tempFoundInventoryItem.length == 0) {
-          tempFoundInventoryItem.push(res)
-        } else {
-          const index = tempFoundInventoryItem.findIndex(res => res.serial_number == res.serial_number)
-
-          if (!index) {
-            tempFoundInventoryItem.push(res)
-          }
-        }
-
-        tempFoundInventoryItem = _.uniqWith(tempFoundInventoryItem, _.isEqual)
-      })
-    } else {
-      tempFoundInventoryItem.push(Object.assign({}, ...temp))
-    }
-  })
-
-  foundInventoryItem = tempFoundInventoryItem;
-
-  const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
-
-  const tempIndexArr = []
-
-  const tempTotalQuantity = []
-
-  Object.keys(filterInventoryItem).forEach(k => {
-    const tempIndex = foundInventoryItem.findIndex(i => {
-      return i.sku == k
-    })
-
-    tempIndexArr.push(tempIndex)
-  })
-
-  Object.values(filterInventoryItem).forEach(k => {
-    const tempQuantity = k.length
-
-    tempTotalQuantity.push(tempQuantity)
-  })
-
-  tempIndexArr.forEach((t, index) => {
-    if (t >= 0)
-      foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
-  })
-
-  foundInventoryItem[0].ref_no = ownRefNo || ""
-
   const data = {
     logo_url: logo,
     customer_biz: partnerBiz.name,
@@ -301,28 +265,90 @@ export async function renderRODO({ doNo }, context: any) {
     warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
     warehouse_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
     warehouse_email: foundWarehouseCP ? foundWarehouseCP.email : null,
-    customer_name: foundCP ? foundCP.name : null,
-    customer_delivery_address: foundCP ? foundCP.address : null,
-    customer_billing_address: foundCP ? foundCP.billingAddress : null,
-    new_billing_address: foundRO?.billingAddress || null,
-    new_delivery_address: foundRO?.deliveryAddress1 || null,
-    new_delivery_address2: foundRO?.deliveryAddress2 || null,
-    new_delivery_address3: foundRO?.deliveryAddress3 || null,
-    new_delivery_address4: foundRO?.deliveryAddress4 || null,
-    new_delivery_address5: foundRO?.deliveryAddress5 || null,
-    new_delivery_city: foundRO?.city || null,
-    new_delivery_state: foundRO?.state || null,
-    new_delivery_postal_code: foundRO?.postalCode || null,
-    new_delivery_country: foundRO?.country || null,
-    new_attention_to: foundRO?.attentionTo || null,
-    new_attention_company: foundRO?.attentionCompany || null,
-    new_phone_no: foundRO?.phone1 || null,
-    customer_phone: foundCP ? foundCP.phone : null,
+    customer_name:
+      foundCP?.name ||
+      foundDO.attentionTo ||
+      foundDO.attentionCompany ||
+      foundRO?.attentionTo ||
+      foundRO?.attentionCompany ||
+      null,
+    customer_delivery_address:
+      foundCP?.address ||
+      [
+        foundDO?.deliveryAddress1,
+        foundDO?.deliveryAddress2,
+        foundDO?.deliveryAddress3,
+        foundDO?.deliveryAddress4,
+        foundDO?.deliveryAddress5,
+        foundDO?.postalCode,
+        foundDO?.city,
+        foundDO?.state,
+        foundDO?.country
+      ]
+        .filter(Boolean)
+        .join(', ') ||
+      [
+        foundRO?.deliveryAddress1,
+        foundRO?.deliveryAddress2,
+        foundRO?.deliveryAddress3,
+        foundRO?.deliveryAddress4,
+        foundRO?.deliveryAddress5,
+        foundRO?.postalCode,
+        foundRO?.city,
+        foundRO?.state,
+        foundRO?.country
+      ]
+        .filter(Boolean)
+        .join(', ') ||
+      null,
+    customer_billing_address: foundCP?.billingAddress || foundDO?.billingAddress || foundRO?.billingAddress || null,
+    new_billing_address: foundDO?.billingAddress || foundRO?.billingAddress || null,
+    new_delivery_address: foundDO?.deliveryAddress1 || foundRO?.deliveryAddress1 || null,
+    new_delivery_address2: foundDO?.deliveryAddress2 || foundRO?.deliveryAddress2 || null,
+    new_delivery_address3: foundDO?.deliveryAddress3 || foundRO?.deliveryAddress3 || null,
+    new_delivery_address4: foundDO?.deliveryAddress4 || foundRO?.deliveryAddress4 || null,
+    new_delivery_address5: foundDO?.deliveryAddress5 || foundRO?.deliveryAddress5 || null,
+    new_delivery_city: foundDO?.city || foundRO?.city || null,
+    new_delivery_state: foundDO?.state || foundRO?.state || null,
+    new_delivery_postal_code: foundDO?.postalCode || foundRO?.postalCode || null,
+    new_delivery_country: foundDO?.country || foundRO?.country || null,
+    new_attention_to: foundDO?.attentionTo || foundRO?.attentionTo || null,
+    new_attention_company: foundDO?.attentionCompany || foundRO?.attentionCompany || null,
+    new_phone_no: foundDO?.phone1 || foundRO?.phone1 || null,
+    customer_phone: foundCP ? foundCP.phone : null || foundDO?.phone1,
     customer_fax: foundCP ? foundCP.fax : null,
     customer_email: foundCP ? foundCP.email : null,
-    customer_company: foundCP ? foundCP.companyName : null,
+    customer_company: foundCP ? foundCP.companyName : null || foundDO.attentionCompany,
     own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
-    destination: foundDO.to || '',
+    destination:
+      foundDO.to ||
+      [
+        foundDO?.deliveryAddress1,
+        foundDO?.deliveryAddress2,
+        foundDO?.deliveryAddress3,
+        foundDO?.deliveryAddress4,
+        foundDO?.deliveryAddress5,
+        foundDO?.postalCode,
+        foundDO?.city,
+        foundDO?.state,
+        foundDO?.country
+      ]
+        .filter(Boolean)
+        .join(', ') ||
+      [
+        foundRO?.deliveryAddress1,
+        foundRO?.deliveryAddress2,
+        foundRO?.deliveryAddress3,
+        foundRO?.deliveryAddress4,
+        foundRO?.deliveryAddress5,
+        foundRO?.postalCode,
+        foundRO?.city,
+        foundRO?.state,
+        foundRO?.country
+      ]
+        .filter(Boolean)
+        .join(', ') ||
+      '',
     ro_no: foundRO.name,
     ro_created_at: foundRO.createdAt ? foundRO.createdAt : '',
     ref_no: ownRefNo ? `${foundRO.name} / ${foundRO.refNo}` : `${foundRO.name}`,
@@ -348,19 +374,20 @@ export async function renderRODO({ doNo }, context: any) {
         remark: prod?.remark
           ? prod.remark
           : prod.cross_docking
-            ? prod.pallet === ''
-              ? `${prod.palletQty} PALLET(S) [C/D]`
-              : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
-            : prod.pallet === ''
-              ? `${prod.palletQty} PALLET(S)`
-              : `${prod.palletQty} PALLET(S) (${prod.pallet})`,
+          ? prod.pallet === ''
+            ? `${prod.palletQty} PALLET(S) [C/D]`
+            : `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
+          : prod.pallet === ''
+          ? `${prod.palletQty} PALLET(S)`
+          : `${prod.palletQty} PALLET(S) (${prod.pallet})`,
         inventory_remark: prod?.inventory_remark ? prod.inventory_remark : '',
         batch_id_ref: prod.product_batch_ref
       }
     }),
-    serialNumber: foundInventoryItem.map((item: any, idx) => {
-      return { ...item, delivery_to: foundDO.to }
-    })
+    serialNumber:
+      foundInventoryItem.map((item: any, idx) => {
+        return { ...item, delivery_to: foundDO.to }
+      }) || ''
   } //.. make data from do
   const formData = new FormData()
 

package/server/controllers/render-seebuu-grn.ts

@@ -1,13 +1,13 @@
 import FormData from 'form-data'
 import fetch from 'node-fetch'
-import { EntityManager, getManager, getRepository } from 'typeorm'
+import { EntityManager, getManager } from 'typeorm'
 
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
 import { ArrivalNotice, GoodsReceivalNote, ORDER_STATUS } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { TEMPLATE_TYPE, WORKSHEET_TYPE } from '../constants'
 import { Worksheet } from '../entities'
@@ -15,7 +15,7 @@ import { DateTimeConverter } from '../utils/datetime-util'
 
 const REPORT_API_URL = config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html')
 
-export async function renderSeebuuGRN({ grnNo }, context: any) {
+export async function renderSeebuuGRN({ grnNo }, context: ResolverContext) {
   // 1. find domain
   const domain: Domain = await getRepository(Domain).findOne({
     where: { id: context.state.domain.id }
@@ -23,7 +23,7 @@ export async function renderSeebuuGRN({ grnNo }, context: any) {
 
   // 2. find grn
   const foundGRN: GoodsReceivalNote = await getRepository(GoodsReceivalNote).findOne({
-    where: { domain, name: grnNo },
+    where: { domain: { id: domain.id }, name: grnNo },
     relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'arrivalNotice']
   })
 
@@ -46,18 +46,28 @@ export async function renderSeebuuGRN({ grnNo }, context: any) {
 
   // 5. find domain contact point
   const foundCP: ContactPoint = await getRepository(ContactPoint).findOne({
-    where: { domain, bizplace: domainBizplace }
+    where: { domain: { id: domain.id }, bizplace: domainBizplace }
   })
 
   // 6. find unloading worksheet
   const foundWS: Worksheet = await getRepository(Worksheet).findOne({
-    where: { domain, arrivalNotice: foundGAN, type: WORKSHEET_TYPE.UNLOADING, status: ORDER_STATUS.DONE },
+    where: {
+      domain: { id: domain.id },
+      arrivalNotice: foundGAN,
+      type: WORKSHEET_TYPE.UNLOADING,
+      status: ORDER_STATUS.DONE
+    },
     relations: ['worksheetDetails', 'updater']
   })
 
   // find putaway worksheet
   const foundPutawayWS: Worksheet = await getRepository(Worksheet).findOne({
-    where: { domain, arrivalNotice: foundGAN, type: WORKSHEET_TYPE.PUTAWAY, status: ORDER_STATUS.DONE },
+    where: {
+      domain: { id: domain.id },
+      arrivalNotice: foundGAN,
+      type: WORKSHEET_TYPE.PUTAWAY,
+      status: ORDER_STATUS.DONE
+    },
     relations: ['worksheetDetails', 'updater']
   })
 
@@ -97,13 +107,13 @@ export async function renderSeebuuGRN({ grnNo }, context: any) {
 
   // 7. find grn template based on category
   const foundTemplate: Attachment = await getRepository(Attachment).findOne({
-    where: { domain, category: TEMPLATE_TYPE.GRN_TEMPLATE }
+    where: { domain: { id: domain.id }, category: TEMPLATE_TYPE.GRN_TEMPLATE }
   })
 
   // 8. find grn logo
   const foundLogo: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.LOGO
     }
   })
@@ -111,14 +121,14 @@ export async function renderSeebuuGRN({ grnNo }, context: any) {
   // 9. find signature
   const foundSignature: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.SIGNATURE
     }
   })
 
   const foundCop: Attachment = await getRepository(Attachment).findOne({
     where: {
-      domain,
+      domain: { id: domain.id },
       category: TEMPLATE_TYPE.COP
     }
   })

package/server/controllers/vas/vas-worksheet-controller.ts

@@ -21,8 +21,7 @@ import {
   InventoryHistory,
   InventoryNoGenerator,
   Location,
-  LOCATION_TYPE,
-  Warehouse
+  LOCATION_TYPE
 } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
@@ -76,21 +75,20 @@ export class VasWorksheetController extends WorksheetController {
   }
 
   async assignInventories(worksheetDetailIds: string[], inventories: Partial<Inventory>): Promise<void> {
-    const worksheetDetails: WorksheetDetail[] = await this.trxMgr
-      .getRepository(WorksheetDetail)
-      .findByIds(worksheetDetailIds, {
-        relations: [
-          'bizplace',
-          'worksheet',
-          'targetVas',
-          'targetVas.arrivalNotice',
-          'targetVas.releaseGood',
-          'targetVas.shippingOrder',
-          'targetVas.vasOrder',
-          'targetVas.vas',
-          'targetVas.targetProduct'
-        ]
-      })
+    const worksheetDetails: WorksheetDetail[] = await this.trxMgr.getRepository(WorksheetDetail).find({
+      where: { id: In(worksheetDetailIds) },
+      relations: [
+        'bizplace',
+        'worksheet',
+        'targetVas',
+        'targetVas.arrivalNotice',
+        'targetVas.releaseGood',
+        'targetVas.shippingOrder',
+        'targetVas.vasOrder',
+        'targetVas.vas',
+        'targetVas.targetProduct'
+      ]
+    })
 
     let seq: number = 0
 
@@ -282,7 +280,7 @@ export class VasWorksheetController extends WorksheetController {
 
     const location: Location = await this.trxMgr.getRepository(Location).findOne({
       where: {
-        domain: this.domain,
+        domain: { id: this.domain.id },
         name: locationName,
         type: In([LOCATION_TYPE.SHELF, LOCATION_TYPE.BUFFER, LOCATION_TYPE.FLOOR])
       },
@@ -290,7 +288,7 @@ export class VasWorksheetController extends WorksheetController {
     })
     if (!location) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(locationName))
 
-    const warehouse: Warehouse = location.warehouse
+    const warehouse = location.warehouse
     const zone: string = location.zone
 
     // create new unpacked inventory
@@ -579,7 +577,8 @@ export class VasWorksheetController extends WorksheetController {
 
     // 현재 작업 set에서 하나라도 모두 완료된 유형의 VAS가 존재할 경우
     // 해당 VAS를 처리한 pallet 리스트에 한하여 작업을 수행 해야함 (동일한 SET는 동일한 군집의 Pallet을 대상으로 처리되어야 하기 때문에)
-    worksheet = await this.trxMgr.getRepository(Worksheet).findOne(worksheet.id, {
+    worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
+      where: { id: worksheet.id },
       relations: [
         'worksheetDetails',
         'worksheetDetails.targetVas',