@things-factory/worksheet-base 4.3.538 → 4.3.541

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.538",
+  "version": "4.3.541",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -29,21 +29,21 @@
     "@things-factory/id-rule-base": "^4.3.535",
     "@things-factory/integration-accounting": "^4.3.536",
     "@things-factory/integration-base": "^4.3.536",
-    "@things-factory/integration-lmd": "^4.3.537",
-    "@things-factory/integration-marketplace": "^4.3.537",
-    "@things-factory/integration-powrup": "^4.3.537",
-    "@things-factory/integration-sellercraft": "^4.3.537",
+    "@things-factory/integration-lmd": "^4.3.541",
+    "@things-factory/integration-marketplace": "^4.3.541",
+    "@things-factory/integration-powrup": "^4.3.541",
+    "@things-factory/integration-sellercraft": "^4.3.541",
     "@things-factory/integration-sftp": "^4.3.536",
-    "@things-factory/marketplace-base": "^4.3.537",
+    "@things-factory/marketplace-base": "^4.3.541",
     "@things-factory/notification": "^4.3.535",
-    "@things-factory/sales-base": "^4.3.537",
+    "@things-factory/sales-base": "^4.3.541",
     "@things-factory/setting-base": "^4.3.535",
     "@things-factory/shell": "^4.3.535",
     "@things-factory/transport-base": "^4.3.535",
-    "@things-factory/warehouse-base": "^4.3.537",
+    "@things-factory/warehouse-base": "^4.3.541",
     "jspdf": "2.5.1",
     "puppeteer": "21.0.3",
     "uuid": "^9.0.0"
   },
-  "gitHead": "756261225586464ae03d30b47f5d1af3bfd39405"
+  "gitHead": "6992bcb08354a9fa38880360a7fff850433285b6"
 }

package/server/controllers/ecommerce/sellercraft-controller.ts

@@ -28,7 +28,10 @@ export class SellercraftController extends WorksheetController {
       sellercraftSetting?.disablePackOrder && sellercraftSetting?.disablePackOrder == 1 ? true : false
 
     if (!disablePackOrder) {
-      const orderProducts: OrderProduct[] = releaseGood.orderProducts
+      //sourceData contains the original order products
+      const sourceData = JSON.parse(releaseGood?.sourceData)
+      const orderProducts: OrderProduct[] = sourceData?.orderProducts
+      const editedOrderProducts: OrderProduct[] = releaseGood.orderProducts
       let sellercraftOPs: any[] = []
 
       sellercraftOPs = orderProducts.map(orderProduct => {
@@ -74,6 +77,55 @@ export class SellercraftController extends WorksheetController {
 
         if (orderPack?.packages) {
           const packages: any[] = orderPack.packages
+          const createOrderPackageItems = (orderProducts: OrderProduct[], orderPackage: OrderPackage, items: any[]) => {
+            return items
+              .map(itm => {
+                const { sku, qty, product, releaseQty } = itm
+                const idx = orderProducts.findIndex(op => op.product.sku == sku || op.product.sku == product?.sku)
+
+                const matchedOrderProduct = idx !== -1 ? orderProducts[idx] : undefined
+
+                const matchedOrderPackageItem: OrderPackageItem = orderPackage?.orderPackageItems?.find(
+                  itm => itm.orderProductId === matchedOrderProduct?.id
+                )
+
+                if (!matchedOrderProduct || orderProducts[idx].releaseQty <= 0) {
+                  return null
+                }
+
+                const commonProperties = {
+                  orderProduct: matchedOrderProduct,
+                  status: ORDER_STATUS.PROCESSING,
+                  orderPackage: orderPackage,
+                  domain: releaseGood.domain,
+                  bizplace: releaseGood.bizplace,
+                  creator: this.user,
+                  updater: this.user,
+                  productDetail: matchedOrderProduct.productDetail
+                }
+
+                // If an existing order package item is found, update its release quantity
+                if (matchedOrderPackageItem) {
+                  return {
+                    ...commonProperties,
+                    id: matchedOrderPackageItem.id,
+                    name: matchedOrderPackageItem.name,
+                    releaseQty: (matchedOrderPackageItem.releaseQty || 0) + (releaseQty || 0)
+                  }
+                }
+
+                // Update release quantity of the matched order product
+                orderProducts[idx].releaseQty = (orderProducts[idx].releaseQty || 0) - (qty || 0)
+
+                // Return a new order package item if no existing item was found
+                return {
+                  ...commonProperties,
+                  name: OrderNoGenerator.orderPackageItem(),
+                  releaseQty: qty || releaseQty
+                }
+              })
+              .filter(item => item != null)
+          }
 
           await Promise.all(
             packages.map(async pkg => {
@@ -86,33 +138,45 @@ export class SellercraftController extends WorksheetController {
                 domain: releaseGood.domain,
                 bizplace: releaseGood.bizplace,
                 creator: releaseGood.creator,
-                updater: releaseGood.updater
+                updater: releaseGood.updater,
+                originalPackResponse: JSON.stringify(pkg)
               }
 
               let savedOrderPackage: OrderPackage = await this.trxMgr.getRepository(OrderPackage).save(orderPackage)
 
-              const orderPackageItems: OrderPackageItem[] = items.map(itm => {
-                const { sku, qty } = itm
-                const matchedOrderProduct: OrderProduct = orderProducts.find(op => op.product.sku == sku)
-
-                return {
-                  name: OrderNoGenerator.orderPackageItem(),
-                  orderProduct: matchedOrderProduct,
-                  status: ORDER_STATUS.PROCESSING,
-                  releaseQty: qty,
-                  orderPackage: savedOrderPackage,
-                  domain: releaseGood.domain,
-                  bizplace: releaseGood.bizplace,
-                  creator: releaseGood.creator,
-                  updater: releaseGood.updater,
-                  productDetail: matchedOrderProduct?.productDetail
-                }
-              })
-
+              const orderPackageItems: OrderPackageItem[] = createOrderPackageItems(
+                editedOrderProducts,
+                savedOrderPackage,
+                items
+              )
               await this.trxMgr.getRepository(OrderPackageItem).save(orderPackageItems)
             })
           )
 
+          const unassignedOrderProducts: OrderProduct[] = editedOrderProducts.filter(op => {
+            return op.releaseQty > 0 || !packages.some(pkg => pkg.items.some(itm => itm.sku === op.product.sku))
+          })
+
+          if (unassignedOrderProducts?.length > 0) {
+            const orderPackages: OrderPackage[] = await this.trxMgr.getRepository(OrderPackage).find({
+              where: { releaseGood: releaseGood.id },
+              relations: ['orderPackageItems']
+            })
+
+            let selectedOrderPackage = orderPackages.reduce((minOrderPackage, currentOrderPackage) => {
+              return currentOrderPackage?.orderPackageItems.length < minOrderPackage?.orderPackageItems.length
+                ? currentOrderPackage
+                : minOrderPackage
+            }, orderPackages[0])
+
+            const unassignedPackageItems: OrderPackageItem[] = createOrderPackageItems(
+              unassignedOrderProducts,
+              selectedOrderPackage,
+              unassignedOrderProducts
+            )
+            await this.trxMgr.getRepository(OrderPackageItem).save(unassignedPackageItems)
+          }
+
           roUpdateFields = {
             packageId: packages[0].packageId,
             marketPackCallSuccess: new Date(),

package/server/controllers/outbound/index.ts

@@ -4,4 +4,12 @@ export * from './picking-worksheet-controller'
 export * from './returning-worksheet-controller'
 export * from './sorting-worksheet-controller'
 
-export {createOrderPackageAndItems} from './picking-worksheet-controller'
+export {
+  createOrderPackageAndItems,
+  splitOrderConsignment,
+  createOrderConsignment,
+  createConsignmentPackage,
+  createConsignmentPackageItem,
+  createConsignmentWithMultipackage,
+  sortingProduct
+} from './picking-worksheet-controller'