@things-factory/operato-hub 4.3.30 → 4.3.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.30",
+  "version": "4.3.31",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -78,19 +78,19 @@
     "@things-factory/import-ui": "^4.3.27",
     "@things-factory/import-ui-excel": "^4.3.27",
     "@things-factory/integration-accounting": "^4.3.27",
-    "@things-factory/integration-fulfillment": "^4.3.30",
+    "@things-factory/integration-fulfillment": "^4.3.31",
     "@things-factory/integration-lmd": "^4.3.27",
     "@things-factory/integration-marketplace": "^4.3.29",
     "@things-factory/integration-pos": "^4.3.27",
     "@things-factory/integration-sellercraft": "^4.3.29",
-    "@things-factory/integration-sftp": "^4.3.30",
+    "@things-factory/integration-sftp": "^4.3.31",
     "@things-factory/lite-menu": "^4.3.27",
     "@things-factory/more-ui": "^4.3.27",
     "@things-factory/notification": "^4.3.27",
     "@things-factory/pdf": "^4.3.27",
     "@things-factory/product-ui": "^4.3.27",
     "@things-factory/resource-ui": "^4.3.27",
-    "@things-factory/sales-base": "^4.3.30",
+    "@things-factory/sales-base": "^4.3.31",
     "@things-factory/scene-data-transform": "^4.3.27",
     "@things-factory/scene-excel": "^4.3.27",
     "@things-factory/scene-firebase": "^4.3.27",
@@ -105,8 +105,8 @@
     "@things-factory/setting-ui": "^4.3.27",
     "@things-factory/shell": "^4.3.27",
     "@things-factory/system-ui": "^4.3.27",
-    "@things-factory/warehouse-base": "^4.3.30",
-    "@things-factory/worksheet-base": "^4.3.30",
+    "@things-factory/warehouse-base": "^4.3.31",
+    "@things-factory/worksheet-base": "^4.3.31",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
     "yamljs": "^0.3.0"
@@ -117,5 +117,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "087f169ad0ea9e85186350b5870d8ae25725392d"
+  "gitHead": "fe90b785970aafd08592c0692df9879fb48b6b84"
 }

package/server/routers/api/restful-apis/unstable/add-release-order.ts

@@ -12,6 +12,8 @@ import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import { ProductBundle, ProductDetail } from '@things-factory/product-base'
 import {
   createDraftReleaseGoodFunction,
+  DRAFT_RELEASE_ORDER_STATUS,
+  DraftReleaseGood,
   ORDER_INVENTORY_STATUS,
   ORDER_NUMBER_RULE_TYPE,
   ORDER_NUMBER_SETTING_KEY,
@@ -62,7 +64,8 @@ router.post(
         // get customer company's bizplace
         const custCompanyBizplace: Bizplace = await getCompanyBizplace(null, null, customerBizplaceId, tx)
         const customerBizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
-          where: { id: customerBizplaceId }
+          where: { id: customerBizplaceId },
+          relations: ['domain']
         })
 
         releaseGood = {
@@ -174,6 +177,18 @@ router.post(
         let result = await createReleaseGood(releaseGood, assignedOrderProducts, customerBizplace, context, tx)
         console.timeEnd('save')
 
+        const sellercraft: Sellercraft = await tx
+          .getRepository(Sellercraft)
+          .findOne({ domain: customerBizplace.domain })
+
+        if (sellercraft) {
+          const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+          await sellercraftCtrl.packOrder(sellercraft, {
+            ...result,
+            orderProducts: result.orderProducts
+          })
+        }
+
         let addReleaseGood = {
           id: result.id,
           name: result.name,
@@ -217,7 +232,8 @@ router.post(
           orderInventories: result.orderInventories
         }
         // return body
-        context.body = { result: addReleaseGood }
+        context.body = { result: { addReleaseGood } }
+
         createPayloadLog(
           customerBizplaceId,
           `/${apiVersion}/warehouse/:warehouseId/add-release-order`,
@@ -298,14 +314,35 @@ async function checkMandatoryKey(context, params) {
 
 async function checkExistingOrder(releaseGood, bizplace, context, tx) {
   const { domain, user }: { domain: Domain; user: User } = context.state
+  const refNo: string = releaseGood.refNo
+  const refNo2: string = releaseGood.refNo2
+  const refNo3: string = releaseGood.refNo3
+
   if (releaseGood.type == 'b2c') {
+    const foundDraftReleaseGood: DraftReleaseGood = await tx.getRepository(DraftReleaseGood).findOne({
+      where: {
+        domain,
+        refNo: refNo || null,
+        refNo2: refNo2 || null,
+        refNo3: refNo3 || null,
+        status: Not(In([DRAFT_RELEASE_ORDER_STATUS.CANCELLED]))
+      }
+    })
+
+    if (foundDraftReleaseGood) {
+      throw new ValidationError({
+        errorCode: 'EXISTING_ORDER',
+        message: 'existing draft release order found',
+        detail: foundDraftReleaseGood.name
+      })
+    }
+
     const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({ domain: bizplace.domain })
 
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, bizplace.domain, user)
       await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood)
     } else {
-      const refNo: string = releaseGood.refNo
       const foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
         where: {
           domain: domain,
@@ -439,7 +476,7 @@ async function createReleaseGood(
 
     let resultReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
     let combinedOrderInventories: OrderInventory[] = []
-    await Promise.all(
+    let savedOrderProducts = await Promise.all(
       orderProducts.map(async orderProduct => {
         let orderInventories: OrderInventory[] = orderProduct.orderInventories
         orderProduct = Object.assign(new OrderProduct(), {
@@ -451,7 +488,7 @@ async function createReleaseGood(
           type: ORDER_TYPES.RELEASE_OF_GOODS,
           status: ORDER_PRODUCT_STATUS.ASSIGNED
         })
-        await tx.getRepository(OrderProduct).save(orderProduct)
+        let result = await tx.getRepository(OrderProduct).save(orderProduct)
 
         for (let oiIdx = 0; oiIdx < orderInventories.length; oiIdx++) {
           let orderInventory = Object.assign(new OrderInventory(), {
@@ -474,9 +511,12 @@ async function createReleaseGood(
             releaseUomValue: orderInventory.releaseUomValue
           })
         }
+
+        return result
       })
     )
 
+    newReleaseGood.orderProducts = savedOrderProducts
     newReleaseGood.orderInventories = combinedOrderInventories
 
     return newReleaseGood
@@ -508,7 +548,7 @@ async function massageOrderItems(
             refCode: refCode,
             packingType: packingType?.trim(),
             packingSize: packingSize,
-            qty: releaseQty,
+            qty: releaseQty
           })
         )
       }
@@ -522,7 +562,7 @@ async function massageOrderItems(
             refCode: refCode,
             packingType: packingType?.trim(),
             packingSize: packingSize,
-            qty: releaseQty,
+            qty: releaseQty
           })
         )
       }
@@ -869,7 +909,8 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
               sum(qty - locked_qty - release_qty) over (order by sort_seq asc rows between unbounded preceding and current row) as lock_amount
               from (
                 SELECT 0 as sort_seq, null as id, null as pallet_id, null as batch_id, null as batch_id_ref, 
-                null as unit, '${orderInventory.uom}' as uom, '${orderInventory.packingType}' as packing_type, '${orderInventory.packingSize
+                null as unit, '${orderInventory.uom}' as uom, '${orderInventory.packingType}' as packing_type, '${
+          orderInventory.packingSize
         }' as packing_size,
                 null as manufacture_year, null as carton_id, 0 as uom_value, 0 as locked_uom_value, 0 as qty, 0 as locked_qty, null as created_at,
                 '${orderInventory.releaseQty}' as release_qty, '${orderInventory.releaseUomValue}' as release_uom_value

package/server/routers/api/restful-apis/unstable/cancel-release-order.ts

@@ -3,7 +3,7 @@ import { getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace } from '@things-factory/biz-base'
-import { ReleaseGood } from '@things-factory/sales-base'
+import { ReleaseGood, DraftReleaseGood } from '@things-factory/sales-base'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
@@ -32,7 +32,37 @@ router.post(
       where: [{ id: bodyReq.releaseOrderId }, { refNo: bodyReq.orderNo }]
     })
 
-    if (!releaseOrder) context.throw(400, t('error.release order not exist'))
+    if (!releaseOrder) {
+      const draftReleaseOrder: DraftReleaseGood = await getRepository(DraftReleaseGood).findOne({
+        where: [{ refNo: bodyReq.orderNo }]
+      })
+      if (draftReleaseOrder) {
+        context.body = {
+          result: (
+            await client.mutate({
+              mutation: gql`
+                mutation cancelDraftReleaseOrder($name: String!) {
+                  cancelDraftReleaseOrder(name: $name)
+                }
+              `,
+              variables: { name: draftReleaseOrder.name },
+              context: {
+                ...context,
+                state: {
+                  ...context.state,
+                  customerBizplace,
+                  domain,
+                  type: 'api'
+                }
+              }
+            } as any)
+          ).data
+        }
+        return
+      } else {
+        context.throw(400, t('error.release order not exist'))
+      }
+    }
 
     debug('post:/cancel-release-order body request', bodyReq)
 

package/server/routers/api/restful-apis/v1/cancel-release-order.ts

@@ -3,7 +3,7 @@ import { getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace } from '@things-factory/biz-base'
-import { ReleaseGood } from '@things-factory/sales-base'
+import { ReleaseGood, DraftReleaseGood } from '@things-factory/sales-base'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
@@ -32,7 +32,37 @@ router.post(
       where: [{ id: bodyReq.releaseOrderId }, { refNo: bodyReq.orderNo }]
     })
 
-    if (!releaseOrder) context.throw(400, t('error.release order not exist'))
+    if (!releaseOrder) {
+      const draftReleaseOrder: DraftReleaseGood = await getRepository(DraftReleaseGood).findOne({
+        where: [{ refNo: bodyReq.orderNo }]
+      })
+      if (draftReleaseOrder) {
+        context.body = {
+          result: (
+            await client.mutate({
+              mutation: gql`
+                mutation cancelDraftReleaseOrder($name: String!) {
+                  cancelDraftReleaseOrder(name: $name)
+                }
+              `,
+              variables: { name: draftReleaseOrder.name },
+              context: {
+                ...context,
+                state: {
+                  ...context.state,
+                  customerBizplace,
+                  domain,
+                  type: 'api'
+                }
+              }
+            } as any)
+          ).data
+        }
+        return
+      } else {
+        context.throw(400, t('error.release order not exist'))
+      }
+    }
 
     debug('post:/cancel-release-order body request', bodyReq)
 

package/server/routers/api/restful-apis/v2/cancel-release-order.ts

@@ -3,7 +3,7 @@ import { getRepository } from 'typeorm'
 
 import { restfulApiRouter as router } from '@things-factory/api'
 import { Bizplace } from '@things-factory/biz-base'
-import { ReleaseGood } from '@things-factory/sales-base'
+import { ReleaseGood, DraftReleaseGood } from '@things-factory/sales-base'
 
 import { businessMiddleware } from '../../../../middlewares/business-middleware'
 import { warehouseMiddleware } from '../../../../middlewares/warehouse-middleware'
@@ -32,7 +32,37 @@ router.post(
       where: [{ id: bodyReq.releaseOrderId }, { refNo: bodyReq.orderNo }]
     })
 
-    if (!releaseOrder) context.throw(400, t('error.release order not exist'))
+    if (!releaseOrder) {
+      const draftReleaseOrder: DraftReleaseGood = await getRepository(DraftReleaseGood).findOne({
+        where: [{ refNo: bodyReq.orderNo }]
+      })
+      if (draftReleaseOrder) {
+        context.body = {
+          result: (
+            await client.mutate({
+              mutation: gql`
+                mutation cancelDraftReleaseOrder($name: String!) {
+                  cancelDraftReleaseOrder(name: $name)
+                }
+              `,
+              variables: { name: draftReleaseOrder.name },
+              context: {
+                ...context,
+                state: {
+                  ...context.state,
+                  customerBizplace,
+                  domain,
+                  type: 'api'
+                }
+              }
+            } as any)
+          ).data
+        }
+        return
+      } else {
+        context.throw(400, t('error.release order not exist'))
+      }
+    }
 
     debug('post:/cancel-release-order body request', bodyReq)