@things-factory/worksheet-base 4.3.656 → 4.3.658
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.
|
@@ -8,6 +8,7 @@ const integration_marketplace_1 = require("@things-factory/integration-marketpla
|
|
|
8
8
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
9
9
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
10
10
|
const controllers_1 = require("../../../../controllers");
|
|
11
|
+
const utils_1 = require("../../../../utils");
|
|
11
12
|
exports.activateBatchPickingResolver = {
|
|
12
13
|
async activateBatchPicking(_, { worksheetNo }, context) {
|
|
13
14
|
const { tx, domain, user } = context.state;
|
|
@@ -87,6 +88,8 @@ async function activateBatchPicking(tx, domain, user, worksheetNo) {
|
|
|
87
88
|
break;
|
|
88
89
|
}
|
|
89
90
|
}
|
|
91
|
+
// Process LMD orders
|
|
92
|
+
processLmdOrders(releaseGoods, domain, companyDomain, user);
|
|
90
93
|
}
|
|
91
94
|
}
|
|
92
95
|
catch (e) {
|
|
@@ -100,4 +103,34 @@ async function activateBatchPicking(tx, domain, user, worksheetNo) {
|
|
|
100
103
|
}
|
|
101
104
|
}
|
|
102
105
|
exports.activateBatchPicking = activateBatchPicking;
|
|
106
|
+
//triger create parcel for lmd orders
|
|
107
|
+
async function processLmdOrders(releaseGoods, domain, companyDomain, user) {
|
|
108
|
+
// Filter only those that need processing
|
|
109
|
+
const validReleaseGoods = releaseGoods.filter(rg => {
|
|
110
|
+
var _a;
|
|
111
|
+
return ((_a = rg === null || rg === void 0 ? void 0 : rg.orderPackages) === null || _a === void 0 ? void 0 : _a.length) &&
|
|
112
|
+
rg.lmdOption &&
|
|
113
|
+
rg.lastMileDelivery &&
|
|
114
|
+
rg.orderPackages.some(op => op.parcelId == null);
|
|
115
|
+
});
|
|
116
|
+
for (const releaseGood of validReleaseGoods) {
|
|
117
|
+
try {
|
|
118
|
+
const marketplaceOrder = await (0, typeorm_1.getConnection)()
|
|
119
|
+
.getRepository(marketplace_base_1.MarketplaceOrder)
|
|
120
|
+
.findOne({
|
|
121
|
+
where: {
|
|
122
|
+
orderNo: releaseGood.refNo,
|
|
123
|
+
domain: companyDomain
|
|
124
|
+
},
|
|
125
|
+
relations: ['marketplaceStore']
|
|
126
|
+
});
|
|
127
|
+
await (0, typeorm_1.getConnection)().transaction(async (manualConnection) => {
|
|
128
|
+
await (0, utils_1.createLmdParcel)([releaseGood], manualConnection, domain, user, marketplaceOrder);
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
catch (error) {
|
|
132
|
+
env_1.logger.error(`Failed to process LMD parcel for releaseGood ${releaseGood.name}`, error);
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
}
|
|
103
136
|
//# sourceMappingURL=activate-batch-picking.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activate-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-batch-picking.ts"],"names":[],"mappings":";;;AAAA,qCAA0D;AAE1D,yDAAiE;AACjE,6CAA4C;AAC5C,qFAA0E;AAC1E,uEAAmE;AACnE,2DAAwD;AAGxD,yDAAyF;
|
|
1
|
+
{"version":3,"file":"activate-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-batch-picking.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.658",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"puppeteer": "21.0.3",
|
|
46
46
|
"uuid": "^9.0.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "888de7dd6185376b1b7091c493af5f1c878244c0"
|
|
49
49
|
}
|
|
@@ -9,6 +9,7 @@ import { Domain } from '@things-factory/shell'
|
|
|
9
9
|
|
|
10
10
|
import { EcommerceController, PickingWorksheetController } from '../../../../controllers'
|
|
11
11
|
import { Worksheet } from '../../../../entities'
|
|
12
|
+
import { createLmdParcel } from '../../../../utils'
|
|
12
13
|
|
|
13
14
|
export const activateBatchPickingResolver = {
|
|
14
15
|
async activateBatchPicking(_: any, { worksheetNo }, context: any) {
|
|
@@ -114,6 +115,8 @@ export async function activateBatchPicking(
|
|
|
114
115
|
break
|
|
115
116
|
}
|
|
116
117
|
}
|
|
118
|
+
// Process LMD orders
|
|
119
|
+
processLmdOrders(releaseGoods, domain, companyDomain, user)
|
|
117
120
|
}
|
|
118
121
|
} catch (e) {
|
|
119
122
|
logger.error(e)
|
|
@@ -125,3 +128,35 @@ export async function activateBatchPicking(
|
|
|
125
128
|
throw new Error('Something went wrong. Please contact support.')
|
|
126
129
|
}
|
|
127
130
|
}
|
|
131
|
+
|
|
132
|
+
//triger create parcel for lmd orders
|
|
133
|
+
async function processLmdOrders(releaseGoods: ReleaseGood[], domain: Domain, companyDomain: Domain, user: User) {
|
|
134
|
+
// Filter only those that need processing
|
|
135
|
+
const validReleaseGoods = releaseGoods.filter(
|
|
136
|
+
rg =>
|
|
137
|
+
rg?.orderPackages?.length &&
|
|
138
|
+
rg.lmdOption &&
|
|
139
|
+
rg.lastMileDelivery &&
|
|
140
|
+
rg.orderPackages.some(op => op.parcelId == null)
|
|
141
|
+
)
|
|
142
|
+
|
|
143
|
+
for (const releaseGood of validReleaseGoods) {
|
|
144
|
+
try {
|
|
145
|
+
const marketplaceOrder = await getConnection()
|
|
146
|
+
.getRepository(MarketplaceOrder)
|
|
147
|
+
.findOne({
|
|
148
|
+
where: {
|
|
149
|
+
orderNo: releaseGood.refNo,
|
|
150
|
+
domain: companyDomain
|
|
151
|
+
},
|
|
152
|
+
relations: ['marketplaceStore']
|
|
153
|
+
})
|
|
154
|
+
|
|
155
|
+
await getConnection().transaction(async manualConnection => {
|
|
156
|
+
await createLmdParcel([releaseGood], manualConnection, domain, user, marketplaceOrder)
|
|
157
|
+
})
|
|
158
|
+
} catch (error) {
|
|
159
|
+
logger.error(`Failed to process LMD parcel for releaseGood ${releaseGood.name}`, error)
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
}
|