npm - @things-factory/worksheet-base - Versions diffs - 4.3.39 → 4.3.42 - Mend

@things-factory/worksheet-base 4.3.39 → 4.3.42

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (25) hide show

package/dist-server/graphql/resolvers/worksheet/fetch-delivery-order-ro.js ADDED Viewed

@@ -0,0 +1,169 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchDeliveryOrderROResolver = void 0;
+const typeorm_1 = require("typeorm");
+const biz_base_1 = require("@things-factory/biz-base");
+const sales_base_1 = require("@things-factory/sales-base");
+const shell_1 = require("@things-factory/shell");
+const constants_1 = require("../../../constants");
+const entities_1 = require("../../../entities");
+const utils_1 = require("../../../utils");
+exports.fetchDeliveryOrderROResolver = {
+    async fetchDeliveryOrderRO(_, { name }, context) {
+        const domain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({
+            where: { id: context.state.domain.id }
+        });
+        const foundDO = await (0, typeorm_1.getRepository)(sales_base_1.DeliveryOrder).findOne({
+            where: { domain, name },
+            relations: [
+                'domain',
+                'bizplace',
+                'bizplace.company',
+                'bizplace.domain',
+                'transportDriver',
+                'transportVehicle',
+                'releaseGood',
+                'creator',
+                'updater'
+            ]
+        });
+        const ownTransportFlag = foundDO.ownCollection;
+        let foundCP = null;
+        if (foundDO === null || foundDO === void 0 ? void 0 : foundDO.contactPointRefId) {
+            foundCP = await (0, typeorm_1.getRepository)(biz_base_1.ContactPoint).findOne({
+                where: { domain, id: foundDO.contactPointRefId }
+            });
+        }
+        const foundRO = foundDO.releaseGood;
+        const partnerBiz = foundDO.bizplace; //customer bizplace
+        const ownRefNo = foundRO.refNo;
+        //find list of loaded inventory
+        const targetInventories = await (0, typeorm_1.getRepository)(sales_base_1.OrderInventory).find({
+            where: { domain, deliveryOrder: foundDO },
+            relations: ['inventory']
+        });
+        const orderInvIds = targetInventories.map((oi) => oi.id);
+        const foundWSD = await (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).find({
+            where: {
+                domain,
+                targetInventory: (0, typeorm_1.In)(orderInvIds),
+                type: constants_1.WORKSHEET_TYPE.LOADING,
+                status: (0, typeorm_1.Equal)(constants_1.WORKSHEET_STATUS.DONE)
+            },
+            relations: [
+                'targetInventory',
+                'targetInventory.inventory',
+                'targetInventory.inventory.location',
+                'targetInventory.inventory.product',
+                'targetInventory.inventory.product.productDetails',
+                'targetInventory.inventory.reusablePallet',
+                'updater'
+            ]
+        });
+        let foundDriver = null;
+        if (foundDO.status !== sales_base_1.ORDER_STATUS.READY_TO_DISPATCH) {
+            if ((foundDO === null || foundDO === void 0 ? void 0 : foundDO.ownCollection) && (foundDO === null || foundDO === void 0 ? void 0 : foundDO.otherDriver)) {
+                foundDriver = foundDO.otherDriver;
+            }
+            else {
+                foundDriver = foundDO.transportDriver.name;
+            }
+        }
+        let productList = [];
+        productList = foundWSD
+            .map((wsd) => {
+            var _a, _b;
+            const targetInventory = wsd.targetInventory;
+            const inventory = targetInventory.inventory;
+            const productDetails = inventory.product.productDetails;
+            const matchedProductDetail = productDetails.find(productDetail => productDetail.packingType === inventory.packingType);
+            return {
+                product_name: `${inventory.product.name} (${inventory.product.description})`,
+                product_desc: `${((_a = inventory.product) === null || _a === void 0 ? void 0 : _a.description) || ''}`,
+                product_nameOnly: `${inventory.product.name}`,
+                product_sku: `${inventory.product.sku}`,
+                product_type: inventory.packingType,
+                product_size: matchedProductDetail ? matchedProductDetail.packingSize : inventory.packingSize,
+                product_batch: inventory.batchId,
+                product_batch_ref: inventory.batchIdRef,
+                product_qty: targetInventory.releaseQty,
+                product_weight: targetInventory.releaseWeight,
+                product_gross_weight: inventory.product.grossWeight,
+                product_uom_value: targetInventory.releaseUomValue,
+                product_uom: inventory.uom,
+                remark: targetInventory.remark,
+                inventory_remark: inventory.remark,
+                cross_docking: targetInventory.crossDocking,
+                pallet: (inventory === null || inventory === void 0 ? void 0 : inventory.reusablePallet) && ((_b = inventory === null || inventory === void 0 ? void 0 : inventory.reusablePallet) === null || _b === void 0 ? void 0 : _b.name) ? inventory.reusablePallet.name : ''
+            };
+        })
+            .reduce((newItem, item) => {
+            var foundItem = newItem.find(newItem => newItem.product_name === item.product_name &&
+                newItem.product_batch === item.product_batch &&
+                newItem.product_batch_ref === item.product_batch_ref &&
+                newItem.cross_docking === item.cross_docking &&
+                newItem.pallet === item.pallet);
+            if (!foundItem) {
+                foundItem = {
+                    product_sku: item.product_sku,
+                    product_name: item.product_name,
+                    product_type: item.product_type,
+                    product_size: item.product_size,
+                    product_batch: item.product_batch,
+                    product_batch_ref: item.product_batch_ref,
+                    product_qty: item.product_qty,
+                    product_weight: item.product_weight,
+                    product_gross_weight: item.product_gross_weight,
+                    product_uom_value: item.product_uom_value,
+                    product_uom: item.product_uom,
+                    product_desc: item.product_desc,
+                    product_nameOnly: item.product_nameOnly,
+                    remark: item.remark,
+                    inventory_remark: item.inventory_remark,
+                    palletQty: 1,
+                    cross_docking: item.cross_docking,
+                    pallet: item.pallet
+                };
+                newItem.push(foundItem);
+                return newItem;
+            }
+            else {
+                return newItem.map(ni => {
+                    if (ni.product_name === item.product_name &&
+                        ni.product_batch === item.product_batch &&
+                        ni.product_batch_ref === item.product_batch_ref &&
+                        ni.cross_docking === item.cross_docking &&
+                        ni.pallet === item.pallet) {
+                        return Object.assign(Object.assign({}, ni), { palletQty: ni.palletQty + 1, product_qty: ni.product_qty + item.product_qty, product_weight: ni.product_weight + item.product_weight, product_uom_value: ni.product_uom_value + item.product_uom_value });
+                    }
+                    else {
+                        return ni;
+                    }
+                });
+            }
+        }, []);
+        const data = {
+            roNo: foundRO.name,
+            doNo: foundDO.name,
+            roRef: foundRO.refNo,
+            roRef2: foundRO.refNo2,
+            roRef3: foundRO.refNo3,
+            companyDomain: foundDO.bizplace.name,
+            recipientBiz: foundRO.attentionTo || '',
+            doDate: utils_1.DateTimeConverter.date(foundDO.createdAt),
+            productList: productList.map((prod, idx) => {
+                return {
+                    batchNo: prod.product_batch,
+                    sku: prod.product_sku,
+                    name: prod.product_name,
+                    type: prod.product_type,
+                    loadedQty: prod.product_qty,
+                    uom: prod.product_uom,
+                    uomValue: `${Math.round(prod.product_uom_value * 100) / 100}`
+                };
+            })
+        };
+        return data;
+    }
+};
+//# sourceMappingURL=fetch-delivery-order-ro.js.map

package/dist-server/graphql/resolvers/worksheet/fetch-delivery-order-ro.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"fetch-delivery-order-ro.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/fetch-delivery-order-ro.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/index.js CHANGED Viewed

@@ -11,6 +11,7 @@ const cycle_count_adjustment_1 = require("./cycle-count-adjustment");
 const cycle_count_worksheet_1 = require("./cycle-count-worksheet");
 const delete_worksheet_1 = require("./delete-worksheet");
 const delivery_order_by_worksheet_1 = require("./delivery-order-by-worksheet");
+const fetch_delivery_order_ro_1 = require("./fetch-delivery-order-ro");
 const fetch_sellercraft_airway_bill_1 = require("./fetch-sellercraft-airway-bill");
 const find_release_orders_by_task_no_1 = require("./find-release-orders-by-task-no");
 const generate_worksheet_1 = require("./generate-worksheet");
@@ -59,6 +60,6 @@ const worksheet_1 = require("./worksheet");
 const worksheet_by_order_no_1 = require("./worksheet-by-order-no");
 const worksheet_with_pagination_1 = require("./worksheet-with-pagination");
 const worksheets_1 = require("./worksheets");
-exports.Query = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, worksheets_1.worksheetsResolver), worksheet_1.worksheetResolver), unloading_worksheet_1.unloadingWorksheetResolver), unloading_return_worksheet_1.unloadingReturnWorksheetResolver), delivery_order_by_worksheet_1.deliveryOrderByWorksheetResolver), packing_worksheet_1.packingWorksheetResolver), putaway_worksheet_1.putawayWorksheetResolver), putaway_returning_worksheet_1.putawayReturningWorksheetResolver), return_worksheet_1.returnWorksheetResolver), picking_worksheet_1.pickingWorksheetResolver), cycle_count_worksheet_1.cycleCountWorksheetResolver), vas_worksheet_1.vasWorksheetResolver), loading_worksheet_1.loadingWorksheetResolver), unloaded_inventories_1.unloadedInventories), unloaded_inventories_by_reusable_pallet_1.unloadedInventoriesByReusablePallet), loaded_inventories_1.loadedInventories), vas_candidates_1.vasCandidatesResolver), inventories_by_pallet_1.inventoriesByPalletResolver), batch_picking_worksheet_1.batchPickingWorksheetResolver), check_stock_take_current_location_1.checkStockTakeCurrentLocationResolver), check_inventory_release_1.checkInventoryReleaseResolver), vas_transactions_1.checkRelabelableResolver), having_vas_1.havingVasResolver), worksheet_by_order_no_1.worksheetByOrderNoResolver), worksheet_with_pagination_1.worksheetWithPaginationResolver), not_tally_target_inventories_1.notTallyTargetInventoriesResolver), vas_inventories_1.vasInventories), picking_assignment_status_by_user_1.pickingAssignmentStatusByUsersResolver), my_picking_assignment_status_1.myPickingAssignmentStatusResolver), recommend_putway_location_1.recommendPutawayLocationResolver), sorting_worksheet_1.sortingWorksheetResolver), find_release_orders_by_task_no_1.findReleaseOrdersByTaskNoResolver);
+exports.Query = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, worksheets_1.worksheetsResolver), worksheet_1.worksheetResolver), unloading_worksheet_1.unloadingWorksheetResolver), unloading_return_worksheet_1.unloadingReturnWorksheetResolver), delivery_order_by_worksheet_1.deliveryOrderByWorksheetResolver), packing_worksheet_1.packingWorksheetResolver), putaway_worksheet_1.putawayWorksheetResolver), putaway_returning_worksheet_1.putawayReturningWorksheetResolver), return_worksheet_1.returnWorksheetResolver), picking_worksheet_1.pickingWorksheetResolver), cycle_count_worksheet_1.cycleCountWorksheetResolver), vas_worksheet_1.vasWorksheetResolver), loading_worksheet_1.loadingWorksheetResolver), unloaded_inventories_1.unloadedInventories), unloaded_inventories_by_reusable_pallet_1.unloadedInventoriesByReusablePallet), loaded_inventories_1.loadedInventories), vas_candidates_1.vasCandidatesResolver), inventories_by_pallet_1.inventoriesByPalletResolver), batch_picking_worksheet_1.batchPickingWorksheetResolver), check_stock_take_current_location_1.checkStockTakeCurrentLocationResolver), check_inventory_release_1.checkInventoryReleaseResolver), vas_transactions_1.checkRelabelableResolver), having_vas_1.havingVasResolver), worksheet_by_order_no_1.worksheetByOrderNoResolver), worksheet_with_pagination_1.worksheetWithPaginationResolver), not_tally_target_inventories_1.notTallyTargetInventoriesResolver), vas_inventories_1.vasInventories), picking_assignment_status_by_user_1.pickingAssignmentStatusByUsersResolver), my_picking_assignment_status_1.myPickingAssignmentStatusResolver), recommend_putway_location_1.recommendPutawayLocationResolver), sorting_worksheet_1.sortingWorksheetResolver), find_release_orders_by_task_no_1.findReleaseOrdersByTaskNoResolver), fetch_delivery_order_ro_1.fetchDeliveryOrderROResolver);
 exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, generate_worksheet_1.Mutations), unloading_1.Mutations), sorting_1.Mutations), putaway_1.Mutations), putaway_return_1.Mutations), vas_1.Mutations), picking_1.Mutations), packing_1.Mutations), loading_1.Mutations), returning_1.Mutations), unloading_return_1.Mutations), inspecting_1.Mutations), update_worksheet_1.updateWorksheet), create_worksheet_1.createWorksheet), cycle_count_adjustment_1.cycleCountAdjustmentResolver), delete_worksheet_1.deleteWorksheet), transfer_1.transfer), proceed_extra_products_1.proceedExtraProductsResolver), replace_picking_pallets_1.replacePickingPalletsResolver), pending_cancellation_release_order_1.pendingCancellationReleaseOrder), confirm_cancellation_release_order_1.confirmCancellationReleaseOrder), reject_cancellation_release_order_1.rejectCancellationReleaseOrder), vas_transactions_1.repalletizingResolver), vas_transactions_1.undoRepalletizingResolver), vas_transactions_1.repackagingResolver), vas_transactions_1.undoRepackagingResolver), vas_transactions_1.relabelingResolver), vas_transactions_1.undoRelabelingResolver), cross_dock_picking_1.crossDockPickingResolver), vas_transactions_1.unpackingResolver), palletizing_pallets_1.palletizingPallets), fetch_sellercraft_airway_bill_1.fetchSellercraftAirwayBillResolver), cancel_draft_release_order_1.cancelDraftReleaseOrder);
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/worksheet/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,uEAAyE;AACzE,uEAAyE;AACzE,2FAA2F;AAC3F,6FAAsF;AACtF,yDAAoD;AACpD,6DAA+D;AAC/D,qEAAuE;AACvE,mEAAqE;AACrE,yDAAoD;AACpD,+EAAgF;AAChF,mFAAoF;AACpF,qFAAoF;AACpF,6DAA8E;AAC9E,6CAAgD;AAChD,6CAA4D;AAC5D,mEAAqE;AACrE,6DAAwD;AACxD,uCAAyD;AACzD,2DAA8D;AAC9D,iFAAkF;AAClF,uCAAyD;AACzD,2DAA8D;AAC9D,+DAA0D;AAC1D,6FAAsF;AACtF,6EAAsE;AACtE,uCAAyD;AACzD,2DAA8D;AAC9D,yFAA0F;AAC1F,mGAAoG;AACpG,qEAAuE;AACvE,uCAAyD;AACzD,qDAAsE;AACtE,+EAAiF;AACjF,2DAA8D;AAC9D,2EAA8E;AAC9E,2FAAoF;AACpF,uEAAyE;AACzE,yDAA4D;AAC5D,2CAA6D;AAC7D,uCAAyD;AACzD,2DAA8D;AAC9D,yCAAqC;AACrC,iEAA4D;AAC5D,uGAA+F;AAC/F,2CAA6D;AAC7D,yDAA0E;AAC1E,6EAA+E;AAC/E,+DAAkE;AAClE,yDAAoD;AACpD,+BAAiD;AACjD,qDAAwD;AACxD,uDAAkD;AAClD,yDAS2B;AAC3B,mDAAsD;AACtD,2CAA+C;AAC/C,mEAAoE;AACpE,2EAA6E;AAC7E,6CAAiD;AAEpC,QAAA,KAAK,~~ucACb~~,+BAAkB,GAClB,6BAAiB,GACjB,gDAA0B,GAC1B,6DAAgC,GAChC,8DAAgC,GAChC,4CAAwB,GACxB,4CAAwB,GACxB,+DAAiC,GACjC,0CAAuB,GACvB,4CAAwB,GACxB,mDAA2B,GAC3B,oCAAoB,GACpB,4CAAwB,GACxB,0CAAmB,GACnB,6EAAmC,GACnC,sCAAiB,GACjB,sCAAqB,GACrB,mDAA2B,GAC3B,uDAA6B,GAC7B,yEAAqC,GACrC,uDAA6B,GAC7B,2CAAwB,GACxB,8BAAiB,GACjB,kDAA0B,GAC1B,2DAA+B,GAC/B,gEAAiC,GACjC,gCAAc,GACd,0EAAsC,GACtC,gEAAiC,GACjC,4DAAgC,GAChC,4CAAwB,GACxB,kEAAiC,~~EACrC~~;AAEY,QAAA,QAAQ,qdAChB,8BAA0B,GAC1B,qBAAkB,GAClB,mBAAgB,GAChB,mBAAgB,GAChB,0BAAsB,GACtB,eAAY,GACZ,mBAAgB,GAChB,mBAAgB,GAChB,mBAAgB,GAChB,qBAAkB,GAClB,4BAAwB,GACxB,sBAAgB,GAChB,kCAAe,GACf,kCAAe,GACf,qDAA4B,GAC5B,kCAAe,GACf,mBAAQ,GACR,qDAA4B,GAC5B,uDAA6B,GAC7B,oEAA+B,GAC/B,oEAA+B,GAC/B,kEAA8B,GAC9B,wCAAqB,GACrB,4CAAyB,GACzB,sCAAmB,GACnB,0CAAuB,GACvB,qCAAkB,GAClB,yCAAsB,GACtB,6CAAwB,GACxB,oCAAiB,GACjB,wCAAkB,GAClB,kEAAkC,GAClC,oDAAuB,EAC3B"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,uEAAyE;AACzE,uEAAyE;AACzE,2FAA2F;AAC3F,6FAAsF;AACtF,yDAAoD;AACpD,6DAA+D;AAC/D,qEAAuE;AACvE,mEAAqE;AACrE,yDAAoD;AACpD,+EAAgF;AAChF,uEAAwE;AACxE,mFAAoF;AACpF,qFAAoF;AACpF,6DAA8E;AAC9E,6CAAgD;AAChD,6CAA4D;AAC5D,mEAAqE;AACrE,6DAAwD;AACxD,uCAAyD;AACzD,2DAA8D;AAC9D,iFAAkF;AAClF,uCAAyD;AACzD,2DAA8D;AAC9D,+DAA0D;AAC1D,6FAAsF;AACtF,6EAAsE;AACtE,uCAAyD;AACzD,2DAA8D;AAC9D,yFAA0F;AAC1F,mGAAoG;AACpG,qEAAuE;AACvE,uCAAyD;AACzD,qDAAsE;AACtE,+EAAiF;AACjF,2DAA8D;AAC9D,2EAA8E;AAC9E,2FAAoF;AACpF,uEAAyE;AACzE,yDAA4D;AAC5D,2CAA6D;AAC7D,uCAAyD;AACzD,2DAA8D;AAC9D,yCAAqC;AACrC,iEAA4D;AAC5D,uGAA+F;AAC/F,2CAA6D;AAC7D,yDAA0E;AAC1E,6EAA+E;AAC/E,+DAAkE;AAClE,yDAAoD;AACpD,+BAAiD;AACjD,qDAAwD;AACxD,uDAAkD;AAClD,yDAS2B;AAC3B,mDAAsD;AACtD,2CAA+C;AAC/C,mEAAoE;AACpE,2EAA6E;AAC7E,6CAAiD;AAEpC,QAAA,KAAK,qdACb,+BAAkB,GAClB,6BAAiB,GACjB,gDAA0B,GAC1B,6DAAgC,GAChC,8DAAgC,GAChC,4CAAwB,GACxB,4CAAwB,GACxB,+DAAiC,GACjC,0CAAuB,GACvB,4CAAwB,GACxB,mDAA2B,GAC3B,oCAAoB,GACpB,4CAAwB,GACxB,0CAAmB,GACnB,6EAAmC,GACnC,sCAAiB,GACjB,sCAAqB,GACrB,mDAA2B,GAC3B,uDAA6B,GAC7B,yEAAqC,GACrC,uDAA6B,GAC7B,2CAAwB,GACxB,8BAAiB,GACjB,kDAA0B,GAC1B,2DAA+B,GAC/B,gEAAiC,GACjC,gCAAc,GACd,0EAAsC,GACtC,gEAAiC,GACjC,4DAAgC,GAChC,4CAAwB,GACxB,kEAAiC,GACjC,sDAA4B,EAChC;AAEY,QAAA,QAAQ,qdAChB,8BAA0B,GAC1B,qBAAkB,GAClB,mBAAgB,GAChB,mBAAgB,GAChB,0BAAsB,GACtB,eAAY,GACZ,mBAAgB,GAChB,mBAAgB,GAChB,mBAAgB,GAChB,qBAAkB,GAClB,4BAAwB,GACxB,sBAAgB,GAChB,kCAAe,GACf,kCAAe,GACf,qDAA4B,GAC5B,kCAAe,GACf,mBAAQ,GACR,qDAA4B,GAC5B,uDAA6B,GAC7B,oEAA+B,GAC/B,oEAA+B,GAC/B,kEAA8B,GAC9B,wCAAqB,GACrB,4CAAyB,GACzB,sCAAmB,GACnB,0CAAuB,GACvB,qCAAkB,GAClB,yCAAsB,GACtB,6CAAwB,GACxB,oCAAiB,GACjB,wCAAkB,GAClB,kEAAkC,GAClC,oDAAuB,EAC3B"}

package/dist-server/graphql/types/worksheet/delivery-order-ro.js ADDED Viewed

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeliveryOrderRO = void 0;
+const apollo_server_koa_1 = require("apollo-server-koa");
+exports.DeliveryOrderRO = (0, apollo_server_koa_1.gql) `
+  type DeliveryOrderRO {
+    roNo: String
+    doNo: String
+    roRef: String
+    roRef2: String
+    roRef3: String
+    companyDomain: String
+    recipientBiz: String
+    doDate: String
+    productList:[Product]
+  }
+`;
+//# sourceMappingURL=delivery-order-ro.js.map

package/dist-server/graphql/types/worksheet/delivery-order-ro.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"delivery-order-ro.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/delivery-order-ro.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,eAAe,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;CAYjC,CAAA"}

package/dist-server/graphql/types/worksheet/index.js CHANGED Viewed

@@ -26,6 +26,7 @@ const worksheet_info_1 = require("./worksheet-info");
 const worksheet_list_1 = require("./worksheet-list");
 const worksheet_patch_1 = require("./worksheet-patch");
 const worksheet_with_pagination_1 = require("./worksheet-with-pagination");
+const delivery_order_ro_1 = require("./delivery-order-ro");
 exports.Mutation = `
   createWorksheet (
     worksheet: NewWorksheet!
@@ -628,6 +629,10 @@ exports.Query = `
     name: String!
   ): GoodsDeliveryNote @privilege(category: "worksheet", privilege: "query")
+  fetchDeliveryOrderRO (
+    name: String!
+  ): DeliveryOrderRO @privilege(category: "worksheet", privilege: "query")
   batchPickingWorksheet (
     taskNo: String!, locationSortingRules: [Sorting]
   ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
@@ -732,6 +737,7 @@ exports.Types = [
     worksheet_with_pagination_1.WorksheetWithPagination,
     picking_assignment_status_1.PickingAssignmentStatus,
     my_picking_assignment_status_1.MyPickingAssignmentStatus,
-    find_release_orders_by_task_no_1.FindReleaseOrdersByTaskNo
+    find_release_orders_by_task_no_1.FindReleaseOrdersByTaskNo,
+    delivery_order_ro_1.DeliveryOrderRO
 ];
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/types/worksheet/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;~~AAExD~~,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6hBrC,CAAA;AAEY,QAAA,KAAK,GAAiB~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0IlC~~,CAAA;AAEY,QAAA,KAAK,~~GAAiB~~;~~IACjC~~,qBAAS;IACT,uBAAU;IACV,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;~~CAC1B~~,CAAA"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AACrE,2DAAqD;AAGxC,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6hBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8IlC,CAAA;AAEY,QAAA,KAAK,GAAgB;IAChC,qBAAS;IACT,uBAAU;IACV,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;CAChB,CAAA"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.39",
+  "version": "4.3.42",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,21 +24,21 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^4.3.38",
-    "@things-factory/biz-base": "^4.3.38",
+    "@things-factory/auth-base": "^4.3.40",
+    "@things-factory/biz-base": "^4.3.40",
     "@things-factory/document-template-base": "^4.3.35",
-    "@things-factory/id-rule-base": "^4.3.38",
-    "@things-factory/integration-lmd": "^4.3.38",
-    "@things-factory/integration-marketplace": "^4.3.39",
-    "@things-factory/integration-sellercraft": "^4.3.39",
-    "@things-factory/integration-sftp": "^4.3.38",
-    "@things-factory/marketplace-base": "^4.3.39",
-    "@things-factory/notification": "^4.3.38",
-    "@things-factory/sales-base": "^4.3.39",
-    "@things-factory/setting-base": "^4.3.38",
+    "@things-factory/id-rule-base": "^4.3.40",
+    "@things-factory/integration-lmd": "^4.3.40",
+    "@things-factory/integration-marketplace": "^4.3.41",
+    "@things-factory/integration-sellercraft": "^4.3.42",
+    "@things-factory/integration-sftp": "^4.3.40",
+    "@things-factory/marketplace-base": "^4.3.41",
+    "@things-factory/notification": "^4.3.40",
+    "@things-factory/sales-base": "^4.3.42",
+    "@things-factory/setting-base": "^4.3.40",
     "@things-factory/shell": "^4.3.35",
-    "@things-factory/transport-base": "^4.3.38",
-    "@things-factory/warehouse-base": "^4.3.39"
+    "@things-factory/transport-base": "^4.3.40",
+    "@things-factory/warehouse-base": "^4.3.42"
   },
-  "gitHead": "fb8d1e9252adad381337fe604a8eaccaaee62b77"
+  "gitHead": "d2e3d30572c0f968208cd4d8e9b0648986d754c3"
 }

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

@@ -161,13 +161,13 @@ export class SellercraftController extends WorksheetController {
       .andWhere('"inv"."domain_id" = :domainId')
       .andWhere('"inv"."bizplace_id" = :bizplaceId')
       .andWhere('"inv"."product_id" = :productId')
-      .andWhere('"inv"."status" != :status')
+      .andWhere('"inv"."status" = :status')
       .andWhere('"loc"."type" NOT IN (:...locationTypes)')
       .setParameters({
         domainId: this.domain.id,
         bizplaceId: bizplace.id,
         productId: product.id,
-        status: INVENTORY_STATUS.TERMINATED,
+        status: INVENTORY_STATUS.STORED,
         locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
       })

package/server/controllers/outbound/picking-worksheet-controller.ts CHANGED Viewed

@@ -1152,25 +1152,15 @@ export class PickingWorksheetController extends VasWorksheetController {
   private async checkAndSetBinPicking(orderInventory, binLocation) {
     // bin picking validation
-    const binPickingSetting: Setting = await this.trxMgr.getRepository(Setting).findOne({
-      where: {
-        domain: this.domain,
-        name: 'enable-bin-picking'
-      }
-    })
-    if (binPickingSetting != undefined && binPickingSetting.value.toLowerCase() == 'true') {
-      if (binLocation) {
-        const foundBinLocation: Location = await this.trxMgr.getRepository(Location).findOne({
-          where: { domain: this.domain, name: binLocation, type: LOCATION_TYPE.BIN }
-        })
-        if (!foundBinLocation)
-          throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `invalid bin location id`))
+    if (binLocation) {
+      const foundBinLocation: Location = await this.trxMgr.getRepository(Location).findOne({
+        where: { domain: this.domain, name: binLocation, type: LOCATION_TYPE.BIN }
+      })
-        orderInventory.binLocation = foundBinLocation
-      } else {
+      if (!foundBinLocation)
         throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `invalid bin location id`))
-      }
+      orderInventory.binLocation = foundBinLocation
     }
     return orderInventory

package/server/controllers/render-orientage-do.ts CHANGED Viewed

@@ -150,20 +150,20 @@ export async function renderOrientageDO({ doNo }, context: any) {
         pack_size: matchedProductDetail
           ? matchedProductDetail.uomValue
             ? matchedProductDetail.uomValue +
-            ' ' +
-            matchedProductDetail.uom +
-            (inventory.product.volumeSize
-              ? ' x ' + (parseFloat(inventory.product.volumeSize) / 100).toFixed(2) + ' L'
-              : '')
+              ' ' +
+              matchedProductDetail.uom +
+              (inventory.product.volumeSize
+                ? ' x ' + (parseFloat(inventory.product.volumeSize) / 100).toFixed(2) + ' L'
+                : '')
             : null
           : inventory.product.primaryValue
-            ? inventory.product.primaryValue +
+          ? inventory.product.primaryValue +
             ' ' +
             inventory.product.primaryUnit +
             (inventory.product.volumeSize
               ? ' x ' + (parseFloat(inventory.product.volumeSize) / 100).toFixed(2) + ' L'
               : '')
-            : null,
+          : null,
         aux_value_3: matchedProductDetail ? matchedProductDetail.auxValue3 : inventory.product.auxValue3,
         product_qty: targetInventory.inventory.warehouse !== 'DAMAGE ZONE' ? targetInventory.releaseQty : 0,
         product_qty_damage: targetInventory.inventory.warehouse === 'DAMAGE ZONE' ? targetInventory.releaseQty : 0,
@@ -176,15 +176,15 @@ export async function renderOrientageDO({ doNo }, context: any) {
             ? matchedProductDetail.volume
             : 0
           : inventory?.product?.volume
-            ? inventory.product.volume
-            : 0,
+          ? inventory.product.volume
+          : 0,
         total_volume: matchedProductDetail
           ? matchedProductDetail.volume
             ? Number((matchedProductDetail.volume * targetInventory.releaseQty).toFixed(4))
             : 0
           : inventory?.product?.volume
-            ? Number((inventory.product.volume * targetInventory.releaseQty).toFixed(4))
-            : 0,
+          ? Number((inventory.product.volume * targetInventory.releaseQty).toFixed(4))
+          : 0,
         remark: targetInventory.remark,
         inventory_remark: inventory.remark,
         cross_docking: targetInventory.crossDocking,
@@ -274,13 +274,28 @@ export async function renderOrientageDO({ doNo }, context: any) {
     company_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
     warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
     company_email: foundWarehouseCP.email,
-    customer_name: foundCP ? foundCP.name : null,
-    customer_delivery_address: foundCP ? foundCP.address : null,
-    customer_billing_address: foundCP ? foundCP.billingAddress : null,
-    customer_phone: foundCP ? foundCP.phone : null,
+    customer_name: foundCP?.name || foundRO.attentionTo || null,
+    customer_delivery_address:
+      foundCP?.address ||
+      [
+        foundRO?.deliveryAddress1,
+        foundRO?.deliveryAddress2,
+        foundRO?.deliveryAddress3,
+        foundRO?.deliveryAddress4,
+        foundRO?.deliveryAddress5,
+        foundRO?.postalCode,
+        foundRO?.city,
+        foundRO?.state,
+        foundRO?.country
+      ]
+        .filter(Boolean)
+        .join(', ') ||
+      null,
+    customer_billing_address: foundCP?.billingAddress || foundRO?.billingAddress || null,
+    customer_phone: foundCP?.phone || foundRO.phone1 || null,
     customer_fax: foundCP ? foundCP.fax : null,
-    customer_email: foundCP ? foundCP.email : null,
-    customer_company: foundCP ? foundCP.companyName : null,
+    customer_email: foundCP?.email || foundRO.email || null,
+    customer_company: foundCP?.companyName || foundRO.attentionCompany || null,
     own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
     destination: foundDO.to || '',
     ref_no: ownRefNo,

package/server/controllers/render-ro-do.ts CHANGED Viewed

@@ -301,9 +301,9 @@ export async function renderRODO({ doNo }, context: any) {
     warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
     warehouse_fax: foundWarehouseCP ? foundWarehouseCP.fax : null,
     warehouse_email: foundWarehouseCP ? foundWarehouseCP.email : null,
-    customer_name: foundCP ? foundCP.name : null,
-    customer_delivery_address: foundCP ? foundCP.address : null,
-    customer_billing_address: foundCP ? foundCP.billingAddress : null,
+    customer_name: foundCP?.name || foundRO?.attentionTo || foundRO?.attentionCompany || null,
+    customer_delivery_address: foundCP?.address || [foundRO?.deliveryAddress1, foundRO?.deliveryAddress2, foundRO?.deliveryAddress3, foundRO?.deliveryAddress4, foundRO?.deliveryAddress5, foundRO?.postalCode, foundRO?.city, foundRO?.state, foundRO?.country].filter(Boolean).join(", ") || null,
+    customer_billing_address: foundCP?.billingAddress || foundRO?.billingAddress || null,
     new_billing_address: foundRO?.billingAddress || null,
     new_delivery_address: foundRO?.deliveryAddress1 || null,
     new_delivery_address2: foundRO?.deliveryAddress2 || null,
@@ -322,7 +322,7 @@ export async function renderRODO({ doNo }, context: any) {
     customer_email: foundCP ? foundCP.email : null,
     customer_company: foundCP ? foundCP.companyName : null,
     own_collection: ownTransportFlag ? '[SELF-COLLECTION]' : `[${domain.brandName} TRANSPORT]`,
-    destination: foundDO.to || '',
+    destination: foundDO.to || [foundRO?.deliveryAddress1, foundRO?.deliveryAddress2, foundRO?.deliveryAddress3, foundRO?.deliveryAddress4, foundRO?.deliveryAddress5, foundRO?.postalCode, foundRO?.city, foundRO?.state, foundRO?.country].filter(Boolean).join(", ") || '',
     ro_no: foundRO.name,
     ro_created_at: foundRO.createdAt ? foundRO.createdAt : '',
     ref_no: ownRefNo ? `${foundRO.name} / ${foundRO.refNo}` : `${foundRO.name}`,
@@ -360,7 +360,7 @@ export async function renderRODO({ doNo }, context: any) {
     }),
     serialNumber: foundInventoryItem.map((item: any, idx) => {
       return { ...item, delivery_to: foundDO.to }
-    })
+    }) || ''
   } //.. make data from do
   const formData = new FormData()