@things-factory/worksheet-base 4.1.7 → 4.1.8

package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateMultipleReleaseGoodWorksheetResolver = void 0;
+const typeorm_1 = require("typeorm");
 const generate_release_good_worksheet_1 = require("./generate-release-good-worksheet");
 exports.generateMultipleReleaseGoodWorksheetResolver = {
     async generateMultipleReleaseGoodWorksheet(_, { releaseGoodNos }, context) {
         const { tx, domain, user } = context.state;
         for (let idx = 0; idx < releaseGoodNos.length; idx++) {
-            await (0, generate_release_good_worksheet_1.generatePickingWorksheet)(tx, domain, user, releaseGoodNos[idx]);
+            await (0, typeorm_1.getManager)().transaction(async (txMgr) => {
+                await (0, generate_release_good_worksheet_1.generatePickingWorksheet)(txMgr, domain, user, releaseGoodNos[idx]);
+            });
         }
         return true;
     }

package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-multiple-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts"],"names":[],"mappings":";;;AASA,uFAA4E;AAE/D,QAAA,4CAA4C,GAAG;IAC1D,KAAK,CAAC,oCAAoC,CAAC,CAAM,EAAE,EAAE,cAAc,EAAE,EAAE,OAAY;QACjF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YACpD,MAAM,IAAA,0DAAwB,EAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAA;SACtE;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
+{"version":3,"file":"generate-multiple-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AASnD,uFAA4E;AAE/D,QAAA,4CAA4C,GAAG;IAC1D,KAAK,CAAC,oCAAoC,CAAC,CAAM,EAAE,EAAE,cAAc,EAAE,EAAE,OAAY;QACjF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;YACpD,MAAM,IAAA,oBAAU,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;gBAC3C,MAAM,IAAA,0DAAwB,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAA;YAC1E,CAAC,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePickingWorksheetDetail = exports.generatePickingWorksheet = exports.generateReleaseGoodWorksheetResolver = void 0;
+const sales_base_1 = require("@things-factory/sales-base");
+const setting_base_1 = require("@things-factory/setting-base");
 const controllers_1 = require("../../../../controllers/");
+const entities_1 = require("../../../../entities");
+const warehouse_base_1 = require("@things-factory/warehouse-base");
 exports.generateReleaseGoodWorksheetResolver = {
     async generateReleaseGoodWorksheet(_, { releaseGoodNo }, context) {
         const { tx, domain, user } = context.state;
@@ -9,8 +13,49 @@ exports.generateReleaseGoodWorksheetResolver = {
     }
 };
 async function generatePickingWorksheet(tx, domain, user, releaseGoodNo) {
-    const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
-    return await worksheetController.generatePickingWorksheet(releaseGoodNo);
+    try {
+        const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
+        let releaseGood = await worksheetController.findRefOrder(sales_base_1.ReleaseGood, {
+            domain: domain,
+            name: releaseGoodNo,
+            status: sales_base_1.ORDER_STATUS.PENDING_WORKSHEET
+        });
+        let worksheet = new entities_1.Worksheet();
+        const directReleaseOrder = await tx.getRepository(setting_base_1.Setting).findOne({
+            where: { domain, category: 'id-rule', name: 'enable-direct-b2c-release-order' }
+        });
+        if (releaseGood.type == 'b2c' && directReleaseOrder && directReleaseOrder.value.toLowerCase() == 'true') {
+            const inventoryUtil = new warehouse_base_1.InventoryUtil(tx, domain, user);
+            let orderInventories = await tx.getRepository(sales_base_1.OrderInventory).find({
+                where: { domain, releaseGood },
+                relations: ['inventory']
+            });
+            for (let idx = 0; idx < orderInventories.length; idx++) {
+                let orderInventory = orderInventories[idx];
+                if (orderInventory.releaseQty <= 0 || (orderInventory.uomValue != null && orderInventory.uomValue <= 0)) {
+                    throw new Error(`Invalid data for ${releaseGoodNo}. Please contact support.`);
+                }
+                orderInventory.uomValue = orderInventory.uomValue > 0 ? orderInventory.uomValue : 0;
+                let inventory = await tx.getRepository(warehouse_base_1.Inventory).findOne({ where: { id: orderInventory.inventory.id } });
+                await inventoryUtil.transactionInventory({
+                    id: inventory.id,
+                    qty: inventory.qty - orderInventory.releaseQty,
+                    uomValue: Math.round((inventory.uomValue - orderInventory.releaseUomValue) * 100) / 100,
+                    lockedQty: inventory.lockedQty - orderInventory.releaseQty,
+                    lockedUomValue: Math.round((inventory.lockedUomValue - orderInventory.releaseUomValue) * 100) / 100
+                }, releaseGood, -orderInventory.releaseQty, -orderInventory.releaseUomValue, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.DIRECT_DEDUCTION);
+                await tx.getRepository(sales_base_1.OrderInventory).save({ id: orderInventory.id, status: sales_base_1.ORDER_INVENTORY_STATUS.TERMINATED });
+            }
+            await tx.getRepository(sales_base_1.ReleaseGood).save({ id: releaseGood.id, status: sales_base_1.ORDER_STATUS.DONE });
+        }
+        else {
+            worksheet = await worksheetController.generatePickingWorksheet(releaseGoodNo);
+        }
+        return worksheet;
+    }
+    catch (error) {
+        return new entities_1.Worksheet();
+    }
 }
 exports.generatePickingWorksheet = generatePickingWorksheet;
 /**

package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts"],"names":[],"mappings":";;;AAMA,0DAAqE;AAGxD,QAAA,oCAAoC,GAAG;IAClD,KAAK,CAAC,4BAA4B,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QACxE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,OAAO,MAAM,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;IACxE,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,wBAAwB,CAC5C,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,OAAO,MAAM,mBAAmB,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;AAC1E,CAAC;AARD,4DAQC;AAED;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,8BAA8B,CAClD,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,SAAoB,EACpB,eAA0C;IAE1C,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,OAAO,MAAM,mBAAmB,CAAC,8BAA8B,CAAC,SAAS,EAAE,eAAe,CAAC,CAAA;AAC7F,CAAC;AATD,wEASC"}
+{"version":3,"file":"generate-release-good-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.1.7",
+  "version": "4.1.8",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -32,13 +32,13 @@
     "@things-factory/integration-marketplace": "^4.1.6",
     "@things-factory/integration-sellercraft": "^4.1.6",
     "@things-factory/integration-sftp": "^4.1.6",
-    "@things-factory/marketplace-base": "^4.1.6",
+    "@things-factory/marketplace-base": "^4.1.8",
     "@things-factory/notification": "^4.1.6",
-    "@things-factory/sales-base": "^4.1.7",
+    "@things-factory/sales-base": "^4.1.8",
     "@things-factory/setting-base": "^4.1.6",
     "@things-factory/shell": "^4.1.6",
     "@things-factory/transport-base": "^4.1.6",
-    "@things-factory/warehouse-base": "^4.1.6"
+    "@things-factory/warehouse-base": "^4.1.8"
   },
-  "gitHead": "5e68e258a7ec97f4c92a11fe8aa88088a4c80ea6"
+  "gitHead": "a2c80a6ae7adc79c5779b5ef9173c66d5a5d89b9"
 }

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts

@@ -1,4 +1,4 @@
-import { EntityManager } from 'typeorm'
+import { EntityManager, getManager } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { OrderInventory } from '@things-factory/sales-base'
@@ -14,7 +14,9 @@ export const generateMultipleReleaseGoodWorksheetResolver = {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
 
     for (let idx = 0; idx < releaseGoodNos.length; idx++) {
-      await generatePickingWorksheet(tx, domain, user, releaseGoodNos[idx])
+      await getManager().transaction(async txMgr => {
+        await generatePickingWorksheet(txMgr, domain, user, releaseGoodNos[idx])
+      });
     }
 
     return true

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts

@@ -1,12 +1,19 @@
 import { EntityManager } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { OrderInventory } from '@things-factory/sales-base'
+import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
+import { PartnerSetting, Setting } from '@things-factory/setting-base'
 
 import { PickingWorksheetController } from '../../../../controllers/'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 
+import {
+  Inventory,
+  InventoryUtil,
+  INVENTORY_TRANSACTION_TYPE
+} from '@things-factory/warehouse-base'
+
 export const generateReleaseGoodWorksheetResolver = {
   async generateReleaseGoodWorksheet(_: any, { releaseGoodNo }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
@@ -20,8 +27,68 @@ export async function generatePickingWorksheet(
   user: User,
   releaseGoodNo: string
 ): Promise<Worksheet> {
-  const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
-  return await worksheetController.generatePickingWorksheet(releaseGoodNo)
+  try {
+    const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
+
+    let releaseGood: ReleaseGood = await worksheetController.findRefOrder(
+      ReleaseGood,
+      {
+        domain: domain,
+        name: releaseGoodNo,
+        status: ORDER_STATUS.PENDING_WORKSHEET
+      }
+    )
+
+    let worksheet: Worksheet = new Worksheet()
+
+    const directReleaseOrder: Setting = await tx.getRepository(Setting).findOne({
+      where: { domain, category: 'id-rule', name: 'enable-direct-b2c-release-order' }
+    })
+
+    if (releaseGood.type == 'b2c' && directReleaseOrder && directReleaseOrder.value.toLowerCase() == 'true') {
+      const inventoryUtil = new InventoryUtil(tx, domain, user)
+
+      let orderInventories: OrderInventory[] = await tx.getRepository(OrderInventory).find({
+        where: { domain, releaseGood },
+        relations: ['inventory']
+      })
+
+      for (let idx = 0; idx < orderInventories.length; idx++) {
+        let orderInventory = orderInventories[idx]
+        if (orderInventory.releaseQty <= 0 || (orderInventory.uomValue != null && orderInventory.uomValue <= 0)) {
+          throw new Error(`Invalid data for ${releaseGoodNo}. Please contact support.`);
+        }
+        orderInventory.uomValue = orderInventory.uomValue > 0 ? orderInventory.uomValue : 0
+
+        let inventory: Inventory = await tx.getRepository(Inventory).findOne({ where: { id: orderInventory.inventory.id } })
+
+        await inventoryUtil.transactionInventory(
+          {
+            id: inventory.id,
+            qty: inventory.qty - orderInventory.releaseQty,
+            uomValue: Math.round((inventory.uomValue - orderInventory.releaseUomValue) * 100) / 100,
+            lockedQty: inventory.lockedQty - orderInventory.releaseQty,
+            lockedUomValue: Math.round((inventory.lockedUomValue - orderInventory.releaseUomValue) * 100) / 100
+          },
+          releaseGood,
+          - orderInventory.releaseQty,
+          - orderInventory.releaseUomValue,
+          INVENTORY_TRANSACTION_TYPE.DIRECT_DEDUCTION
+        )
+
+        await tx.getRepository(OrderInventory).save({ id: orderInventory.id, status: ORDER_INVENTORY_STATUS.TERMINATED })
+      }
+
+      await tx.getRepository(ReleaseGood).save({ id: releaseGood.id, status: ORDER_STATUS.DONE })
+
+    } else {
+      worksheet = await worksheetController.generatePickingWorksheet(releaseGoodNo)
+    }
+
+    return worksheet
+  } catch (error) {
+    return new Worksheet()
+  }
 }
 
 /**