@things-factory/worksheet-base 4.3.236 → 4.3.238

package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts

@@ -6,6 +6,7 @@ import { logger } from '@things-factory/env'
 import { Account } from '@things-factory/integration-accounting'
 import { sqsSendMessage } from '@things-factory/integration-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
+import { Powrup } from '@things-factory/integration-powrup'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import {
@@ -24,7 +25,8 @@ import {
   PackingWorksheetController,
   PickingWorksheetController,
   SellercraftController,
-  SortingWorksheetController
+  SortingWorksheetController,
+  PowrupController
 } from '../../../../controllers/'
 import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
@@ -131,6 +133,33 @@ export async function completeBatchPicking(
           }
           break
 
+        case ApplicationType.POWRUP:
+          const powrup: Powrup = await tx.getRepository(Powrup).findOne({ active: true })
+
+          if (powrup) {
+            const initPowrupShipment = async (powrup: Powrup, foundReleaseGood: ReleaseGood) => {
+              await getManager().transaction(async txMgr => {
+                const powrupCtrl: PowrupController = new PowrupController(txMgr, domain, user)
+
+                if (!foundReleaseGood?.orderPackages?.length && !foundReleaseGood?.marketPackCallSuccess) {
+                  await powrupCtrl.packOrder(powrup, foundReleaseGood)
+                }
+
+                const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
+                  where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
+                })
+
+                if (rtsTriggerLevel && parseInt(rtsTriggerLevel?.value || 0) == 1) {
+                  await powrupCtrl.initiateShipment(powrup, foundReleaseGood)
+                }
+              })
+            }
+
+            // asynchronouly call to initiate sellercraft order shipment/ RTS
+            initPowrupShipment(powrup, foundReleaseGood)
+          }
+          break
+
         case ApplicationType.MMS:
           const companyDomain: Domain = foundReleaseGood.bizplace.company.domain
           const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({

package/server/graphql/resolvers/worksheet/picking/complete-picking.ts

@@ -7,6 +7,7 @@ import { Account } from '@things-factory/integration-accounting'
 import { sqsSendMessage } from '@things-factory/integration-base'
 import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
 import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'
+import { Powrup } from '@things-factory/integration-powrup'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import {
   MarketplaceOrder,
@@ -35,7 +36,8 @@ import {
   PackingWorksheetController,
   PickingWorksheetController,
   ReplenishmentWorksheetController,
-  SellercraftController
+  SellercraftController,
+  PowrupController
 } from '../../../../controllers/'
 import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
@@ -153,6 +155,36 @@ export async function completePicking(
           }
           break
 
+        case ApplicationType.POWRUP:
+          const powrup: Powrup = await tx.getRepository(Powrup).findOne({ active: true })
+
+          if (powrup) {
+            const initPowrupShipment = async powrup => {
+              await getManager().transaction(async txMgr => {
+                const powrupController: PowrupController = new PowrupController(txMgr, domain, user)
+
+                if (!releaseGood?.orderPackages?.length && !releaseGood?.marketPackCallSuccess) {
+                  const orderProducts: OrderProduct[] = await txMgr.getRepository(OrderProduct).find({
+                    where: { releaseGood },
+                    relations: ['product', 'productDetail']
+                  })
+                  await powrupController.packOrder(powrup, { ...releaseGood, orderProducts })
+                }
+
+                const rtsTriggerLevel: Setting = await txMgr.getRepository(Setting).findOne({
+                  where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
+                })
+
+                if (rtsTriggerLevel && parseInt(rtsTriggerLevel?.value || 0) == 1) {
+                  await powrupController.initiateShipment(powrup, releaseGood)
+                }
+              })
+            }
+            // asynchronouly call to initiate powrup order shipment/ RTS
+            initPowrupShipment(powrup)
+          }
+          break
+
         case ApplicationType.MMS:
           const companyDomain: Domain = releaseGood.bizplace.company.domain
           let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({

package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts

@@ -1,10 +1,13 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { Application, User } from '@things-factory/auth-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ArrivalNotice } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
+// import { PowrupController } from '@things-factory/warehouse-base'
+import { Powrup } from '@things-factory/integration-powrup'
+import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
 
 import { PutawayWorksheetController } from '../../../../controllers'
 import { EcommerceController, SellercraftController } from '../../../../controllers/ecommerce'
@@ -26,13 +29,16 @@ export const completePutawayResolver = {
         'orderProducts',
         'orderProducts.product',
         'orderProducts.product.productDetails',
-        'orderProducts.product.productDetails.childProductDetail'
+        'orderProducts.product.productDetails.childProductDetail',
+        'orderProducts.productDetail'
       ]
     })
 
     // search for any active marketplace connection
     const companyDomain: Domain = arrivalNotice.bizplace.company.domain
     const customerDomain: Domain = arrivalNotice.bizplace.domain
+    const customerBizplaceId: string = arrivalNotice.bizplace.id
+    const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
 
     // const orderSource: string = arrivalNotice.source
     // switch (orderSource) {
@@ -72,6 +78,10 @@ export const completePutawayResolver = {
       .getRepository(Sellercraft)
       .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
 
+    // const powrup: Powrup = await tx
+    //   .getRepository(Application)
+    //   .findOne({ domain: companyBizplace.domain, status: 'ACTIVE' })
+
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
 
@@ -85,6 +95,13 @@ export const completePutawayResolver = {
       // allow async run to skip user wait time
       ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
     }
+
+    // if (powrup) {
+    //   const powrupController: PowrupController = new PowrupController(tx, domain, user)
+
+    //   // allow async run to skip user wait time
+    //   powrupController.updateStock(powrup, arrivalNotice)
+    // }
   }
 }
 

package/server/graphql/resolvers/worksheet/putaway-return/complete-putaway-return.ts

@@ -1,9 +1,12 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { Application, User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ReturnOrder } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
+// import { PowrupController } from '@things-factory/warehouse-base'
+import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
+import { Powrup } from '@things-factory/integration-powrup'
 
 import { PutawayReturningWorksheetController } from '../../../../controllers'
 import { SellercraftController } from '../../../../controllers/ecommerce'
@@ -22,7 +25,8 @@ export const completePutawayReturnResolver = {
         'orderInventories',
         'orderInventories.inventory',
         'orderInventories.product',
-        'orderInventories.product.productDetails'
+        'orderInventories.product.productDetails',
+        'orderInventories.productDetail'
       ]
     })
 
@@ -31,10 +35,21 @@ export const completePutawayReturnResolver = {
       .getRepository(Sellercraft)
       .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
 
+    // const customerBizplaceId: string = returnOrder.bizplace.id
+    // const companyBizplace: Bizplace = await getCompanyBizplace(domain, null, customerBizplaceId, tx)
+    // const powrup: Powrup = await tx
+    //   .getRepository(Application)
+    //   .findOne({ domain: companyBizplace.domain, status: 'ACTIVE' })
+
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
       await sellercraftCtrl.registerProductReturn(sellercraft, returnOrder)
     }
+
+    // if (powrup) {
+    //   const powrupController: PowrupController = new PowrupController(tx, domain, user)
+    //   await powrupController.updateStock(powrup, returnOrder)
+    // }
   }
 }
 

package/translations/ja.json

@@ -0,0 +1,8 @@
+{
+  "field.worker": "作業者",
+  "field.worksheet": "ワークシート",
+  "field.date": "日付",
+  "field.start_time": "開始時間",
+  "field.end_time": "完了時間",
+  "field.details": "詳細"
+}