@things-factory/sales-base 3.7.5 → 3.7.6

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice.js

@@ -4,70 +4,42 @@ exports.arrivalNoticeResolver = void 0;
 const typeorm_1 = require("typeorm");
 const attachment_base_1 = require("@things-factory/attachment-base");
 const biz_base_1 = require("@things-factory/biz-base");
+const product_base_1 = require("@things-factory/product-base");
 const attachment_type_1 = require("../../../constants/attachment-type");
 const entities_1 = require("../../../entities");
 exports.arrivalNoticeResolver = {
     async arrivalNotice(_, { name, refNo }, context) {
-        var _a, _b, _c;
+        var _a, _b;
         const { domain, user, bizplace } = context.state;
-        let foundGAN;
-        if ((_a = context === null || context === void 0 ? void 0 : context.state) === null || _a === void 0 ? void 0 : _a.bizplace) {
-            let param;
-            if (name)
-                param = { domain, name, bizplace };
-            else
-                param = { domain, refNo, bizplace };
-            foundGAN = await (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).findOne({
-                where: Object.assign({}, param),
-                relations: [
-                    'domain',
-                    'bizplace',
-                    'releaseGood',
-                    'purchaseOrder',
-                    'purchaseOrder.bufferLocation',
-                    'orderProducts',
-                    'orderProducts.product',
-                    'orderInventories',
-                    'orderInventories.inventory',
-                    'orderInventories.inventory.product',
-                    'orderInventories.inventory.location',
-                    'orderVass',
-                    'orderVass.vas',
-                    'orderVass.targetProduct',
-                    'supplier',
-                    'creator',
-                    'updater'
-                ]
-            });
-        }
-        else {
-            let param;
-            if (name)
-                param = { domain, name, bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user)) };
-            else
-                param = { domain, refNo, bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user)) };
-            foundGAN = await (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).findOne({
-                where: Object.assign({}, param),
-                relations: [
-                    'domain',
-                    'bizplace',
-                    'releaseGood',
-                    'purchaseOrder',
-                    'purchaseOrder.bufferLocation',
-                    'orderProducts',
-                    'orderProducts.product',
-                    'orderInventories',
-                    'orderInventories.inventory',
-                    'orderInventories.inventory.product',
-                    'orderInventories.inventory.location',
-                    'orderVass',
-                    'orderVass.vas',
-                    'orderVass.targetProduct',
-                    'creator',
-                    'updater'
-                ]
-            });
-        }
+        let param = { domain, bizplace: bizplace ? bizplace : (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user)) };
+        if (name)
+            param = Object.assign(Object.assign({}, param), { name });
+        else if (refNo)
+            param = Object.assign(Object.assign({}, param), { refNo });
+        else
+            return;
+        let foundGAN = await (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).findOne({
+            where: Object.assign({}, param),
+            relations: [
+                'domain',
+                'bizplace',
+                'releaseGood',
+                'purchaseOrder',
+                'purchaseOrder.bufferLocation',
+                'orderProducts',
+                'orderProducts.product',
+                'orderInventories',
+                'orderInventories.inventory',
+                'orderInventories.inventory.product',
+                'orderInventories.inventory.location',
+                'orderVass',
+                'orderVass.vas',
+                'orderVass.targetProduct',
+                'supplier',
+                'creator',
+                'updater'
+            ]
+        });
         if (name && !foundGAN)
             throw new Error(`Failed to find arrival notice with ${name}`);
         const foundAttachments = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).find({
@@ -77,15 +49,39 @@ exports.arrivalNoticeResolver = {
                 category: attachment_type_1.ATTACHMENT_TYPE.GAN
             }
         });
-        const foundPOAttachments = ((_b = foundGAN === null || foundGAN === void 0 ? void 0 : foundGAN.purchaseOrder) === null || _b === void 0 ? void 0 : _b.id)
+        const foundPOAttachments = ((_a = foundGAN === null || foundGAN === void 0 ? void 0 : foundGAN.purchaseOrder) === null || _a === void 0 ? void 0 : _a.id)
             ? await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).find({
                 where: {
                     domain,
-                    refBy: (_c = foundGAN.purchaseOrder) === null || _c === void 0 ? void 0 : _c.id,
+                    refBy: (_b = foundGAN.purchaseOrder) === null || _b === void 0 ? void 0 : _b.id,
                     category: attachment_type_1.ATTACHMENT_TYPE.PO
                 }
             })
             : [];
+        // add productDetails data to orderProduct.product
+        foundGAN.orderProducts = await Promise.all(foundGAN.orderProducts.map(async (orderProduct) => {
+            orderProduct.product['productDetails'] = await (0, typeorm_1.getRepository)(product_base_1.ProductDetail).find({
+                where: {
+                    product: orderProduct.product.id,
+                    packingType: orderProduct.packingType,
+                    packingSize: orderProduct.packingSize
+                }
+            });
+            return orderProduct;
+        }));
+        // add productDetails data to orderInventory.inventory.product if orderInventory is exist
+        if (foundGAN.orderInventories && foundGAN.orderInventories.length) {
+            foundGAN.orderInventories = await Promise.all(foundGAN.orderInventories.map(async (orderInventory) => {
+                orderInventory.inventory.product['productDetails'] = await (0, typeorm_1.getRepository)(product_base_1.ProductDetail).find({
+                    where: {
+                        product: orderInventory.inventory.product.id,
+                        packingType: orderInventory.inventory.packingType,
+                        packingSize: orderInventory.inventory.packingSize
+                    }
+                });
+                return orderInventory;
+            }));
+        }
         return Object.assign(Object.assign({}, foundGAN), { attachment: [...foundPOAttachments, ...foundAttachments] });
     }
 };

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice.js.map

@@ -1 +1 @@
-{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/order-inventory/order-inventories.js

@@ -47,6 +47,7 @@ exports.orderInventoriesResolver = {
                 'inventory.product',
                 'releaseGood',
                 'deliveryOrder',
+                'bizplace',
                 'creator',
                 'updater'
             ] }));

package/dist-server/graphql/resolvers/order-inventory/order-inventories.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-inventories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/order-inventory/order-inventories.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"order-inventories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/order-inventory/order-inventories.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/others/bulk-upload-validate-warehouse-partners-products-quantity.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bulkUploadValidateWarehousePartnersProductsQuantityResolver = void 0;
+const orderBy_1 = __importDefault(require("lodash/orderBy"));
 const biz_base_1 = require("@things-factory/biz-base");
 const utils_1 = require("../../../utils");
-const orderBy_1 = __importDefault(require("lodash/orderBy"));
 exports.bulkUploadValidateWarehousePartnersProductsQuantityResolver = {
     async bulkUploadValidateWarehousePartnersProductsQuantity(_, { orderInventories, partnerBizplaceId }, context) {
         var _a;
@@ -64,6 +64,7 @@ exports.bulkUploadValidateWarehousePartnersProductsQuantityResolver = {
                 productId: total > 0 ? items[0].productId : null,
                 productSKU: total > 0 ? items[0].productSKU : orderInventory.productSKU,
                 productName: total > 0 ? items[0].productName : null,
+                uom: total > 0 ? items[0].uom : null,
                 remainQty: total > 0 ? items[0].remainQty : null,
                 remainUomValue: total > 0 ? items[0].remainUomValue : null,
                 remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : '',

package/dist-server/graphql/resolvers/others/bulk-upload-validate-warehouse-partners-products-quantity.js.map

@@ -1 +1 @@
-{"version":3,"file":"bulk-upload-validate-warehouse-partners-products-quantity.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/others/bulk-upload-validate-warehouse-partners-products-quantity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bulk-upload-validate-warehouse-partners-products-quantity.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/others/bulk-upload-validate-warehouse-partners-products-quantity.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAoC;AAIpC,uDAA0E;AAG1E,0CAA8C;AAEjC,QAAA,2DAA2D,GAAG;IACzE,KAAK,CAAC,mDAAmD,CACvD,CAAM,EACN,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,EACvC,OAAY;;QAEZ,MAAM,EACJ,MAAM,EACN,IAAI,EACJ,EAAE,EACF,QAAQ,EACT,GAA0E,OAAO,CAAC,KAAK,CAAA;QAExF,IAAI,kBAAkB,GAAe,MAAM,IAAA,gCAAqB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC9E,IAAI,sBAAgC,CAAA;QACpC,IAAI,eAAyB,CAAA;QAE7B,MAAM,eAAe,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;YACzE,KAAK,EAAE;gBACL,EAAE,EAAE,iBAAiB;aACtB;YACD,SAAS,EAAE,CAAC,SAAS,EAAE,gBAAgB,CAAC;SACzC,CAAC,CAAA;QAEF,IAAI,iBAAiB,EAAE;YACrB,sBAAsB,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,iBAAiB,CAAC,CAAA;YAEpF,IAAI,sBAAsB,EAAE;gBAC1B,IAAI,CAAC,CAAA,MAAA,sBAAsB,CAAC,OAAO,0CAAE,EAAE,CAAA,EAAE;oBACvC,sBAAsB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,EAAE,EAAE;wBAC3F,SAAS,EAAE,CAAC,SAAS,EAAE,gBAAgB,CAAC;qBACzC,CAAC,CAAA;iBACH;gBACD,MAAM,aAAa,GAAW,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAA;gBACnE,eAAe,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,CAAC,CAAA;aACjG;SACF;QAED,MAAM,SAAS,GAAe,CAAC,sBAAsB,EAAE,eAAe,CAAC,CAAA;QACvE,IAAI,QAAQ;YAAE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAEtC,IAAI,mBAAmB,GAAU,EAAE,CAAA;QAEnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAChD,MAAM,cAAc,GAAQ,gBAAgB,CAAC,CAAC,CAAC,CAAA;YAE/C,IAAI,OAAO,GAAU;gBACnB;oBACE,IAAI,EAAE,aAAa;oBACnB,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,cAAc,CAAC,UAAU;iBACjC;aACF,CAAA;YAED,IAAI,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,WAAW,KAAI,IAAI,EAAE;gBACvC,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,aAAa;oBACnB,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,cAAc,CAAC,WAAW;iBAClC,CAAC,CAAA;aACH;YAED,MAAM,MAAM,GAAQ;gBAClB,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC;aACtB,CAAA;YAED,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,qBAAa,CAAC,6BAA6B,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;YAE1G,IAAI,eAAe,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAA;YAErF,MAAM,iBAAiB,GAAQ;gBAC7B,OAAO,EACL,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE;gBAC7G,SAAS,EACP,KAAK,GAAG,CAAC;oBACP,CAAC,iCACI,KAAK,CAAC,CAAC,CAAC,KACX,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAChD,cAAc,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAC1D,qBAAqB,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,IAExE,CAAC,CAAC,IAAI;gBACV,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;gBAChD,UAAU,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU;gBACvE,WAAW,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI;gBACpD,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI;gBACpC,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;gBAChD,cAAc,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI;gBAC1D,qBAAqB,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE;gBACtE,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;gBAC5C,UAAU,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI;gBAClD,WAAW,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,WAAW;gBAC1E,WAAW,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACjD,UAAU,EAAE,cAAc,CAAC,UAAU;oBACnC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;wBAC3C,CAAC,CAAC,cAAc,CAAC,UAAU;wBAC3B,CAAC,CAAC,IAAI;oBACR,CAAC,CAAC,IAAI;gBACR,eAAe,EACb,KAAK,GAAG,CAAC;oBACP,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,UAAU,CAAC;wBAC3C,CAAC,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,UAAU,GAAG,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;wBACtE,CAAC,CAAC,IAAI;oBACR,CAAC,CAAC,IAAI;gBACV,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;gBAChD,OAAO,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;aACnC,CAAA;YAED,mBAAmB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;SAC5C;QAED,IAAI;YACF,MAAM,qBAAa,CAAC,yCAAyC,CAC3D,MAAM,EACN,eAAe,EACf,mBAAmB,EACnB,OAAO,EACP,EAAE,CACH,CAAA;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YAE3C,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;gBACrB,IAAI,GAAG,GAAG,mBAAmB,CAAC,SAAS,CACrC,CAAC,CAAC,EAAE,WACF,OAAA,CAAA,MAAA,CAAC,CAAC,OAAO,0CAAE,EAAE,KAAI,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,SAAS,IAAI,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,OAAO,IAAI,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC,WAAW,CAAA,EAAA,CAC9G,CAAA;gBAED,IAAI,GAAG,IAAI,CAAC,EAAE;oBACZ,mBAAmB,CAAC,GAAG,CAAC,CAAC,SAAS,GAAG,EAAE,CAAC,YAAY,CAAA;oBACpD,mBAAmB,CAAC,GAAG,CAAC,CAAC,cAAc,GAAG,EAAE,CAAC,iBAAiB,CAAA;oBAC9D,mBAAmB,CAAC,GAAG,CAAC,CAAC,OAAO;wBAC9B,EAAE,CAAC,YAAY,IAAI,IAAI;4BACrB,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,CAAC;4BACzC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,UAAU,GAAG,EAAE,CAAC,YAAY,CAAA;oBAC3D,mBAAmB,CAAC,GAAG,CAAC,CAAC,qBAAqB;wBAC5C,EAAE,CAAC,iBAAiB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,iBAAiB,IAAI,EAAE,CAAC,GAAG,EAAE,CAAA;oBACzE,IAAI,mBAAmB,CAAC,GAAG,CAAC,CAAC,SAAS,IAAI,IAAI,EAAE;wBAC9C,mBAAmB,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,SAAS,GAAG,EAAE,CAAC,YAAY,CAAA;wBAC9D,mBAAmB,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,cAAc,GAAG,EAAE,CAAC,iBAAiB,CAAA;wBACxE,mBAAmB,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,qBAAqB,GAAG,GAAG,EAAE,CAAC,iBAAiB,IAAI,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,CAAA;qBACrG;iBACF;YACH,CAAC,CAAC,CAAA;SACH;QAED,OAAO,IAAA,iBAAO,EAAC,mBAAmB,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IAC5D,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/release-good/index.js

@@ -13,6 +13,7 @@ const release_good_1 = require("./release-good");
 const release_good_detail_1 = require("./release-good-detail");
 const release_good_requests_1 = require("./release-good-requests");
 const release_goods_1 = require("./release-goods");
+const update_release_good_details_1 = require("./update-release-good-details");
 exports.Query = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, release_goods_1.releaseGoodsResolver), release_good_1.releaseGoodResolver), release_good_requests_1.releaseGoodRequestsResolver), release_good_detail_1.releaseGoodDetailResolver), releasable_inventories_1.releasableInventoriesResolver);
-exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, delete_release_good_1.deleteReleaseGoodResolver), delete_release_goods_1.deleteReleaseGoods), confirm_release_good_1.confirmReleaseGoodResolver), generate_release_good_1.generateReleaseGood), receive_release_good_1.receiveReleaseGoodResolver), reject_release_good_1.rejectReleaseGoodResolver), add_release_good_1.addReleaseGood);
+exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, delete_release_good_1.deleteReleaseGoodResolver), delete_release_goods_1.deleteReleaseGoods), confirm_release_good_1.confirmReleaseGoodResolver), generate_release_good_1.generateReleaseGood), receive_release_good_1.receiveReleaseGoodResolver), reject_release_good_1.rejectReleaseGoodResolver), add_release_good_1.addReleaseGood), update_release_good_details_1.updateReleaseGoodDetailsResolver);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/index.ts"],"names":[],"mappings":";;;AAAA,iEAAmE;AACnE,yDAAmD;AACnD,+DAAiE;AACjE,iEAA2D;AAC3D,mEAA6D;AAC7D,iEAAmE;AACnE,+DAAiE;AACjE,qEAAwE;AACxE,iDAAoD;AACpD,+DAAiE;AACjE,mEAAqE;AACrE,mDAAsD;AAEzC,QAAA,KAAK,6EACb,oCAAoB,GACpB,kCAAmB,GACnB,mDAA2B,GAC3B,+CAAyB,GACzB,sDAA6B,EACjC;AAEY,QAAA,QAAQ,yGAChB,+CAAyB,GACzB,yCAAkB,GAClB,iDAA0B,GAC1B,2CAAmB,GACnB,iDAA0B,GAC1B,+CAAyB,GACzB,iCAAc,EAClB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/index.ts"],"names":[],"mappings":";;;AAAA,iEAAmE;AACnE,yDAAmD;AACnD,+DAAiE;AACjE,iEAA2D;AAC3D,mEAA6D;AAC7D,iEAAmE;AACnE,+DAAiE;AACjE,qEAAwE;AACxE,iDAAoD;AACpD,+DAAiE;AACjE,mEAAqE;AACrE,mDAAsD;AACtD,+EAAgF;AAEnE,QAAA,KAAK,6EACb,oCAAoB,GACpB,kCAAmB,GACnB,mDAA2B,GAC3B,+CAAyB,GACzB,sDAA6B,EACjC;AAEY,QAAA,QAAQ,uHAChB,+CAAyB,GACzB,yCAAkB,GAClB,iDAA0B,GAC1B,2CAAmB,GACnB,iDAA0B,GAC1B,+CAAyB,GACzB,iCAAc,GACd,8DAAgC,EACpC"}

package/dist-server/graphql/resolvers/release-good/release-good-detail.js

@@ -68,6 +68,8 @@ exports.releaseGoodDetailResolver = {
                         packingSize: inventory.packingSize,
                         location: inventory.location,
                         qty: inventory.qty,
+                        lockedQty: inventory.lockedQty,
+                        lockedUomValue: inventory.lockedUomValue,
                         uom: inventory.uom,
                         uomValue: inventory.uomValue,
                         releaseQty: orderInv.releaseQty,
@@ -95,12 +97,16 @@ exports.releaseGoodDetailResolver = {
                     };
                 }
             }));
-            const result = Object.assign(Object.assign({}, releaseGood), { attachment: foundAttachments, shippingOrderInfo: {
-                    containerNo: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerNo) || '',
-                    containerLeavingDate: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerLeavingDate) || '',
-                    containerArrivalDate: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerArrivalDate) || '',
-                    shipName: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.shipName) || ''
-                }, inventoryInfos: (0, orderBy_1.default)(invInfos, ['product.sku'], ['asc']) });
+            let result = Object.assign(Object.assign({}, releaseGood), { attachment: foundAttachments, shippingOrderInfo: {}, inventoryInfos: (0, orderBy_1.default)(invInfos, ['product.sku'], ['asc']) });
+            if (shippingOrder) {
+                result = Object.assign(Object.assign({}, result), { shippingOrderInfo: {
+                        id: shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.id,
+                        containerNo: shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerNo,
+                        containerLeavingDate: shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerLeavingDate,
+                        containerArrivalDate: shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerArrivalDate,
+                        shipName: shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.shipName
+                    } });
+            }
             dropOITempTable(domain, tx);
             return result;
         }

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

@@ -1 +1 @@
-{"version":3,"file":"release-good-detail.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/release-good-detail.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"release-good-detail.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/release-good-detail.ts"],"names":[],"mappings":"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"}

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

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.releaseGoodResolver = void 0;
-const biz_base_1 = require("@things-factory/biz-base");
 const typeorm_1 = require("typeorm");
+const biz_base_1 = require("@things-factory/biz-base");
+const product_base_1 = require("@things-factory/product-base");
 const entities_1 = require("../../../entities");
 exports.releaseGoodResolver = {
     async releaseGood(_, { name }, context) {
         const { domain, user } = context.state;
-        return await (0, typeorm_1.getRepository)(entities_1.ReleaseGood).findOne({
+        let releaseGood = await (0, typeorm_1.getRepository)(entities_1.ReleaseGood).findOne({
             where: {
                 domain,
                 name,
@@ -22,12 +23,27 @@ exports.releaseGoodResolver = {
                 'orderInventories.product',
                 'orderInventories.inventory',
                 'orderInventories.inventory.product',
+                'orderInventories.inventory.location',
                 'orderVass',
                 'orderVass.vas',
                 'creator',
                 'updater'
             ]
         });
+        releaseGood.orderInventories = await Promise.all(releaseGood.orderInventories.map(async (orderInventory) => {
+            const productDetails = await (0, typeorm_1.getRepository)(product_base_1.ProductDetail).find({
+                where: {
+                    product: orderInventory.product.id,
+                    packingType: orderInventory.packingType,
+                    packingSize: orderInventory.packingSize
+                }
+            });
+            orderInventory.product['productDetails'] = productDetails;
+            if (orderInventory.inventory)
+                orderInventory.inventory.product['productDetails'] = productDetails;
+            return orderInventory;
+        }));
+        return releaseGood;
     }
 };
 //# sourceMappingURL=release-good.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/release-good.ts"],"names":[],"mappings":";;;AACA,uDAAkE;AAElE,qCAA2C;AAC3C,gDAA+C;AAElC,QAAA,mBAAmB,GAAG;IACjC,KAAK,CAAC,WAAW,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAC9C,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,OAAO,MAAM,IAAA,uBAAa,EAAC,sBAAW,CAAC,CAAC,OAAO,CAAC;YAC9C,KAAK,EAAE;gBACL,MAAM;gBACN,IAAI;gBACJ,QAAQ,EAAE,IAAA,YAAE,EAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;aAC1D;YACD,SAAS,EAAE;gBACT,QAAQ;gBACR,UAAU;gBACV,eAAe;gBACf,eAAe;gBACf,kBAAkB;gBAClB,0BAA0B;gBAC1B,4BAA4B;gBAC5B,oCAAoC;gBACpC,WAAW;gBACX,eAAe;gBACf,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;IACJ,CAAC;CACF,CAAA"}
+{"version":3,"file":"release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/release-good.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAG3C,uDAAkE;AAClE,+DAA4D;AAG5D,gDAA+D;AAElD,QAAA,mBAAmB,GAAG;IACjC,KAAK,CAAC,WAAW,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAC9C,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,IAAI,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,sBAAW,CAAC,CAAC,OAAO,CAAC;YACtE,KAAK,EAAE;gBACL,MAAM;gBACN,IAAI;gBACJ,QAAQ,EAAE,IAAA,YAAE,EAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;aAC1D;YACD,SAAS,EAAE;gBACT,QAAQ;gBACR,UAAU;gBACV,eAAe;gBACf,eAAe;gBACf,kBAAkB;gBAClB,0BAA0B;gBAC1B,4BAA4B;gBAC5B,oCAAoC;gBACpC,qCAAqC;gBACrC,WAAW;gBACX,eAAe;gBACf,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;QAEF,WAAW,CAAC,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9C,WAAW,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,cAA8B,EAAE,EAAE;YACxE,MAAM,cAAc,GAAoB,MAAM,IAAA,uBAAa,EAAC,4BAAa,CAAC,CAAC,IAAI,CAAC;gBAC9E,KAAK,EAAE;oBACL,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,EAAE;oBAClC,WAAW,EAAE,cAAc,CAAC,WAAW;oBACvC,WAAW,EAAE,cAAc,CAAC,WAAW;iBACxC;aACF,CAAC,CAAA;YAEF,cAAc,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,cAAc,CAAA;YAEzD,IAAI,cAAc,CAAC,SAAS;gBAAE,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,cAAc,CAAA;YAEjG,OAAO,cAAc,CAAA;QACvB,CAAC,CAAC,CACH,CAAA;QAED,OAAO,WAAW,CAAA;IACpB,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/release-good/update-release-good-details.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateReleaseGoodFunction = exports.updateReleaseGoodDetailsResolver = void 0;
+const biz_base_1 = require("@things-factory/biz-base");
+const constants_1 = require("../../../constants");
+const entities_1 = require("../../../entities");
+const order_no_generator_1 = require("../../../utils/order-no-generator");
+exports.updateReleaseGoodDetailsResolver = {
+    async updateReleaseGoodDetails(_, { releaseGood, shippingOrder }, context) {
+        const { tx } = context.state;
+        try {
+            return updateReleaseGoodFunction(releaseGood, shippingOrder, context, tx);
+        }
+        catch (error) {
+            throw error;
+        }
+    }
+};
+async function updateReleaseGoodFunction(releaseGood, shippingOrder, context, tx) {
+    const { domain, user } = context.state;
+    let foundReleaseGood = await tx.getRepository(entities_1.ReleaseGood).findOne({
+        where: { id: releaseGood.id, name: releaseGood.name, domain },
+        relations: ['shippingOrder']
+    });
+    if (!foundReleaseGood) {
+        throw new Error(`Release Order ${releaseGood.name} is not found.`);
+    }
+    // case to update existing shippingOrder
+    if (foundReleaseGood.shippingOrder && shippingOrder) {
+        await tx.getRepository(entities_1.ShippingOrder).update(foundReleaseGood.shippingOrder.id, shippingOrder);
+    }
+    // case for new shippingOrder
+    else if (!foundReleaseGood.shippingOrder && shippingOrder) {
+        let newShippingOrder = await tx.getRepository(entities_1.ShippingOrder).save(Object.assign(Object.assign({}, shippingOrder), { name: order_no_generator_1.OrderNoGenerator.shippingOrder(), domain, bizplace: await (0, biz_base_1.getMyBizplace)(domain, user), status: constants_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
+        releaseGood.shippingOrder = newShippingOrder;
+    }
+    await tx.getRepository(entities_1.ReleaseGood).update(foundReleaseGood.id, releaseGood);
+    // return updated Release Good
+    return await tx.getRepository(entities_1.ReleaseGood).findOne(foundReleaseGood.id);
+}
+exports.updateReleaseGoodFunction = updateReleaseGoodFunction;
+//# sourceMappingURL=update-release-good-details.js.map

package/dist-server/graphql/resolvers/release-good/update-release-good-details.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-release-good-details.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/update-release-good-details.ts"],"names":[],"mappings":";;;AAGA,uDAAwD;AAGxD,kDAAiD;AACjD,gDAA8D;AAC9D,0EAAoE;AAEvD,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,OAAY;QACjF,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;QAEnD,IAAI;YACF,OAAO,yBAAyB,CAAC,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,CAAC,CAAA;SAC1E;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,yBAAyB,CAC7C,WAAwB,EACxB,aAA4B,EAC5B,OAAY,EACZ,EAAkB;IAElB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;IACtE,IAAI,gBAAgB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAW,CAAC,CAAC,OAAO,CAAC;QACjE,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE;QAC7D,SAAS,EAAE,CAAC,eAAe,CAAC;KAC7B,CAAC,CAAA;IAEF,IAAI,CAAC,gBAAgB,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,iBAAiB,WAAW,CAAC,IAAI,gBAAgB,CAAC,CAAA;KACnE;IAED,wCAAwC;IACxC,IAAI,gBAAgB,CAAC,aAAa,IAAI,aAAa,EAAE;QACnD,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAa,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,EAAE,aAAa,CAAC,CAAA;KAC/F;IACD,6BAA6B;SACxB,IAAI,CAAC,gBAAgB,CAAC,aAAa,IAAI,aAAa,EAAE;QACzD,IAAI,gBAAgB,GAAkB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAa,CAAC,CAAC,IAAI,iCAC3E,aAAa,KAChB,IAAI,EAAE,qCAAgB,CAAC,aAAa,EAAE,EACtC,MAAM,EACN,QAAQ,EAAE,MAAM,IAAA,wBAAa,EAAC,MAAM,EAAE,IAAI,CAAC,EAC3C,MAAM,EAAE,wBAAY,CAAC,OAAO,EAC5B,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,WAAW,CAAC,aAAa,GAAG,gBAAgB,CAAA;KAC7C;IAED,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAW,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,EAAE,WAAW,CAAC,CAAA;IAC5E,8BAA8B;IAC9B,OAAO,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAW,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAA;AACzE,CAAC;AAtCD,8DAsCC"}

package/dist-server/graphql/types/release-good/index.js

@@ -38,6 +38,11 @@ exports.Mutation = `
     patch: ReleaseGoodPatch!
   ): ReleaseGood @privilege(category: "order_warehouse", privilege: "mutation") @transaction
 
+  updateReleaseGoodDetails (
+    releaseGood: ReleaseGoodPatch!,
+    shippingOrder: ShippingOrderPatch
+  ): ReleaseGood @privilege(category: "order", privilege: "mutation") @transaction
+
   addReleaseGood (
     releaseGood: NewReleaseGood
     shippingOrder: ShippingOrderPatch

package/dist-server/graphql/types/release-good/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/index.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAClD,yDAAmD;AACnD,iEAA4D;AAC5D,2EAAqE;AACrE,iDAA4C;AAC5C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAuD;AACvD,+DAAyD;AAE5C,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiCrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BlC,CAAA;AAEY,QAAA,KAAK,GAAG;IACnB,0BAAW;IACX,iCAAc;IACd,qCAAgB;IAChB,mCAAe;IACf,uCAAiB;IACjB,uCAAiB;IACjB,gCAAc;IACd,0CAAmB;IACnB,mDAAuB;CACxB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/index.ts"],"names":[],"mappings":";;;AAAA,uDAAkD;AAClD,yDAAmD;AACnD,iEAA4D;AAC5D,2EAAqE;AACrE,iDAA4C;AAC5C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAuD;AACvD,+DAAyD;AAE5C,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsCrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BlC,CAAA;AAEY,QAAA,KAAK,GAAG;IACnB,0BAAW;IACX,iCAAc;IACd,qCAAgB;IAChB,mCAAe;IACf,uCAAiB;IACjB,uCAAiB;IACjB,gCAAc;IACd,0CAAmB;IACnB,mDAAuB;CACxB,CAAA"}

package/dist-server/graphql/types/release-good/inventory-infos.js

@@ -18,6 +18,7 @@ exports.InventoryInfos = (0, graphql_tag_1.default) `
     packingType: String
     packingSize: Float
     qty: Int
+    lockedQty: Int
     weight: Float
     releaseQty: Float
     releaseWeight: Float
@@ -26,6 +27,7 @@ exports.InventoryInfos = (0, graphql_tag_1.default) `
     status: String
     releaseUomValue: Float
     uomValue: Float
+    lockedUomValue: Float
     uom: String
     returnQty: Float
     returnUomValue: Float

package/dist-server/graphql/types/release-good/inventory-infos.js.map

@@ -1 +1 @@
-{"version":3,"file":"inventory-infos.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/inventory-infos.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,cAAc,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BhC,CAAA"}
+{"version":3,"file":"inventory-infos.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/inventory-infos.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,cAAc,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BhC,CAAA"}

package/dist-server/graphql/types/release-good/release-good-patch.js

@@ -7,6 +7,7 @@ exports.ReleaseGoodPatch = void 0;
 const graphql_tag_1 = __importDefault(require("graphql-tag"));
 exports.ReleaseGoodPatch = (0, graphql_tag_1.default) `
   input ReleaseGoodPatch {
+    id: String
     name: String
     releaseDate: String
     releaseDateTime: String

package/dist-server/graphql/types/release-good/release-good-patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"release-good-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/release-good-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqDlC,CAAA"}
+{"version":3,"file":"release-good-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/release-good-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsDlC,CAAA"}

package/dist-server/graphql/types/release-good/shipping-order-info.js

@@ -7,6 +7,7 @@ exports.ShippingOrderInfo = void 0;
 const graphql_tag_1 = __importDefault(require("graphql-tag"));
 exports.ShippingOrderInfo = (0, graphql_tag_1.default) `
   type ShippingOrderInfo {
+    id: String
     containerNo: String
     containerLeavingDate: String
     containerArrivalDate: String

package/dist-server/graphql/types/release-good/shipping-order-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"shipping-order-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/shipping-order-info.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,iBAAiB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;CASnC,CAAA"}
+{"version":3,"file":"shipping-order-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/release-good/shipping-order-info.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,iBAAiB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;CAUnC,CAAA"}

package/dist-server/graphql/types/shipping-order/shipping-order-patch.js

@@ -7,6 +7,7 @@ exports.ShippingOrderPatch = void 0;
 const graphql_tag_1 = __importDefault(require("graphql-tag"));
 exports.ShippingOrderPatch = (0, graphql_tag_1.default) `
   input ShippingOrderPatch {
+    id: String
     name: String
     description: String
     shipName: String

package/dist-server/graphql/types/shipping-order/shipping-order-patch.js.map

@@ -1 +1 @@
-{"version":3,"file":"shipping-order-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/shipping-order/shipping-order-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,kBAAkB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;CAapC,CAAA"}
+{"version":3,"file":"shipping-order-patch.js","sourceRoot":"","sources":["../../../../server/graphql/types/shipping-order/shipping-order-patch.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,kBAAkB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;CAcpC,CAAA"}

package/dist-server/utils/inventory-util.js

@@ -45,6 +45,7 @@ exports.InventoryUtil = {
               AND oi.product_id NOTNULL
               AND oi.packing_type NOTNULL
               AND oi.packing_size NOTNULL
+              AND oi.inventory_id IS NULL
             GROUP BY
               oi.batch_id,
               oi.batch_id_ref,
@@ -149,7 +150,7 @@ exports.InventoryUtil = {
             };
         }));
         let resultQb = await trxMgr.query(`
-      select joi.product_id as "productId", joi.batch_id as "batchId", joi.packing_type as "packingType", joi.release_qty as "releaseQty",
+      select joi.product_id as "productId", joi.batch_id as "batchId", joi.packing_type as "packingType", joi.uom as "uom", joi.release_qty as "releaseQty",
       sum(i.qty - coalesce(i.locked_qty,0)) - coalesce(
       (
         select sum(oi.release_qty) from order_inventories oi 
@@ -158,7 +159,7 @@ exports.InventoryUtil = {
         and oi.product_id = joi.product_id
         and oi.batch_id = joi.batch_id
         and oi.packing_type = joi.packing_type
-        and oi.uom = i.uom
+        and oi.uom = joi.uom
         and oi.domain_id = $1
         and oi.bizplace_id = $2
       ),0) as "availableQty",
@@ -170,10 +171,10 @@ exports.InventoryUtil = {
         and oi.product_id = joi.product_id
         and oi.batch_id = joi.batch_id
         and oi.packing_type = joi.packing_type
-        and oi.uom = i.uom
+        and oi.uom = joi.uom
         and oi.domain_id = $1
         and oi.bizplace_id = $2
-      ),0) as "availableUomValue", i.uom
+      ),0) as "availableUomValue"
       from json_populate_recordset(NULL::order_inventories,'${json_oi}') joi
       left join inventories i on joi.product_id = i.product_id 
       and joi.batch_id = i.batch_id
@@ -181,7 +182,7 @@ exports.InventoryUtil = {
       and joi.uom = i.uom
       and i.domain_id = $1
       and i.bizplace_id = $2
-      group by joi.product_id, joi.batch_id, joi.packing_type, joi.release_qty, i.uom
+      group by joi.product_id, joi.batch_id, joi.packing_type, joi.release_qty, joi.uom
     `, [warehouseDomain.id, partnerBizplace.id]);
         resultQb.forEach(itm => {
             if (itm.releaseQty > itm.availableQty) {
@@ -245,6 +246,9 @@ async function getConditions(bizplaces, filters, trxMgr) {
                 case 'batchId':
                     whereClause += `AND LOWER("batchId") LIKE '${value.toLowerCase()}'`;
                     break;
+                case 'batchIdRef':
+                    whereClause += `AND LOWER("batchIdRef") LIKE '${value.toLowerCase()}'`;
+                    break;
                 case 'productName':
                     const products = await trxMgr.getRepository(product_base_1.Product).find({
                         select: ['id'],

package/dist-server/utils/inventory-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":";;;AAAA,qCAAuF;AAIvF,+DAAqE;AAErE,mEAQuC;AAYvC,sCAA2C;AAW9B,QAAA,aAAa,GAAG;IAC3B;;;;;;;OAOG;IACH,KAAK,CAAC,6BAA6B,CAAC,SAAqB,EAAE,MAAiB,EAAE,OAAY,EAAE,MAAqB;QAC/G,IAAI;YACF,IAAI,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;YAC5B,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;YAEpD,MAAM,EAAE,WAAW,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,MAAM,aAAa,CAC1G,SAAS,EACT,OAAO,EACP,MAAM,CACP,CAAA;YAED,IAAI,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4EAwDmD,WAAW;;;;YAI3E,kBAAkB;;;;;;;;;;;;;;;;;;;;;qCAqBO,WAAW;;;;;YAKpC,iBAAiB;;;;UAInB,WAAW;;KAEhB,CAAA;YAEC,MAAM,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAA;YAE7C,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,GAAQ,MAAM,MAAM,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAA;YACzG,IAAI,KAAK,GAAU,EAAE,CAAA;YAErB,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,EAAE;gBACtB,KAAK,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,+DAA+D,EAAE;oBAC1F,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK;oBACtD,MAAM,CAAC,UAAU,CAAC,KAAK;iBACxB,CAAC,CAAA;aACH;iBAAM;gBACL,KAAK,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAA;aACzE;YAED,MAAM,MAAM,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;YAE7D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;SACxB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,yCAAyC,CAC7C,eAAuB,EACvB,eAAyB,EACzB,gBAAkC,EAClC,OAAY,EACZ,MAAsB;QAEtB,IAAI,OAAO,GAAG,IAAI,CAAC,SAAS,CAC1B,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACvB,OAAO;gBACL,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE;gBACxB,QAAQ,EAAE,CAAC,CAAC,OAAO;gBACnB,YAAY,EAAE,CAAC,CAAC,WAAW;gBAC3B,WAAW,EAAE,CAAC,CAAC,UAAU;gBACzB,GAAG,EAAE,CAAC,CAAC,GAAG;aACX,CAAA;QACH,CAAC,CAAC,CACH,CAAA;QAED,IAAI,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAC/B;;;;;;;;;;;;;;;;;;;;;;;;;;8DA0BwD,OAAO;;;;;;;;KAQhE,EACC,CAAC,eAAe,CAAC,EAAE,EAAE,eAAe,CAAC,EAAE,CAAC,CACzC,CAAA;QAED,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACrB,IAAI,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC,YAAY,EAAE;gBACrC,MAAM,IAAI,wBAAe,iCACpB,wBAAe,CAAC,WAAW,CAAC,sBAAsB,KACrD,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,IAC1C,CAAA;aACH;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,QAAgB,EAAE,eAAuB,EAAE,MAAqB;QAC3F,MAAM,mBAAmB,GAAW,MAAM,MAAM,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,KAAK,CAAC;YAC9E,MAAM,EAAE,eAAe;YACvB,QAAQ;YACR,MAAM,EAAE,IAAA,aAAG,EAAC,IAAA,eAAK,EAAC,iCAAgB,CAAC,UAAU,CAAC,CAAC;SAChD,CAAC,CAAA;QAEF,IAAI,mBAAmB;YAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;QAE9D,MAAM,2BAA2B,GAAW,MAAM,MAAM,CAAC,aAAa,CAAC,uBAAM,CAAC,CAAC,KAAK,CAAC;YACnF,KAAK,EAAE;gBACL,MAAM,EAAE,eAAe;gBACvB,IAAI,EAAE,QAAQ;aACf;SACF,CAAC,CAAA;QAEF,IAAI,2BAA2B;YAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;IACxE,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,oBAAoB,CACxB,SAA6B,EAC7B,cAAkC,EAClC,UAAkB,EAClB,aAAqB,EACrB,eAAuB,EACvB,IAAU,EACV,MAAqB;QAErB,IAAI,SAAS,CAAC,EAAE,EAAE;YAChB,SAAS,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;SACrD;aAAM;YACL,SAAS,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;SACrD;QAED,MAAM,wBAAwB,CAAC,SAAS,EAAE,cAAc,EAAE,eAAe,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QAEnH,OAAO,SAAS,CAAA;IAClB,CAAC;CACF,CAAA;AAUD,KAAK,UAAU,aAAa,CAC1B,SAAqB,EACrB,OAAyD,EACzD,MAAqB;;IAErB,IAAI,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,IAAI,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;IAElF,IAAI,kBAAkB,GAAG;;4BAEC,WAAW;GACpC,CAAA;IACD,IAAI,iBAAiB,GAAG;;GAEvB,CAAA;IAED,IAAI,WAAW,GAAG;;GAEjB,CAAA;IAED,IAAI,WAAmB,CAAA;IACvB,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM,EAAE;QACnB,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAsD,EAAE,EAAE;YAC3E,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;YACxB,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAA;YAC9C,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;YAExB,QAAQ,IAAI,EAAE;gBACZ,KAAK,SAAS;oBACZ,WAAW,IAAI,8BAA8B,KAAK,CAAC,WAAW,EAAE,GAAG,CAAA;oBACnE,MAAK;gBAEP,KAAK,YAAY;oBACf,WAAW,IAAI,iCAAiC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAA;oBACtE,MAAK;gBAEP,KAAK,aAAa;oBAChB,MAAM,QAAQ,GAAc,MAAM,MAAM,CAAC,aAAa,CAAC,sBAAO,CAAC,CAAC,IAAI,CAAC;wBACnE,MAAM,EAAE,CAAC,IAAI,CAAC;wBACd,KAAK,EAAE;4BACL;gCACE,QAAQ,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gCAChE,IAAI,EAAE,IAAA,aAAG,EACP,CAAC,KAAa,EAAE,EAAE,CAAC,SAAS,KAAK,WAAW,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAC9F;6BACF;4BACD;gCACE,QAAQ,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gCAChE,GAAG,EAAE,IAAA,aAAG,EACN,CAAC,KAAa,EAAE,EAAE,CAAC,SAAS,KAAK,WAAW,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAC9F;6BACF;4BACD;gCACE,QAAQ,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gCAChE,WAAW,EAAE,IAAA,aAAG,EACd,CAAC,KAAa,EAAE,EAAE,CAAC,SAAS,KAAK,WAAW,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAC9F;6BACF;yBACF;qBACF,CAAC,CAAA;oBAEF,MAAM,UAAU,GAAW,QAAQ;yBAChC,GAAG,CAAC,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;yBACrC,GAAG,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC;yBAC9B,IAAI,EAAE,CAAA;oBAET,IAAI,UAAU,CAAC,MAAM,EAAE;wBACrB,kBAAkB,IAAI,wBAAwB,UAAU,GAAG,CAAA;qBAC5D;yBAAM;wBACL,kBAAkB,IAAI,yBAAyB,CAAA;qBAChD;oBAED,wCAAwC;oBACxC,MAAM,cAAc,GAAoB,MAAM,MAAM,CAAC,aAAa,CAAC,4BAAa,CAAC,CAAC,IAAI,CAAC;wBACrF,MAAM,EAAE,CAAC,IAAI,CAAC;wBACd,KAAK,EAAE;4BACL;gCACE,QAAQ,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gCAChE,IAAI,EAAE,IAAA,aAAG,EACP,CAAC,KAAa,EAAE,EAAE,CAAC,SAAS,KAAK,WAAW,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAC9F;6BACF;4BACD;gCACE,QAAQ,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gCAChE,GAAG,EAAE,IAAA,aAAG,EACN,CAAC,KAAa,EAAE,EAAE,CAAC,SAAS,KAAK,WAAW,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAC9F;6BACF;4BACD;gCACE,QAAQ,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gCAChE,WAAW,EAAE,IAAA,aAAG,EACd,CAAC,KAAa,EAAE,EAAE,CAAC,SAAS,KAAK,WAAW,KAAK,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAC9F;6BACF;yBACF;qBACF,CAAC,CAAA;oBAEF,MAAM,gBAAgB,GAAW,cAAc;yBAC5C,GAAG,CAAC,CAAC,MAAqB,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;yBACzC,GAAG,CAAC,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC;yBAC9B,IAAI,EAAE,CAAA;oBAET,IAAI,gBAAgB,CAAC,MAAM,EAAE;wBAC3B,iBAAiB,IAAI,iBAAiB,gBAAgB,GAAG,CAAA;qBAC1D;yBAAM;wBACL,iBAAiB,IAAI,kBAAkB,CAAA;qBACxC;oBACD,MAAK;gBAEP,KAAK,aAAa;oBAChB,WAAW,IAAI,kCAAkC,KAAK,CAAC,WAAW,EAAE,GAAG,CAAA;oBACvE,MAAK;gBAEP,KAAK,YAAY;oBACf,WAAW,IAAI,sCAAsC,CAAA;oBACrD,MAAK;gBAEP,KAAK,eAAe;oBAClB,kBAAkB,IAAI;uDACqB,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,KAAK,KAAK;yBACnF,GAAG,CACF,CAAC,CAA8D,EAAE,EAAE,CACjE,KAAK,CAAC,CAAC,OAAO,OAAO,CAAC,CAAC,SAAS,OAAO,CAAC,CAAC,WAAW,IAAI,CAC3D;yBACA,IAAI,EAAE;aACV,CAAA;oBACD,MAAK;gBAEP,KAAK,cAAc;oBACjB,iBAAiB,IAAI;gBACjB,iBAAiB,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,UAAU,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,KAAK,KAAK;yBAC/F,GAAG,CAAC,CAAC,CAAwB,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,SAAS,IAAI,CAAC;yBACvD,IAAI,EAAE;aACV,CAAA;oBACD,MAAK;aACR;QACH,CAAC,CAAC,CACH,CAAA;QAED,WAAW,GAAG,IAAI,CAAC,SAAS,CAC1B,CAAA,MAAA,OAAO;aACJ,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,cAAc,CAAC,0CAC7C,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAChB,OAAO;gBACL,UAAU,EAAE,GAAG,CAAC,SAAS;gBACzB,WAAW,EAAE,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,UAAU,KAAI,CAAC;gBACjC,iBAAiB,EAAE,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,eAAe,KAAI,CAAC;aAC7C,CAAA;QACH,CAAC,CAAC,KAAI,EAAE,CACX,CAAA;KACF;IAED,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAE,CAAA;AACzF,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,SAAoD,EACpD,MAAqB;IAErB,OAAO,MAAM,MAAM,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;AAC9D,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,eAAe,CAC5B,SAAoD,EACpD,MAAqB;IAErB,IAAI,CAAC,SAAS,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;IAC5D,OAAO,MAAM,MAAM,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;AAC9D,CAAC;AAED,KAAK,UAAU,wBAAwB,CACrC,SAAoB,EACpB,QAAa,EACb,eAAuB,EACvB,GAAW,EACX,QAAgB,EAChB,IAAU,EACV,MAAsB;;IAEtB,MAAM,cAAc,GAClB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,iCAAgB,CAAC,KAAI,IAAA,uBAAa,EAAC,iCAAgB,CAAC,CAAA;IAC5E,MAAM,OAAO,GAA0B,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,0BAAS,CAAC,KAAI,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAA;IAEnG,IAAI,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,EAAE,CAAA;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;IACtE,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;IACpG,IACE,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,CAAA;QAClB,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAA;QACpB,CAAC,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,0CAAE,EAAE,CAAA;QACvB,CAAC,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,0CAAE,EAAE,CAAA;QACzB,CAAC,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,0CAAE,EAAE,CAAA,EACxB;QACA,SAAS,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;YAChC,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE;YAC3B,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC;SACtE,CAAC,CAAA;KACH;IAED,MAAM,MAAM,GAAW,SAAS,CAAC,MAAM,CAAA;IACvC,MAAM,QAAQ,GAAa,SAAS,CAAC,QAAQ,CAAA;IAE7C,MAAM,GAAG,GAAW,MAAM,cAAc,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAA;IAC1G,IAAI,UAAU,GAAW,CAAC,CAAA;IAC1B,IAAI,eAAe,GAAW,CAAC,CAAA;IAE/B,IAAI,GAAG,EAAE;QACP,MAAM,cAAc,GAAqB,MAAM,cAAc,CAAC,OAAO,CAAC;YACpE,MAAM,EAAE,SAAS,CAAC,MAAM;YACxB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,GAAG,EAAE,GAAG,GAAG,CAAC;SACb,CAAC,CAAA;QACF,UAAU,GAAG,cAAc,CAAC,UAAU,GAAG,cAAc,CAAC,GAAG,CAAA;QAC3D,eAAe,GAAG,cAAc,CAAC,eAAe,GAAG,cAAc,CAAC,QAAQ,CAAA;KAC3E;IAED,IAAI,gBAAgB,GAAqB,IAAI,iCAAgB,EAAE,CAAA;IAC/D,gBAAgB,CAAC,IAAI,GAAG,qCAAoB,CAAC,oBAAoB,EAAE,CAAA;IACnE,gBAAgB,CAAC,WAAW,GAAG,SAAS,CAAC,WAAW,CAAA;IACpD,gBAAgB,CAAC,GAAG,GAAG,GAAG,CAAA;IAC1B,gBAAgB,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;IAC9C,gBAAgB,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;IAC9C,gBAAgB,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;IAC5C,gBAAgB,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,CAAA;IAClD,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAA;IAC1C,gBAAgB,CAAC,eAAe,GAAG,eAAe,CAAA;IAClD,gBAAgB,CAAC,UAAU,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,EAAE,KAAI,IAAI,CAAA;IAClD,gBAAgB,CAAC,OAAO,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,KAAI,IAAI,CAAA;IACjD,gBAAgB,CAAC,UAAU,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,KAAI,IAAI,CAAA;IACrD,gBAAgB,CAAC,SAAS,GAAG,SAAS,CAAA;IACtC,gBAAgB,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;IAC5C,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAA;IAC1D,gBAAgB,CAAC,IAAI,GAAG,SAAS,CAAC,IAAI,CAAA;IACtC,gBAAgB,CAAC,SAAS,GAAG,SAAS,CAAC,SAAS,CAAA;IAChD,gBAAgB,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;IAC9C,gBAAgB,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAA;IAC1D,gBAAgB,CAAC,WAAW,GAAG,SAAS,CAAC,WAAW,CAAA;IACpD,gBAAgB,CAAC,WAAW,GAAG,SAAS,CAAC,WAAW,CAAA;IACpD,gBAAgB,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,CAAA;IACpC,gBAAgB,CAAC,GAAG,GAAG,GAAG,CAAA;IAC1B,gBAAgB,CAAC,UAAU,GAAG,UAAU,CAAA;IACxC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAA;IAC3B,gBAAgB,CAAC,aAAa,GAAG,CAAC,CAAA;IAClC,gBAAgB,CAAC,QAAQ,GAAG,QAAQ,CAAA;IACpC,gBAAgB,CAAC,eAAe,GAAG,eAAe,CAAA;IAClD,gBAAgB,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;IAC9C,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAA;IAC1C,gBAAgB,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAA;IAC9C,gBAAgB,CAAC,OAAO,GAAG,IAAI,CAAA;IAC/B,gBAAgB,CAAC,OAAO,GAAG,IAAI,CAAA;IAE/B,gBAAgB,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;IAE9D,IAAI,SAAS,CAAC,OAAO,KAAK,GAAG,EAAE;QAC7B,MAAM,OAAO,CAAC,IAAI,iCACb,SAAS,KACZ,OAAO,EAAE,gBAAgB,CAAC,GAAG,EAC7B,OAAO,EAAE,IAAI,IACb,CAAA;KACH;IAED,MAAM,oBAAoB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IAC1D,OAAO,gBAAgB,CAAA;AACzB,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,oBAAoB,CACxC,MAAc,EACd,QAAkB,EAClB,OAAa,EACb,MAAsB;IAEtB,MAAM,OAAO,GAA0B,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,0BAAS,CAAC,KAAI,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAA;IACnG,MAAM,YAAY,GAAyB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,yBAAQ,CAAC,KAAI,IAAA,uBAAa,EAAC,yBAAQ,CAAC,CAAA;IACrG,MAAM,iBAAiB,GAAW,MAAM,OAAO,CAAC,KAAK,CAAC;QACpD,MAAM;QACN,MAAM,EAAE,iCAAgB,CAAC,MAAM;QAC/B,QAAQ;KACT,CAAC,CAAA;IAEF,IAAI,CAAC,iBAAiB,IAAI,QAAQ,CAAC,MAAM,KAAK,gCAAe,CAAC,KAAK,EAAE;QACnE,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,iCAC7B,QAAQ,KACX,MAAM,EAAE,gCAAe,CAAC,KAAK,EAC7B,OAAO,IACP,CAAA;KACH;SAAM,IAAI,iBAAiB,IAAI,QAAQ,CAAC,MAAM,KAAK,gCAAe,CAAC,KAAK,EAAE;QACzE,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,iCAC7B,QAAQ,KACX,MAAM,EAAE,gCAAe,CAAC,QAAQ,EAChC,OAAO,IACP,CAAA;KACH;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC;AA7BD,oDA6BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "3.7.5",
+  "version": "3.7.6",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -33,7 +33,7 @@
     "@things-factory/setting-base": "^3.7.5",
     "@things-factory/shell": "^3.7.5",
     "@things-factory/transport-base": "^3.7.5",
-    "@things-factory/warehouse-base": "^3.7.5"
+    "@things-factory/warehouse-base": "^3.7.6"
   },
-  "gitHead": "43e77ed980b3e999d9d17aa75cf50a547f87f4e7"
+  "gitHead": "d9d72c07fc3b01af2ede46808ec0aced3241ed51"
 }

package/server/graphql/resolvers/arrival-notice/arrival-notice.ts

@@ -3,73 +3,44 @@ import { getRepository, In } from 'typeorm'
 import { Attachment } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
 
 import { ATTACHMENT_TYPE } from '../../../constants/attachment-type'
-import { ArrivalNotice } from '../../../entities'
+import { ArrivalNotice, OrderInventory, OrderProduct } from '../../../entities'
 
 export const arrivalNoticeResolver = {
   async arrivalNotice(_: any, { name, refNo }, context: any) {
     const { domain, user, bizplace }: { domain: Domain; user: User; bizplace: Bizplace } = context.state
 
-    let foundGAN: ArrivalNotice
+    let param: any = { domain, bizplace: bizplace ? bizplace : In(await getPermittedBizplaceIds(domain, user)) }
 
-    if (context?.state?.bizplace) {
-      let param: any
+    if (name) param = { ...param, name }
+    else if (refNo) param = { ...param, refNo }
+    else return
 
-      if (name) param = { domain, name, bizplace }
-      else param = { domain, refNo, bizplace }
-
-      foundGAN = await getRepository(ArrivalNotice).findOne({
-        where: { ...param },
-        relations: [
-          'domain',
-          'bizplace',
-          'releaseGood',
-          'purchaseOrder',
-          'purchaseOrder.bufferLocation',
-          'orderProducts',
-          'orderProducts.product',
-          'orderInventories',
-          'orderInventories.inventory',
-          'orderInventories.inventory.product',
-          'orderInventories.inventory.location',
-          'orderVass',
-          'orderVass.vas',
-          'orderVass.targetProduct',
-          'supplier',
-          'creator',
-          'updater'
-        ]
-      })
-    } else {
-      let param: any
-
-      if (name) param = { domain, name, bizplace: In(await getPermittedBizplaceIds(domain, user)) }
-      else param = { domain, refNo, bizplace: In(await getPermittedBizplaceIds(domain, user)) }
-
-      foundGAN = await getRepository(ArrivalNotice).findOne({
-        where: { ...param },
-        relations: [
-          'domain',
-          'bizplace',
-          'releaseGood',
-          'purchaseOrder',
-          'purchaseOrder.bufferLocation',
-          'orderProducts',
-          'orderProducts.product',
-          'orderInventories',
-          'orderInventories.inventory',
-          'orderInventories.inventory.product',
-          'orderInventories.inventory.location',
-          'orderVass',
-          'orderVass.vas',
-          'orderVass.targetProduct',
-          'creator',
-          'updater'
-        ]
-      })
-    }
+    let foundGAN: ArrivalNotice = await getRepository(ArrivalNotice).findOne({
+      where: { ...param },
+      relations: [
+        'domain',
+        'bizplace',
+        'releaseGood',
+        'purchaseOrder',
+        'purchaseOrder.bufferLocation',
+        'orderProducts',
+        'orderProducts.product',
+        'orderInventories',
+        'orderInventories.inventory',
+        'orderInventories.inventory.product',
+        'orderInventories.inventory.location',
+        'orderVass',
+        'orderVass.vas',
+        'orderVass.targetProduct',
+        'supplier',
+        'creator',
+        'updater'
+      ]
+    })
 
     if (name && !foundGAN) throw new Error(`Failed to find arrival notice with ${name}`)
 
@@ -91,6 +62,36 @@ export const arrivalNoticeResolver = {
         })
       : []
 
+    // add productDetails data to orderProduct.product
+    foundGAN.orderProducts = await Promise.all(
+      foundGAN.orderProducts.map(async (orderProduct: OrderProduct) => {
+        orderProduct.product['productDetails'] = await getRepository(ProductDetail).find({
+          where: {
+            product: orderProduct.product.id,
+            packingType: orderProduct.packingType,
+            packingSize: orderProduct.packingSize
+          }
+        })
+        return orderProduct
+      })
+    )
+
+    // add productDetails data to orderInventory.inventory.product if orderInventory is exist
+    if (foundGAN.orderInventories && foundGAN.orderInventories.length) {
+      foundGAN.orderInventories = await Promise.all(
+        foundGAN.orderInventories.map(async (orderInventory: OrderInventory) => {
+          orderInventory.inventory.product['productDetails'] = await getRepository(ProductDetail).find({
+            where: {
+              product: orderInventory.inventory.product.id,
+              packingType: orderInventory.inventory.packingType,
+              packingSize: orderInventory.inventory.packingSize
+            }
+          })
+          return orderInventory
+        })
+      )
+    }
+
     return {
       ...foundGAN,
       attachment: [...foundPOAttachments, ...foundAttachments]

package/server/graphql/resolvers/order-inventory/order-inventories.ts

@@ -55,6 +55,7 @@ export const orderInventoriesResolver = {
         'inventory.product',
         'releaseGood',
         'deliveryOrder',
+        'bizplace',
         'creator',
         'updater'
       ]

package/server/graphql/resolvers/others/bulk-upload-validate-warehouse-partners-products-quantity.ts

@@ -1,9 +1,11 @@
+import orderBy from 'lodash/orderBy'
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace, getPermittedBizplaces } from '@things-factory/biz-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { InventoryUtil } from '../../../utils'
-import orderBy from 'lodash/orderBy'
 
 export const bulkUploadValidateWarehousePartnersProductsQuantityResolver = {
   async bulkUploadValidateWarehousePartnersProductsQuantity(
@@ -81,15 +83,16 @@ export const bulkUploadValidateWarehousePartnersProductsQuantityResolver = {
         inventory:
           total > 0
             ? {
-                ...items[0],
-                remainQty: total > 0 ? items[0].remainQty : null,
-                remainUomValue: total > 0 ? items[0].remainUomValue : null,
-                remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : ''
-              }
+              ...items[0],
+              remainQty: total > 0 ? items[0].remainQty : null,
+              remainUomValue: total > 0 ? items[0].remainUomValue : null,
+              remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : ''
+            }
             : null,
         productId: total > 0 ? items[0].productId : null,
         productSKU: total > 0 ? items[0].productSKU : orderInventory.productSKU,
         productName: total > 0 ? items[0].productName : null,
+        uom: total > 0 ? items[0].uom : null,
         remainQty: total > 0 ? items[0].remainQty : null,
         remainUomValue: total > 0 ? items[0].remainUomValue : null,
         remainUomValueWithUom: total > 0 ? items[0].remainUomValueWithUom : '',

package/server/graphql/resolvers/release-good/index.ts

@@ -10,6 +10,7 @@ import { releaseGoodResolver } from './release-good'
 import { releaseGoodDetailResolver } from './release-good-detail'
 import { releaseGoodRequestsResolver } from './release-good-requests'
 import { releaseGoodsResolver } from './release-goods'
+import { updateReleaseGoodDetailsResolver } from './update-release-good-details'
 
 export const Query = {
   ...releaseGoodsResolver,
@@ -26,5 +27,6 @@ export const Mutation = {
   ...generateReleaseGood,
   ...receiveReleaseGoodResolver,
   ...rejectReleaseGoodResolver,
-  ...addReleaseGood
+  ...addReleaseGood,
+  ...updateReleaseGoodDetailsResolver
 }

package/server/graphql/resolvers/release-good/release-good-detail.ts

@@ -74,6 +74,8 @@ export const releaseGoodDetailResolver = {
                 packingSize: inventory.packingSize,
                 location: inventory.location,
                 qty: inventory.qty,
+                lockedQty: inventory.lockedQty,
+                lockedUomValue: inventory. lockedUomValue,
                 uom: inventory.uom,
                 uomValue: inventory.uomValue,
                 releaseQty: orderInv.releaseQty,
@@ -103,18 +105,25 @@ export const releaseGoodDetailResolver = {
           })
       )
 
-      const result = {
+      let result = {
         ...releaseGood,
         attachment: foundAttachments,
-        shippingOrderInfo: {
-          containerNo: shippingOrder?.containerNo || '',
-          containerLeavingDate: shippingOrder?.containerLeavingDate || '',
-          containerArrivalDate: shippingOrder?.containerArrivalDate || '',
-          shipName: shippingOrder?.shipName || ''
-        },
+        shippingOrderInfo: {},
         inventoryInfos: orderBy(invInfos, ['product.sku'], ['asc'])
       }
 
+      if (shippingOrder) {
+        result = {
+          ...result,
+          shippingOrderInfo: {
+            id: shippingOrder?.id ,
+            containerNo: shippingOrder?.containerNo,
+            containerLeavingDate: shippingOrder?.containerLeavingDate,
+            containerArrivalDate: shippingOrder?.containerArrivalDate,
+            shipName: shippingOrder?.shipName
+          }
+        }
+      }
       dropOITempTable(domain, tx)
 
       return result

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

@@ -1,14 +1,17 @@
+import { getRepository, In } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
+import { ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
-import { getRepository, In } from 'typeorm'
-import { ReleaseGood } from '../../../entities'
+
+import { OrderInventory, ReleaseGood } from '../../../entities'
 
 export const releaseGoodResolver = {
   async releaseGood(_: any, { name }, context: any) {
     const { domain, user }: { domain: Domain; user: User } = context.state
 
-    return await getRepository(ReleaseGood).findOne({
+    let releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
       where: {
         domain,
         name,
@@ -23,11 +26,32 @@ export const releaseGoodResolver = {
         'orderInventories.product',
         'orderInventories.inventory',
         'orderInventories.inventory.product',
+        'orderInventories.inventory.location',
         'orderVass',
         'orderVass.vas',
         'creator',
         'updater'
       ]
     })
+
+    releaseGood.orderInventories = await Promise.all(
+      releaseGood.orderInventories.map(async (orderInventory: OrderInventory) => {
+        const productDetails: ProductDetail[] = await getRepository(ProductDetail).find({
+          where: {
+            product: orderInventory.product.id,
+            packingType: orderInventory.packingType,
+            packingSize: orderInventory.packingSize
+          }
+        })
+
+        orderInventory.product['productDetails'] = productDetails
+
+        if (orderInventory.inventory) orderInventory.inventory.product['productDetails'] = productDetails
+
+        return orderInventory
+      })
+    )
+
+    return releaseGood
   }
 }

package/server/graphql/resolvers/release-good/update-release-good-details.ts

@@ -0,0 +1,61 @@
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { getMyBizplace } from '@things-factory/biz-base'
+import { Domain } from '@things-factory/shell'
+
+import { ORDER_STATUS } from '../../../constants'
+import { ReleaseGood, ShippingOrder } from '../../../entities'
+import { OrderNoGenerator } from '../../../utils/order-no-generator'
+
+export const updateReleaseGoodDetailsResolver = {
+  async updateReleaseGoodDetails(_: any, { releaseGood, shippingOrder }, context: any) {
+    const { tx }: { tx: EntityManager } = context.state
+
+    try {
+      return updateReleaseGoodFunction(releaseGood, shippingOrder, context, tx)
+    } catch (error) {
+      throw error
+    }
+  }
+}
+
+export async function updateReleaseGoodFunction(
+  releaseGood: ReleaseGood,
+  shippingOrder: ShippingOrder,
+  context: any,
+  tx?: EntityManager
+) {
+  const { domain, user }: { domain: Domain; user: User } = context.state
+  let foundReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+    where: { id: releaseGood.id, name: releaseGood.name, domain },
+    relations: ['shippingOrder']
+  })
+
+  if (!foundReleaseGood) {
+    throw new Error(`Release Order ${releaseGood.name} is not found.`)
+  }
+
+  // case to update existing shippingOrder
+  if (foundReleaseGood.shippingOrder && shippingOrder) {
+    await tx.getRepository(ShippingOrder).update(foundReleaseGood.shippingOrder.id, shippingOrder)
+  }
+  // case for new shippingOrder
+  else if (!foundReleaseGood.shippingOrder && shippingOrder) {
+    let newShippingOrder: ShippingOrder = await tx.getRepository(ShippingOrder).save({
+      ...shippingOrder,
+      name: OrderNoGenerator.shippingOrder(),
+      domain,
+      bizplace: await getMyBizplace(domain, user),
+      status: ORDER_STATUS.PENDING,
+      creator: user,
+      updater: user
+    })
+
+    releaseGood.shippingOrder = newShippingOrder
+  }
+
+  await tx.getRepository(ReleaseGood).update(foundReleaseGood.id, releaseGood)
+  // return updated Release Good
+  return await tx.getRepository(ReleaseGood).findOne(foundReleaseGood.id)
+}

package/server/graphql/types/release-good/index.ts

@@ -36,6 +36,11 @@ export const Mutation = /* GraphQL */ `
     patch: ReleaseGoodPatch!
   ): ReleaseGood @privilege(category: "order_warehouse", privilege: "mutation") @transaction
 
+  updateReleaseGoodDetails (
+    releaseGood: ReleaseGoodPatch!,
+    shippingOrder: ShippingOrderPatch
+  ): ReleaseGood @privilege(category: "order", privilege: "mutation") @transaction
+
   addReleaseGood (
     releaseGood: NewReleaseGood
     shippingOrder: ShippingOrderPatch

package/server/graphql/types/release-good/inventory-infos.ts

@@ -13,6 +13,7 @@ export const InventoryInfos = gql`
     packingType: String
     packingSize: Float
     qty: Int
+    lockedQty: Int
     weight: Float
     releaseQty: Float
     releaseWeight: Float
@@ -21,6 +22,7 @@ export const InventoryInfos = gql`
     status: String
     releaseUomValue: Float
     uomValue: Float
+    lockedUomValue: Float
     uom: String
     returnQty: Float
     returnUomValue: Float

package/server/graphql/types/release-good/release-good-patch.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag'
 
 export const ReleaseGoodPatch = gql`
   input ReleaseGoodPatch {
+    id: String
     name: String
     releaseDate: String
     releaseDateTime: String

package/server/graphql/types/release-good/shipping-order-info.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag'
 
 export const ShippingOrderInfo = gql`
   type ShippingOrderInfo {
+    id: String
     containerNo: String
     containerLeavingDate: String
     containerArrivalDate: String

package/server/graphql/types/shipping-order/shipping-order-patch.ts

@@ -2,6 +2,7 @@ import gql from 'graphql-tag'
 
 export const ShippingOrderPatch = gql`
   input ShippingOrderPatch {
+    id: String
     name: String
     description: String
     shipName: String

package/server/utils/inventory-util.ts

@@ -81,6 +81,7 @@ export const InventoryUtil = {
               AND oi.product_id NOTNULL
               AND oi.packing_type NOTNULL
               AND oi.packing_size NOTNULL
+              AND oi.inventory_id IS NULL
             GROUP BY
               oi.batch_id,
               oi.batch_id_ref,
@@ -199,7 +200,7 @@ export const InventoryUtil = {
 
     let resultQb = await trxMgr.query(
       `
-      select joi.product_id as "productId", joi.batch_id as "batchId", joi.packing_type as "packingType", joi.release_qty as "releaseQty",
+      select joi.product_id as "productId", joi.batch_id as "batchId", joi.packing_type as "packingType", joi.uom as "uom", joi.release_qty as "releaseQty",
       sum(i.qty - coalesce(i.locked_qty,0)) - coalesce(
       (
         select sum(oi.release_qty) from order_inventories oi 
@@ -208,7 +209,7 @@ export const InventoryUtil = {
         and oi.product_id = joi.product_id
         and oi.batch_id = joi.batch_id
         and oi.packing_type = joi.packing_type
-        and oi.uom = i.uom
+        and oi.uom = joi.uom
         and oi.domain_id = $1
         and oi.bizplace_id = $2
       ),0) as "availableQty",
@@ -220,10 +221,10 @@ export const InventoryUtil = {
         and oi.product_id = joi.product_id
         and oi.batch_id = joi.batch_id
         and oi.packing_type = joi.packing_type
-        and oi.uom = i.uom
+        and oi.uom = joi.uom
         and oi.domain_id = $1
         and oi.bizplace_id = $2
-      ),0) as "availableUomValue", i.uom
+      ),0) as "availableUomValue"
       from json_populate_recordset(NULL::order_inventories,'${json_oi}') joi
       left join inventories i on joi.product_id = i.product_id 
       and joi.batch_id = i.batch_id
@@ -231,7 +232,7 @@ export const InventoryUtil = {
       and joi.uom = i.uom
       and i.domain_id = $1
       and i.bizplace_id = $2
-      group by joi.product_id, joi.batch_id, joi.packing_type, joi.release_qty, i.uom
+      group by joi.product_id, joi.batch_id, joi.packing_type, joi.release_qty, joi.uom
     `,
       [warehouseDomain.id, partnerBizplace.id]
     )
@@ -331,6 +332,10 @@ async function getConditions(
             whereClause += `AND LOWER("batchId") LIKE '${value.toLowerCase()}'`
             break
 
+          case 'batchIdRef':
+            whereClause += `AND LOWER("batchIdRef") LIKE '${value.toLowerCase()}'`
+            break
+
           case 'productName':
             const products: Product[] = await trxMgr.getRepository(Product).find({
               select: ['id'],
@@ -415,19 +420,19 @@ async function getConditions(
           case 'batch_product':
             productWhereClause += `
               AND (i.batch_id, p.id, i.packing_type) ${operator === 'in' ? 'IN' : 'NOT IN'} (${value
-              .map(
-                (v: { batchId: string; productId: string; packingType: string }) =>
-                  `('${v.batchId}', '${v.productId}', '${v.packingType}')`
-              )
-              .join()})
+                .map(
+                  (v: { batchId: string; productId: string; packingType: string }) =>
+                    `('${v.batchId}', '${v.productId}', '${v.packingType}')`
+                )
+                .join()})
             `
             break
 
           case 'batch_bundle':
             bundleWhereClause += `
               ${bundleWhereClause == '' ? 'WHERE' : 'AND'} pb.id ${operator === 'in' ? 'IN' : 'NOT IN'} (${value
-              .map((v: { productId: string }) => `('${v.productId}')`)
-              .join()})
+                .map((v: { productId: string }) => `('${v.productId}')`)
+                .join()})
             `
             break
         }