@things-factory/sales-base 4.3.256 → 4.3.261
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/controllers/ecommerce/powrup-controller.js +10 -8
- package/dist-server/controllers/ecommerce/powrup-controller.js.map +1 -1
- package/package.json +3 -3
- package/server/controllers/ecommerce/powrup-controller.ts +19 -12
- package/server/service/order-vas/order-vas-mutation.ts +4 -4
- package/server/service/order-vas/order-vas-types.ts +4 -0
- package/server/service/release-good/release-good-query.ts +1 -0
- package/server/utils/inventory-util.ts +2 -2
|
@@ -6,12 +6,12 @@ const biz_base_1 = require("@things-factory/biz-base");
|
|
|
6
6
|
const env_1 = require("@things-factory/env");
|
|
7
7
|
const integration_powrup_1 = require("@things-factory/integration-powrup");
|
|
8
8
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
9
|
-
const datetime_util_1 = require("../../utils/datetime-util");
|
|
10
9
|
const constants_1 = require("../../constants");
|
|
11
|
-
const utils_1 = require("../../utils");
|
|
12
|
-
const order_package_1 = require("../../service/order-package/order-package");
|
|
13
10
|
const order_package_item_1 = require("../../service/order-package-item/order-package-item");
|
|
11
|
+
const order_package_1 = require("../../service/order-package/order-package");
|
|
14
12
|
const release_good_1 = require("../../service/release-good/release-good");
|
|
13
|
+
const utils_1 = require("../../utils");
|
|
14
|
+
const datetime_util_1 = require("../../utils/datetime-util");
|
|
15
15
|
class PowrupController {
|
|
16
16
|
async packOrder(powrup, releaseGood, domain, user, trxMgr) {
|
|
17
17
|
try {
|
|
@@ -85,9 +85,11 @@ class PowrupController {
|
|
|
85
85
|
}
|
|
86
86
|
async initiateShipment(powrup, releaseGood, domain, user, trxMgr) {
|
|
87
87
|
try {
|
|
88
|
-
let
|
|
89
|
-
|
|
90
|
-
|
|
88
|
+
let orderPackageRepo = trxMgr ? trxMgr.getRepository(order_package_1.OrderPackage) : (0, typeorm_1.getRepository)(order_package_1.OrderPackage);
|
|
89
|
+
let releaseGoodRepo = trxMgr ? trxMgr.getRepository(release_good_1.ReleaseGood) : (0, typeorm_1.getRepository)(release_good_1.ReleaseGood);
|
|
90
|
+
let orderPackages = await orderPackageRepo.find({
|
|
91
|
+
where: { releaseGood, bizplace: releaseGood.bizplace }
|
|
92
|
+
});
|
|
91
93
|
if (orderPackages === null || orderPackages === void 0 ? void 0 : orderPackages.length) {
|
|
92
94
|
await Promise.all(orderPackages
|
|
93
95
|
.filter(op => (op === null || op === void 0 ? void 0 : op.marketRtsCallSuccess) == undefined)
|
|
@@ -101,7 +103,7 @@ class PowrupController {
|
|
|
101
103
|
packageId: op.packageId
|
|
102
104
|
};
|
|
103
105
|
if (releaseGood.lmdOption) {
|
|
104
|
-
let releaseGoodQuery = await
|
|
106
|
+
let releaseGoodQuery = await releaseGoodRepo.findOne({
|
|
105
107
|
where: { id: releaseGood.id },
|
|
106
108
|
relations: ['lastMileDelivery']
|
|
107
109
|
});
|
|
@@ -109,7 +111,7 @@ class PowrupController {
|
|
|
109
111
|
}
|
|
110
112
|
try {
|
|
111
113
|
await integration_powrup_1.PowrupAPI.initiateShipment(powrup, Object.assign(Object.assign({}, orderInformation), { context: { state: { domain, user } } }));
|
|
112
|
-
await
|
|
114
|
+
await orderPackageRepo.update({ id: op.id }, { marketRtsCallSuccess: new Date() });
|
|
113
115
|
}
|
|
114
116
|
catch (error) {
|
|
115
117
|
env_1.logger.error(`powrup-controller[initiateShipment]: ${JSON.stringify(Object.assign(Object.assign({}, orderInformation), { context: { state: { domain: domain || null, user: user || null } }, error: error }))}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"powrup-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/powrup-controller.ts"],"names":[],"mappings":";;;AAAA,qCAAqE;AAErE,uDAAmD;AACnD,6CAA4C;AAC5C,2EAAgF;
|
|
1
|
+
{"version":3,"file":"powrup-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/powrup-controller.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": "4.3.
|
|
3
|
+
"version": "4.3.261",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"@things-factory/setting-base": "^4.3.253",
|
|
36
36
|
"@things-factory/shell": "^4.3.253",
|
|
37
37
|
"@things-factory/transport-base": "^4.3.253",
|
|
38
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
38
|
+
"@things-factory/warehouse-base": "^4.3.261"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "c085fa97b4a7a9abd06aab1820d4e7dbc4ed83ad"
|
|
41
41
|
}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { EntityManager, getConnection, getRepository } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { Bizplace } from '@things-factory/biz-base'
|
|
4
4
|
import { logger } from '@things-factory/env'
|
|
5
|
-
import { Powrup, PowrupAPI
|
|
5
|
+
import { Platform, Powrup, PowrupAPI } from '@things-factory/integration-powrup'
|
|
6
6
|
import { Product, ProductDetail } from '@things-factory/product-base'
|
|
7
|
-
import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
|
|
7
|
+
import { Inventory, INVENTORY_STATUS, LOCATION_TYPE, ProductDetailStock } from '@things-factory/warehouse-base'
|
|
8
8
|
import { Domain, User } from '@things-factory/shell'
|
|
9
9
|
|
|
10
|
-
import { DateTimeDifference } from '../../utils/datetime-util'
|
|
11
10
|
import { ORDER_STATUS } from '../../constants'
|
|
12
|
-
import { OrderNoGenerator } from '../../utils'
|
|
13
|
-
import { OrderPackage } from '../../service/order-package/order-package'
|
|
14
11
|
import { OrderPackageItem } from '../../service/order-package-item/order-package-item'
|
|
12
|
+
import { OrderPackage } from '../../service/order-package/order-package'
|
|
15
13
|
import { OrderProduct } from '../../service/order-product/order-product'
|
|
16
14
|
import { ReleaseGood } from '../../service/release-good/release-good'
|
|
15
|
+
import { OrderNoGenerator } from '../../utils'
|
|
16
|
+
import { DateTimeDifference } from '../../utils/datetime-util'
|
|
17
17
|
|
|
18
18
|
export class PowrupController {
|
|
19
19
|
async packOrder(
|
|
@@ -129,9 +129,12 @@ export class PowrupController {
|
|
|
129
129
|
trxMgr?: EntityManager
|
|
130
130
|
): Promise<void> {
|
|
131
131
|
try {
|
|
132
|
-
let
|
|
133
|
-
|
|
134
|
-
|
|
132
|
+
let orderPackageRepo = trxMgr ? trxMgr.getRepository(OrderPackage) : getRepository(OrderPackage)
|
|
133
|
+
let releaseGoodRepo = trxMgr ? trxMgr.getRepository(ReleaseGood) : getRepository(ReleaseGood)
|
|
134
|
+
|
|
135
|
+
let orderPackages: OrderPackage[] = await orderPackageRepo.find({
|
|
136
|
+
where: { releaseGood, bizplace: releaseGood.bizplace }
|
|
137
|
+
})
|
|
135
138
|
|
|
136
139
|
if (orderPackages?.length) {
|
|
137
140
|
await Promise.all(
|
|
@@ -146,7 +149,7 @@ export class PowrupController {
|
|
|
146
149
|
packageId: op.packageId
|
|
147
150
|
}
|
|
148
151
|
if (releaseGood.lmdOption) {
|
|
149
|
-
let releaseGoodQuery: ReleaseGood = await
|
|
152
|
+
let releaseGoodQuery: ReleaseGood = await releaseGoodRepo.findOne({
|
|
150
153
|
where: { id: releaseGood.id },
|
|
151
154
|
relations: ['lastMileDelivery']
|
|
152
155
|
})
|
|
@@ -164,7 +167,7 @@ export class PowrupController {
|
|
|
164
167
|
...orderInformation,
|
|
165
168
|
context: { state: { domain, user } }
|
|
166
169
|
})
|
|
167
|
-
await
|
|
170
|
+
await orderPackageRepo.update({ id: op.id }, { marketRtsCallSuccess: new Date() })
|
|
168
171
|
} catch (error) {
|
|
169
172
|
logger.error(
|
|
170
173
|
`powrup-controller[initiateShipment]: ${JSON.stringify({
|
|
@@ -291,12 +294,16 @@ export class PowrupController {
|
|
|
291
294
|
}
|
|
292
295
|
})
|
|
293
296
|
|
|
297
|
+
const productDetailStock: ProductDetailStock = await trxMgr
|
|
298
|
+
.getRepository(ProductDetailStock)
|
|
299
|
+
.findOne({ productDetail })
|
|
300
|
+
|
|
294
301
|
const powrupInvs: any[] = [
|
|
295
302
|
{
|
|
296
303
|
refCode: productDetail.refCode,
|
|
297
304
|
stock: {
|
|
298
305
|
quantityTotal: inventoryTotalQty || 0,
|
|
299
|
-
quantityReserved: inventoryTotalLockedQty || 0,
|
|
306
|
+
quantityReserved: inventoryTotalLockedQty + (productDetailStock.unassignedQty || 0) || 0,
|
|
300
307
|
quantityBuffer: inventoryBufferQty || 0
|
|
301
308
|
}
|
|
302
309
|
}
|
|
@@ -94,20 +94,20 @@ export class OrderVasMutation {
|
|
|
94
94
|
select wd.*, ov.*
|
|
95
95
|
from worksheet_details wd
|
|
96
96
|
left join order_vass ov on wd.target_vas_id = ov.id
|
|
97
|
-
where ov.id IN ('${
|
|
97
|
+
where ov.id IN ('${ids}');
|
|
98
98
|
`
|
|
99
99
|
)
|
|
100
|
-
|
|
100
|
+
|
|
101
101
|
if (foundWDs.length > 0) {
|
|
102
102
|
await tx.query(
|
|
103
103
|
`
|
|
104
104
|
delete from worksheet_details wd
|
|
105
105
|
left join order_vass or on wd.target_vas_id = ov.id
|
|
106
|
-
where ov.id IN ('${
|
|
106
|
+
where ov.id IN ('${ids}')
|
|
107
107
|
`
|
|
108
108
|
)
|
|
109
109
|
}
|
|
110
|
-
|
|
110
|
+
|
|
111
111
|
await tx.getRepository(OrderVas).delete(ids)
|
|
112
112
|
return true
|
|
113
113
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ObjectRef } from '@things-factory/shell'
|
|
2
2
|
import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
|
|
3
3
|
import { OrderVas } from './order-vas'
|
|
4
|
+
import { OrderVasItemPatch } from '../order-vas-item/order-vas-item-type'
|
|
4
5
|
|
|
5
6
|
@ObjectType()
|
|
6
7
|
export class OrderVasList {
|
|
@@ -154,6 +155,9 @@ export class OrderVasPatch {
|
|
|
154
155
|
@Field(type => ObjectRef, { nullable: true })
|
|
155
156
|
vas: ObjectRef
|
|
156
157
|
|
|
158
|
+
@Field(type => [OrderVasItemPatch], { nullable: true })
|
|
159
|
+
orderVasItemsPatch: OrderVasItemPatch[]
|
|
160
|
+
|
|
157
161
|
@Field({ nullable: true })
|
|
158
162
|
operationGuide: string
|
|
159
163
|
|
|
@@ -293,8 +293,8 @@ export const InventoryUtil = {
|
|
|
293
293
|
p.id AS "productId",
|
|
294
294
|
i.product_detail_id AS "productDetailId",
|
|
295
295
|
SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0)) - MAX(COALESCE(bp.bundle_product_release_qty, 0)) - SUM(COALESCE(pds.unassigned_qty, 0)) AS "remainQty",
|
|
296
|
-
SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value)) AS "remainUomValue",
|
|
297
|
-
concat(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value)), ' ', i.uom) AS "remainUomValueWithUom",
|
|
296
|
+
SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0)) AS "remainUomValue",
|
|
297
|
+
concat(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0)), ' ', i.uom) AS "remainUomValueWithUom",
|
|
298
298
|
'SINGLE' AS "groupType"
|
|
299
299
|
FROM
|
|
300
300
|
inventories i
|