@things-factory/sales-base 3.6.25 → 3.6.33
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.
- package/dist-server/graphql/resolvers/delivery-order/delivery-orders.js +3 -0
- package/dist-server/graphql/resolvers/delivery-order/delivery-orders.js.map +1 -1
- package/dist-server/graphql/resolvers/delivery-order/dispatch-delivery-order.js +5 -3
- package/dist-server/graphql/resolvers/delivery-order/dispatch-delivery-order.js.map +1 -1
- package/dist-server/graphql/resolvers/others/bulk-upload-validate-order-products.js +4 -5
- package/dist-server/graphql/resolvers/others/bulk-upload-validate-order-products.js.map +1 -1
- package/dist-server/graphql/resolvers/release-good/generate-release-good.js +13 -1
- package/dist-server/graphql/resolvers/release-good/generate-release-good.js.map +1 -1
- package/dist-server/utils/inventory-util.js +5 -3
- package/dist-server/utils/inventory-util.js.map +1 -1
- package/package.json +12 -12
- package/server/graphql/resolvers/delivery-order/delivery-orders.ts +3 -0
- package/server/graphql/resolvers/delivery-order/dispatch-delivery-order.ts +12 -5
- package/server/graphql/resolvers/others/bulk-upload-validate-order-products.ts +4 -4
- package/server/graphql/resolvers/release-good/generate-release-good.ts +13 -2
- package/server/utils/inventory-util.ts +5 -3
|
@@ -70,6 +70,9 @@ exports.deliveryOrdersResolver = {
|
|
|
70
70
|
qb.leftJoinAndSelect('do.releaseGood', 'rg');
|
|
71
71
|
qb.leftJoinAndSelect('do.transportDriver', 'td');
|
|
72
72
|
qb.leftJoinAndSelect('do.transportVehicle', 'th');
|
|
73
|
+
qb.leftJoinAndSelect('do.orderInventories', 'oi');
|
|
74
|
+
qb.leftJoinAndSelect('oi.inventory', 'inv');
|
|
75
|
+
qb.leftJoinAndSelect('inv.product', 'prd');
|
|
73
76
|
qb.leftJoinAndSelect('do.creator', 'creator');
|
|
74
77
|
qb.leftJoinAndSelect('do.updater', 'updater');
|
|
75
78
|
qb.leftJoin(subQuery => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/delivery-orders.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"delivery-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/delivery-orders.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.dispatchDeliveryOrder = void 0;
|
|
4
|
-
const constants_1 = require("../../../constants");
|
|
5
|
-
const entities_1 = require("../../../entities");
|
|
6
4
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
7
5
|
const transport_base_1 = require("@things-factory/transport-base");
|
|
6
|
+
const constants_1 = require("../../../constants");
|
|
7
|
+
const entities_1 = require("../../../entities");
|
|
8
8
|
exports.dispatchDeliveryOrder = {
|
|
9
9
|
async dispatchDeliveryOrder(_, { orderInfo, orderItems }, context) {
|
|
10
10
|
try {
|
|
@@ -28,8 +28,10 @@ exports.dispatchDeliveryOrder = {
|
|
|
28
28
|
const product = inventory.product;
|
|
29
29
|
const foundItem = inventory.reusablePallet
|
|
30
30
|
? orderItems.filter((item) => item.productName === `${product.name} (${product.description})` &&
|
|
31
|
+
item.batchId === orderInventory.batchId &&
|
|
31
32
|
item.pallet === inventory.reusablePallet.name)
|
|
32
|
-
: orderItems.filter((item) => item.productName === `${product.name} (${product.description})`
|
|
33
|
+
: orderItems.filter((item) => item.productName === `${product.name} (${product.description})` &&
|
|
34
|
+
item.batchId === orderInventory.batchId);
|
|
33
35
|
if (foundItem[0].remark !== '')
|
|
34
36
|
orderInventory.remark = foundItem[0].remark;
|
|
35
37
|
return orderInventory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-delivery-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/dispatch-delivery-order.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"dispatch-delivery-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/dispatch-delivery-order.ts"],"names":[],"mappings":";;;AAGA,uDAAuD;AAGvD,mEAAgG;AAGhG,kDAAiD;AACjD,gDAAiE;AAEpD,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,qBAAqB,CAAC,CAAM,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,OAAY;QACzE,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;YAC7F,MAAM,kBAAkB,GAAkB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAa,CAAC,CAAC,OAAO,CAAC;gBACtF,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE;gBACvC,SAAS,EAAE,CAAC,kBAAkB,EAAE,UAAU,CAAC;aAC5C,CAAC,CAAA;YAEF,IAAI,CAAC,kBAAkB;gBAAE,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;YAC1E,IAAI,kBAAkB,CAAC,MAAM,KAAK,wBAAY,CAAC,cAAc;gBAC3D,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;YAExD,IAAI,mBAAmB,GAAG,kBAAkB,CAAC,MAAM,CAAA;YACnD,IAAI,gBAAkC,CAAA;YACtC,gBAAgB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,yBAAc,CAAC,CAAC,IAAI,CAAC;gBAC7D,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,kBAAkB,EAAE;gBACpD,SAAS,EAAE,CAAC,WAAW,EAAE,mBAAmB,EAAE,0BAA0B,CAAC;aAC1E,CAAC,CAAA;YAEF,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,cAA8B,EAAE,EAAE;gBACzE,MAAM,SAAS,GAAc,cAAc,CAAC,SAAS,CAAA;gBACrD,MAAM,OAAO,GAAY,SAAS,CAAC,OAAO,CAAA;gBAC1C,MAAM,SAAS,GAAG,SAAS,CAAC,cAAc;oBACxC,CAAC,CAAC,UAAU,CAAC,MAAM,CACf,CAAC,IAAS,EAAE,EAAE,CACZ,IAAI,CAAC,WAAW,KAAK,GAAG,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,WAAW,GAAG;wBAC/D,IAAI,CAAC,OAAO,KAAK,cAAc,CAAC,OAAO;wBACvC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,cAAc,CAAC,IAAI,CAChD;oBACH,CAAC,CAAC,UAAU,CAAC,MAAM,CACf,CAAC,IAAS,EAAE,EAAE,CACZ,IAAI,CAAC,WAAW,KAAK,GAAG,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,WAAW,GAAG;wBAC/D,IAAI,CAAC,OAAO,KAAK,cAAc,CAAC,OAAO,CAC1C,CAAA;gBAEL,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,EAAE;oBAAE,cAAc,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;gBAC3E,OAAO,cAAc,CAAA;YACvB,CAAC,CAAC,CAAA;YACF,MAAM,EAAE,CAAC,aAAa,CAAC,yBAAc,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;YAE7D,kEAAkE;YAClE,IAAI,OAAO,GAAQ,EAAE,CAAA;YACrB,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,gBAAgB,EAAE;gBAC/B,OAAO,GAAG;oBACR,MAAM;oBACN,IAAI,EAAE,SAAS,CAAC,WAAW;oBAC3B,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;oBACrC,OAAO,EAAE,SAAS,CAAC,gBAAgB;oBACnC,cAAc,EAAE,SAAS,CAAC,cAAc;oBACxC,KAAK,EAAE,SAAS,CAAC,YAAY;oBAC7B,KAAK,EAAE,SAAS,CAAC,YAAY;oBAC7B,WAAW,EAAE,SAAS,CAAC,cAAc;oBACrC,IAAI,EAAE,SAAS,CAAC,WAAW;oBAC3B,OAAO,EAAE,IAAI;iBACd,CAAA;gBACD,OAAO,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;aAC7D;iBAAM;gBACL,OAAO,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAC,OAAO,CAAC;oBACrD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,CAAC,YAAY,EAAE,QAAQ,EAAE,kBAAkB,CAAC,QAAQ,EAAE;iBACrF,CAAC,CAAA;aACH;YAED,IAAI,eAAe,GAAoB,IAAI,CAAA;YAC3C,IAAI,gBAAgB,GAAqB,IAAI,CAAA;YAC7C,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,EAAE;gBACxB,eAAe,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAe,CAAC,CAAC,OAAO,CAAC;oBAChE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,SAAS,EAAE;iBAC7C,CAAC,CAAA;aACH;YAED,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,EAAE;gBACvB,gBAAgB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,iCAAgB,CAAC,CAAC,OAAO,CAAC;oBAClE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,QAAQ,EAAE;iBAC5C,CAAC,CAAA;gBAEF,MAAM,EAAE,CAAC,aAAa,CAAC,iCAAgB,CAAC,CAAC,IAAI,iCACxC,gBAAgB,KACnB,MAAM,EAAE,6BAAY,CAAC,MAAM,EAC3B,OAAO,EAAE,IAAI,IACb,CAAA;aACH;YAED,IAAI,kBAAkB,CAAC,MAAM,KAAK,wBAAY,CAAC,iBAAiB,EAAE;gBAChE,qEAAqE;gBACrE,mBAAmB,GAAG,wBAAY,CAAC,UAAU,CAAA;aAC9C;YAED,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAa,CAAC,CAAC,IAAI,iCACrC,kBAAkB,KACrB,eAAe;gBACf,gBAAgB,EAChB,iBAAiB,EAAE,OAAO,CAAC,EAAE,IAAI,IAAI,EACrC,WAAW,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,KAAI,IAAI,EAC3C,OAAO,EAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,MAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAA,EACrD,EAAE,EAAE,OAAO,CAAC,OAAO,EACnB,YAAY,EAAE,SAAS,CAAC,YAAY,EACpC,MAAM,EAAE,SAAS,CAAC,MAAM,EACxB,MAAM,EAAE,mBAAmB,EAC3B,cAAc,EAAE,SAAS,CAAC,cAAc,EACxC,OAAO,EAAE,IAAI,IACb,CAAA;YAEF,OAAO,kBAAkB,CAAA;SAC1B;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,CAAA;SACR;IACH,CAAC;CACF,CAAA"}
|
|
@@ -39,11 +39,11 @@ exports.bulkUploadValidateOrderProductsResolver = {
|
|
|
39
39
|
let newOrderProduct;
|
|
40
40
|
if (foundProduct) {
|
|
41
41
|
let productDetail;
|
|
42
|
-
if (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.packingType) {
|
|
42
|
+
if ((orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.packingType) && orderProduct.packingType.trim() != '') {
|
|
43
43
|
productDetail = await productDetailRepo.findOne({
|
|
44
44
|
where: {
|
|
45
45
|
product: foundProduct,
|
|
46
|
-
packingType: orderProduct.packingType
|
|
46
|
+
packingType: orderProduct.packingType.trim()
|
|
47
47
|
}
|
|
48
48
|
});
|
|
49
49
|
}
|
|
@@ -55,12 +55,11 @@ exports.bulkUploadValidateOrderProductsResolver = {
|
|
|
55
55
|
}
|
|
56
56
|
});
|
|
57
57
|
}
|
|
58
|
-
newOrderProduct = Object.assign(Object.assign({}, orderProduct), { packingType: (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.packingType) ? orderProduct.packingType : productDetail.packingType, uom: (productDetail === null || productDetail === void 0 ? void 0 : productDetail.uom) ? productDetail.uom : null, uomValue: (productDetail === null || productDetail === void 0 ? void 0 : productDetail.uomValue) ? productDetail.uomValue : null, productName: `${foundProduct.name}(${foundProduct.description}(${foundProduct.sku}))`, isError: productDetail ? false : true, product: {
|
|
58
|
+
newOrderProduct = Object.assign(Object.assign({}, orderProduct), { packingType: (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.packingType) ? orderProduct.packingType : productDetail.packingType, packingSize: (productDetail === null || productDetail === void 0 ? void 0 : productDetail.packingSize) ? productDetail.packingSize : null, uom: (productDetail === null || productDetail === void 0 ? void 0 : productDetail.uom) ? productDetail.uom : null, uomValue: (productDetail === null || productDetail === void 0 ? void 0 : productDetail.uomValue) ? productDetail.uomValue : null, productName: `${foundProduct.name}(${foundProduct.description}(${foundProduct.sku}))`, isError: productDetail ? false : true, product: {
|
|
59
59
|
id: foundProduct.id,
|
|
60
60
|
name: foundProduct.name,
|
|
61
61
|
sku: foundProduct.sku,
|
|
62
|
-
|
|
63
|
-
packingSize: (productDetail === null || productDetail === void 0 ? void 0 : productDetail.packingSize) ? productDetail.packingSize : null,
|
|
62
|
+
type: foundProduct.type,
|
|
64
63
|
primaryUnit: (productDetail === null || productDetail === void 0 ? void 0 : productDetail.uom) ? productDetail.uom : null,
|
|
65
64
|
primaryValue: (productDetail === null || productDetail === void 0 ? void 0 : productDetail.uomValue) ? productDetail.uomValue : null
|
|
66
65
|
}, totalUomValue: orderProduct.packQty > 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk-upload-validate-order-products.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/others/bulk-upload-validate-order-products.ts"],"names":[],"mappings":";;;AACA,uDAA0E;AAE1E,+DAAqE;AAGxD,QAAA,uCAAuC,GAAG;IACrD,KAAK,CAAC,+BAA+B,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,iBAAiB,EAAE,EAAE,OAAY;;QAC9F,MAAM,EACJ,MAAM,EACN,IAAI,EACJ,EAAE,EACF,QAAQ,EACT,GAA0E,OAAO,CAAC,KAAK,CAAA;QAExF,MAAM,iBAAiB,GAAG,EAAE,CAAC,aAAa,CAAC,4BAAa,CAAC,CAAA;QAEzD,IAAI,kBAAkB,GAAe,MAAM,IAAA,gCAAqB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC9E,IAAI,sBAAgC,CAAA;QACpC,IAAI,eAAyB,CAAA;QAE7B,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,gBAAgB,GAAU,EAAE,CAAA;QAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC7C,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAA;YACrC,MAAM,UAAU,GAAW,YAAY,CAAC,UAAU,CAAA;YAClD,MAAM,YAAY,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,sBAAO,CAAC,CAAC,OAAO,CAAC;gBACpE,KAAK,EAAE;oBACL,GAAG,EAAE,UAAU;oBACf,QAAQ,EAAE,eAAe;iBAC1B;aACF,CAAC,CAAA;YAEF,IAAI,eAAoB,CAAA;YAExB,IAAI,YAAY,EAAE;gBAChB,IAAI,aAA4B,CAAA;gBAEhC,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,EAAE;
|
|
1
|
+
{"version":3,"file":"bulk-upload-validate-order-products.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/others/bulk-upload-validate-order-products.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
|
|
|
53
53
|
});
|
|
54
54
|
const customerPartner = await tx
|
|
55
55
|
.getRepository(auth_base_1.Partner)
|
|
56
|
-
.findOne({ where: { partnerDomain: bizplace.domain }, relations: ['domain'] });
|
|
56
|
+
.findOne({ where: { partnerDomain: bizplace.domain, domain }, relations: ['domain'] });
|
|
57
57
|
warehouseDomain = customerPartner.domain;
|
|
58
58
|
}
|
|
59
59
|
else if (releaseGood.partnerBizplaceId) {
|
|
@@ -84,6 +84,18 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
|
|
|
84
84
|
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
85
85
|
await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood);
|
|
86
86
|
}
|
|
87
|
+
else {
|
|
88
|
+
const refNo = releaseGood.refNo;
|
|
89
|
+
const foundReleaseGood = await tx.getRepository(entities_1.ReleaseGood).findOne({
|
|
90
|
+
where: {
|
|
91
|
+
domain: warehouseDomain,
|
|
92
|
+
refNo,
|
|
93
|
+
status: (0, typeorm_1.Not)((0, typeorm_1.In)([constants_1.ORDER_STATUS.CANCELLED, constants_1.ORDER_STATUS.PENDING_CANCEL]))
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
if (foundReleaseGood)
|
|
97
|
+
throw new Error('Existing release order found');
|
|
98
|
+
}
|
|
87
99
|
}
|
|
88
100
|
let newReleaseGood = new entities_1.ReleaseGood();
|
|
89
101
|
/** Generate Shipping Order */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/generate-release-good.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generate-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/generate-release-good.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ exports.InventoryUtil = {
|
|
|
16
16
|
async bizplaceInventoryProductGroup(bizplaces, params, context, trxMgr) {
|
|
17
17
|
try {
|
|
18
18
|
let filters = params.filters;
|
|
19
|
+
const { domain } = context.state;
|
|
19
20
|
const { bizplaceIds, productWhereClause, bundleWhereClause, whereClause, batchBundle } = await getConditions(bizplaces, filters, trxMgr);
|
|
20
21
|
let queryStrings = `
|
|
21
22
|
CREATE TEMP TABLE temp_inventory_product_group AS (
|
|
@@ -73,6 +74,7 @@ exports.InventoryUtil = {
|
|
|
73
74
|
INNER JOIN json_populate_recordset(NULL::order_inventories,'${batchBundle}') src ON src.product_id = pbs.product_bundle_id
|
|
74
75
|
GROUP BY pbs.product_id
|
|
75
76
|
) bp on i.product_id = bp.product_id
|
|
77
|
+
WHERE i.domain_id = $1
|
|
76
78
|
${productWhereClause}
|
|
77
79
|
GROUP BY
|
|
78
80
|
i.batch_id,
|
|
@@ -93,7 +95,7 @@ exports.InventoryUtil = {
|
|
|
93
95
|
(SUM(COALESCE(i2.qty, 0)) - SUM(COALESCE(i2.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty) AS "availableQty",
|
|
94
96
|
(SUM(COALESCE(i2.uom_value, 0)) - SUM(COALESCE(i2.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty) AS "availableUomValue"
|
|
95
97
|
FROM product_bundle_settings pbs
|
|
96
|
-
LEFT JOIN inventories i2 ON i2.product_id = pbs.product_id
|
|
98
|
+
LEFT JOIN inventories i2 ON i2.product_id = pbs.product_id AND i2.domain_id = $1
|
|
97
99
|
AND i2.bizplace_id IN (${bizplaceIds})
|
|
98
100
|
AND i2.status = 'STORED'
|
|
99
101
|
LEFT JOIN oi ON oi.product_id = i2.product_id
|
|
@@ -106,7 +108,7 @@ exports.InventoryUtil = {
|
|
|
106
108
|
${whereClause}
|
|
107
109
|
)
|
|
108
110
|
`;
|
|
109
|
-
await trxMgr.query(queryStrings);
|
|
111
|
+
await trxMgr.query(queryStrings, [domain.id]);
|
|
110
112
|
const [{ total }] = await trxMgr.query(`select count(*) as total from temp_inventory_product_group`);
|
|
111
113
|
let items = [];
|
|
112
114
|
if (params === null || params === void 0 ? void 0 : params.pagination) {
|
|
@@ -185,7 +187,7 @@ async function getConditions(bizplaces, filters, trxMgr) {
|
|
|
185
187
|
var _a;
|
|
186
188
|
let bizplaceIds = bizplaces.map((bizplace) => `'${bizplace.id}'`).join();
|
|
187
189
|
let productWhereClause = `
|
|
188
|
-
|
|
190
|
+
AND i.status = 'STORED'
|
|
189
191
|
AND i.bizplace_id IN (${bizplaceIds})
|
|
190
192
|
`;
|
|
191
193
|
let bundleWhereClause = `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":";;;AAAA,qCAAgD;AAGhD,+DAAqE;AAKrE,sCAA2C;AAE9B,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;
|
|
1
|
+
{"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/sales-base",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.33",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,16 +24,16 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/attachment-base": "^3.6.
|
|
28
|
-
"@things-factory/auth-base": "^3.6.
|
|
29
|
-
"@things-factory/biz-base": "^3.6.
|
|
30
|
-
"@things-factory/code-base": "^3.6.
|
|
31
|
-
"@things-factory/notification": "^3.6.
|
|
32
|
-
"@things-factory/product-base": "^3.6.
|
|
33
|
-
"@things-factory/setting-base": "^3.6.
|
|
34
|
-
"@things-factory/shell": "^3.6.
|
|
35
|
-
"@things-factory/transport-base": "^3.6.
|
|
36
|
-
"@things-factory/warehouse-base": "^3.6.
|
|
27
|
+
"@things-factory/attachment-base": "^3.6.33",
|
|
28
|
+
"@things-factory/auth-base": "^3.6.33",
|
|
29
|
+
"@things-factory/biz-base": "^3.6.33",
|
|
30
|
+
"@things-factory/code-base": "^3.6.33",
|
|
31
|
+
"@things-factory/notification": "^3.6.33",
|
|
32
|
+
"@things-factory/product-base": "^3.6.33",
|
|
33
|
+
"@things-factory/setting-base": "^3.6.33",
|
|
34
|
+
"@things-factory/shell": "^3.6.33",
|
|
35
|
+
"@things-factory/transport-base": "^3.6.33",
|
|
36
|
+
"@things-factory/warehouse-base": "^3.6.33"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "965ef2f6fdc604b4f800e4d01337a3814b3b0d21"
|
|
39
39
|
}
|
|
@@ -86,6 +86,9 @@ export const deliveryOrdersResolver = {
|
|
|
86
86
|
qb.leftJoinAndSelect('do.releaseGood', 'rg')
|
|
87
87
|
qb.leftJoinAndSelect('do.transportDriver', 'td')
|
|
88
88
|
qb.leftJoinAndSelect('do.transportVehicle', 'th')
|
|
89
|
+
qb.leftJoinAndSelect('do.orderInventories', 'oi')
|
|
90
|
+
qb.leftJoinAndSelect('oi.inventory', 'inv')
|
|
91
|
+
qb.leftJoinAndSelect('inv.product', 'prd')
|
|
89
92
|
qb.leftJoinAndSelect('do.creator', 'creator')
|
|
90
93
|
qb.leftJoinAndSelect('do.updater', 'updater')
|
|
91
94
|
qb.leftJoin(
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { EntityManager } from 'typeorm'
|
|
2
|
-
|
|
3
|
-
import { DeliveryOrder, OrderInventory } from '../../../entities'
|
|
4
|
-
import { Domain } from '@things-factory/shell'
|
|
2
|
+
|
|
5
3
|
import { User } from '@things-factory/auth-base'
|
|
6
4
|
import { ContactPoint } from '@things-factory/biz-base'
|
|
5
|
+
import { Product } from '@things-factory/product-base'
|
|
6
|
+
import { Domain } from '@things-factory/shell'
|
|
7
7
|
import { TransportDriver, TransportVehicle, TRUCK_STATUS } from '@things-factory/transport-base'
|
|
8
8
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
9
|
-
|
|
9
|
+
|
|
10
|
+
import { ORDER_STATUS } from '../../../constants'
|
|
11
|
+
import { DeliveryOrder, OrderInventory } from '../../../entities'
|
|
10
12
|
|
|
11
13
|
export const dispatchDeliveryOrder = {
|
|
12
14
|
async dispatchDeliveryOrder(_: any, { orderInfo, orderItems }, context: any) {
|
|
@@ -35,9 +37,14 @@ export const dispatchDeliveryOrder = {
|
|
|
35
37
|
? orderItems.filter(
|
|
36
38
|
(item: any) =>
|
|
37
39
|
item.productName === `${product.name} (${product.description})` &&
|
|
40
|
+
item.batchId === orderInventory.batchId &&
|
|
38
41
|
item.pallet === inventory.reusablePallet.name
|
|
39
42
|
)
|
|
40
|
-
: orderItems.filter(
|
|
43
|
+
: orderItems.filter(
|
|
44
|
+
(item: any) =>
|
|
45
|
+
item.productName === `${product.name} (${product.description})` &&
|
|
46
|
+
item.batchId === orderInventory.batchId
|
|
47
|
+
)
|
|
41
48
|
|
|
42
49
|
if (foundItem[0].remark !== '') orderInventory.remark = foundItem[0].remark
|
|
43
50
|
return orderInventory
|
|
@@ -53,11 +53,11 @@ export const bulkUploadValidateOrderProductsResolver = {
|
|
|
53
53
|
if (foundProduct) {
|
|
54
54
|
let productDetail: ProductDetail
|
|
55
55
|
|
|
56
|
-
if (orderProduct?.packingType) {
|
|
56
|
+
if (orderProduct?.packingType && orderProduct.packingType.trim() != '') {
|
|
57
57
|
productDetail = await productDetailRepo.findOne({
|
|
58
58
|
where: {
|
|
59
59
|
product: foundProduct,
|
|
60
|
-
packingType: orderProduct.packingType
|
|
60
|
+
packingType: orderProduct.packingType.trim()
|
|
61
61
|
}
|
|
62
62
|
})
|
|
63
63
|
} else {
|
|
@@ -72,6 +72,7 @@ export const bulkUploadValidateOrderProductsResolver = {
|
|
|
72
72
|
newOrderProduct = {
|
|
73
73
|
...orderProduct,
|
|
74
74
|
packingType: orderProduct?.packingType ? orderProduct.packingType : productDetail.packingType,
|
|
75
|
+
packingSize: productDetail?.packingSize ? productDetail.packingSize : null,
|
|
75
76
|
uom: productDetail?.uom ? productDetail.uom : null,
|
|
76
77
|
uomValue: productDetail?.uomValue ? productDetail.uomValue : null,
|
|
77
78
|
productName: `${foundProduct.name}(${foundProduct.description}(${foundProduct.sku}))`,
|
|
@@ -80,8 +81,7 @@ export const bulkUploadValidateOrderProductsResolver = {
|
|
|
80
81
|
id: foundProduct.id,
|
|
81
82
|
name: foundProduct.name,
|
|
82
83
|
sku: foundProduct.sku,
|
|
83
|
-
|
|
84
|
-
packingSize: productDetail?.packingSize ? productDetail.packingSize : null,
|
|
84
|
+
type: foundProduct.type,
|
|
85
85
|
primaryUnit: productDetail?.uom ? productDetail.uom : null,
|
|
86
86
|
primaryValue: productDetail?.uomValue ? productDetail.uomValue : null
|
|
87
87
|
},
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FileUpload } from 'graphql-upload'
|
|
2
|
-
import { EntityManager, getRepository, Repository } from 'typeorm'
|
|
2
|
+
import { EntityManager, getRepository, In, Not, Repository } from 'typeorm'
|
|
3
3
|
|
|
4
4
|
import { Attachment, createAttachments } from '@things-factory/attachment-base'
|
|
5
5
|
import { Partner, User } from '@things-factory/auth-base'
|
|
@@ -89,7 +89,7 @@ export async function generateReleaseGoodFunction(
|
|
|
89
89
|
})
|
|
90
90
|
const customerPartner: Partner = await tx
|
|
91
91
|
.getRepository(Partner)
|
|
92
|
-
.findOne({ where: { partnerDomain: bizplace.domain }, relations: ['domain'] })
|
|
92
|
+
.findOne({ where: { partnerDomain: bizplace.domain, domain }, relations: ['domain'] })
|
|
93
93
|
warehouseDomain = customerPartner.domain
|
|
94
94
|
} else if (releaseGood.partnerBizplaceId) {
|
|
95
95
|
const permittedBizplaces: Bizplace[] = await getPermittedBizplaces(domain, user)
|
|
@@ -121,6 +121,17 @@ export async function generateReleaseGoodFunction(
|
|
|
121
121
|
if (sellercraft) {
|
|
122
122
|
const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
123
123
|
await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood)
|
|
124
|
+
} else {
|
|
125
|
+
const refNo: string = releaseGood.refNo
|
|
126
|
+
const foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
|
|
127
|
+
where: {
|
|
128
|
+
domain: warehouseDomain,
|
|
129
|
+
refNo,
|
|
130
|
+
status: Not(In([ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL]))
|
|
131
|
+
}
|
|
132
|
+
})
|
|
133
|
+
|
|
134
|
+
if (foundReleaseGood) throw new Error('Existing release order found')
|
|
124
135
|
}
|
|
125
136
|
}
|
|
126
137
|
|
|
@@ -20,6 +20,7 @@ export const InventoryUtil = {
|
|
|
20
20
|
async bizplaceInventoryProductGroup(bizplaces: Bizplace[], params: ListParam, context: any, trxMgr: EntityManager) {
|
|
21
21
|
try {
|
|
22
22
|
let filters = params.filters
|
|
23
|
+
const { domain }: { domain: Domain } = context.state
|
|
23
24
|
|
|
24
25
|
const { bizplaceIds, productWhereClause, bundleWhereClause, whereClause, batchBundle } = await getConditions(
|
|
25
26
|
bizplaces,
|
|
@@ -83,6 +84,7 @@ export const InventoryUtil = {
|
|
|
83
84
|
INNER JOIN json_populate_recordset(NULL::order_inventories,'${batchBundle}') src ON src.product_id = pbs.product_bundle_id
|
|
84
85
|
GROUP BY pbs.product_id
|
|
85
86
|
) bp on i.product_id = bp.product_id
|
|
87
|
+
WHERE i.domain_id = $1
|
|
86
88
|
${productWhereClause}
|
|
87
89
|
GROUP BY
|
|
88
90
|
i.batch_id,
|
|
@@ -103,7 +105,7 @@ export const InventoryUtil = {
|
|
|
103
105
|
(SUM(COALESCE(i2.qty, 0)) - SUM(COALESCE(i2.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty) AS "availableQty",
|
|
104
106
|
(SUM(COALESCE(i2.uom_value, 0)) - SUM(COALESCE(i2.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty) AS "availableUomValue"
|
|
105
107
|
FROM product_bundle_settings pbs
|
|
106
|
-
LEFT JOIN inventories i2 ON i2.product_id = pbs.product_id
|
|
108
|
+
LEFT JOIN inventories i2 ON i2.product_id = pbs.product_id AND i2.domain_id = $1
|
|
107
109
|
AND i2.bizplace_id IN (${bizplaceIds})
|
|
108
110
|
AND i2.status = 'STORED'
|
|
109
111
|
LEFT JOIN oi ON oi.product_id = i2.product_id
|
|
@@ -117,7 +119,7 @@ export const InventoryUtil = {
|
|
|
117
119
|
)
|
|
118
120
|
`
|
|
119
121
|
|
|
120
|
-
await trxMgr.query(queryStrings)
|
|
122
|
+
await trxMgr.query(queryStrings, [domain.id])
|
|
121
123
|
|
|
122
124
|
const [{ total }]: any = await trxMgr.query(`select count(*) as total from temp_inventory_product_group`)
|
|
123
125
|
let items: any[] = []
|
|
@@ -228,7 +230,7 @@ async function getConditions(
|
|
|
228
230
|
let bizplaceIds = bizplaces.map((bizplace: Bizplace) => `'${bizplace.id}'`).join()
|
|
229
231
|
|
|
230
232
|
let productWhereClause = `
|
|
231
|
-
|
|
233
|
+
AND i.status = 'STORED'
|
|
232
234
|
AND i.bizplace_id IN (${bizplaceIds})
|
|
233
235
|
`
|
|
234
236
|
let bundleWhereClause = `
|