@things-factory/worksheet-base 5.0.0-alpha.2 → 5.0.0-alpha.22
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/inbound/unloading-worksheet-controller.js +299 -2
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/loading-worksheet-controller.js +10 -0
- package/dist-server/controllers/outbound/loading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/packing-worksheet-controller.js +7 -0
- package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +327 -11
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/returning-worksheet-controller.js +4 -0
- package/dist-server/controllers/outbound/returning-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/render-invoices.js +103 -65
- package/dist-server/controllers/render-invoices.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +14 -0
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.js +27 -23
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js +16 -2
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +0 -17
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/index.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/picking/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/undo-serial-number-picking.js +15 -0
- package/dist-server/graphql/resolvers/worksheet/picking/undo-serial-number-picking.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/unloaded-inventories.js +3 -2
- package/dist-server/graphql/resolvers/worksheet/unloaded-inventories.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading/index.js +3 -1
- package/dist-server/graphql/resolvers/worksheet/unloading/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.js +15 -0
- package/dist-server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/unloading/undo-serial-number-unload.js +15 -0
- package/dist-server/graphql/resolvers/worksheet/unloading/undo-serial-number-unload.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/unloading/unload.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading-worksheet.js +3 -1
- package/dist-server/graphql/resolvers/worksheet/unloading-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/worksheet.js +191 -187
- package/dist-server/graphql/resolvers/worksheet/worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/worksheets.js +255 -250
- package/dist-server/graphql/resolvers/worksheet/worksheets.js.map +1 -1
- package/dist-server/graphql/types/worksheet/index.js +16 -0
- package/dist-server/graphql/types/worksheet/index.js.map +1 -1
- package/dist-server/graphql/types/worksheet/worksheet-detail-info.js +1 -0
- package/dist-server/graphql/types/worksheet/worksheet-detail-info.js.map +1 -1
- package/dist-server/graphql/types/worksheet/worksheet-info.js +1 -0
- package/dist-server/graphql/types/worksheet/worksheet-info.js.map +1 -1
- package/dist-server/index.js +5 -0
- package/dist-server/index.js.map +1 -1
- package/package.json +17 -17
- package/server/controllers/inbound/unloading-worksheet-controller.ts +361 -6
- package/server/controllers/outbound/loading-worksheet-controller.ts +13 -0
- package/server/controllers/outbound/packing-worksheet-controller.ts +9 -0
- package/server/controllers/outbound/picking-worksheet-controller.ts +434 -17
- package/server/controllers/outbound/returning-worksheet-controller.ts +5 -0
- package/server/controllers/render-invoices.ts +119 -72
- package/server/controllers/worksheet-controller.ts +17 -2
- package/server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.ts +35 -25
- package/server/graphql/resolvers/worksheet/loading/complete-loading.ts +25 -6
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +3 -3
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +0 -18
- package/server/graphql/resolvers/worksheet/picking/index.ts +3 -1
- package/server/graphql/resolvers/worksheet/picking/undo-serial-number-picking.ts +24 -0
- package/server/graphql/resolvers/worksheet/unloaded-inventories.ts +6 -2
- package/server/graphql/resolvers/worksheet/unloading/index.ts +4 -0
- package/server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.ts +26 -0
- package/server/graphql/resolvers/worksheet/unloading/undo-serial-number-unload.ts +24 -0
- package/server/graphql/resolvers/worksheet/unloading/unload.ts +3 -1
- package/server/graphql/resolvers/worksheet/unloading-worksheet.ts +3 -1
- package/server/graphql/resolvers/worksheet/worksheet.ts +195 -191
- package/server/graphql/resolvers/worksheet/worksheets.ts +328 -325
- package/server/graphql/types/worksheet/index.ts +16 -0
- package/server/graphql/types/worksheet/worksheet-detail-info.ts +1 -0
- package/server/graphql/types/worksheet/worksheet-info.ts +1 -0
- package/server/index.ts +5 -0
|
@@ -17,37 +17,68 @@ interface WorksheetInterface extends Worksheet {
|
|
|
17
17
|
|
|
18
18
|
export const worksheetResolver = {
|
|
19
19
|
async worksheet(_: any, { name }, context: any) {
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
return await worksheet(name, context)
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export async function worksheet(name: string, context: any) {
|
|
25
|
+
const { domain }: { domain: Domain } = context.state
|
|
26
|
+
let worksheet: WorksheetInterface
|
|
27
|
+
worksheet = (await getRepository(Worksheet).findOne({
|
|
28
|
+
where: {
|
|
29
|
+
domain,
|
|
30
|
+
name
|
|
31
|
+
},
|
|
32
|
+
relations: [
|
|
33
|
+
'domain',
|
|
34
|
+
'bizplace',
|
|
35
|
+
'bizplace.domain',
|
|
36
|
+
'bufferLocation',
|
|
37
|
+
'bufferLocation.warehouse',
|
|
38
|
+
'arrivalNotice',
|
|
39
|
+
'arrivalNotice.releaseGood',
|
|
40
|
+
'releaseGood',
|
|
41
|
+
'releaseGood.arrivalNotice',
|
|
42
|
+
'releaseGood.shippingOrder',
|
|
43
|
+
'returnOrder',
|
|
44
|
+
'inventoryCheck',
|
|
45
|
+
'vasOrder',
|
|
46
|
+
'assignee',
|
|
47
|
+
'worksheetDetails',
|
|
48
|
+
'worksheetDetails.toLocation',
|
|
49
|
+
'worksheetDetails.targetProduct',
|
|
50
|
+
'worksheetDetails.targetProduct.product',
|
|
51
|
+
'worksheetDetails.targetVas',
|
|
52
|
+
'worksheetDetails.targetVas.vas',
|
|
53
|
+
'worksheetDetails.targetVas.inventory',
|
|
54
|
+
'worksheetDetails.targetVas.inventory.location',
|
|
55
|
+
'worksheetDetails.targetVas.targetProduct',
|
|
56
|
+
'worksheetDetails.targetInventory',
|
|
57
|
+
'worksheetDetails.targetInventory.releaseGood',
|
|
58
|
+
'worksheetDetails.targetInventory.product',
|
|
59
|
+
'worksheetDetails.targetInventory.inventory',
|
|
60
|
+
'worksheetDetails.targetInventory.inventory.product',
|
|
61
|
+
'worksheetDetails.targetInventory.inventory.warehouse',
|
|
62
|
+
'worksheetDetails.targetInventory.inventory.location',
|
|
63
|
+
'worksheetDetails.targetInventory.inspectedLocation',
|
|
64
|
+
'creator',
|
|
65
|
+
'updater'
|
|
66
|
+
]
|
|
67
|
+
})) as WorksheetInterface
|
|
68
|
+
|
|
69
|
+
if (!worksheet) {
|
|
22
70
|
worksheet = (await getRepository(Worksheet).findOne({
|
|
23
71
|
where: {
|
|
24
72
|
domain,
|
|
25
|
-
name
|
|
73
|
+
arrivalNotice: name
|
|
26
74
|
},
|
|
27
75
|
relations: [
|
|
28
76
|
'domain',
|
|
29
77
|
'bizplace',
|
|
30
78
|
'bizplace.domain',
|
|
31
|
-
'bufferLocation',
|
|
32
|
-
'bufferLocation.warehouse',
|
|
33
|
-
'arrivalNotice',
|
|
34
|
-
'arrivalNotice.releaseGood',
|
|
35
|
-
'releaseGood',
|
|
36
|
-
'releaseGood.arrivalNotice',
|
|
37
|
-
'releaseGood.shippingOrder',
|
|
38
|
-
'returnOrder',
|
|
39
|
-
'inventoryCheck',
|
|
40
|
-
'vasOrder',
|
|
41
|
-
'assignee',
|
|
42
79
|
'worksheetDetails',
|
|
43
|
-
'worksheetDetails.toLocation',
|
|
44
80
|
'worksheetDetails.targetProduct',
|
|
45
81
|
'worksheetDetails.targetProduct.product',
|
|
46
|
-
'worksheetDetails.targetVas',
|
|
47
|
-
'worksheetDetails.targetVas.vas',
|
|
48
|
-
'worksheetDetails.targetVas.inventory',
|
|
49
|
-
'worksheetDetails.targetVas.inventory.location',
|
|
50
|
-
'worksheetDetails.targetVas.targetProduct',
|
|
51
82
|
'worksheetDetails.targetInventory',
|
|
52
83
|
'worksheetDetails.targetInventory.releaseGood',
|
|
53
84
|
'worksheetDetails.targetInventory.product',
|
|
@@ -60,196 +91,169 @@ export const worksheetResolver = {
|
|
|
60
91
|
'updater'
|
|
61
92
|
]
|
|
62
93
|
})) as WorksheetInterface
|
|
94
|
+
}
|
|
63
95
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
domain,
|
|
68
|
-
arrivalNotice: name
|
|
69
|
-
},
|
|
70
|
-
relations: [
|
|
71
|
-
'domain',
|
|
72
|
-
'bizplace',
|
|
73
|
-
'bizplace.domain',
|
|
74
|
-
'worksheetDetails',
|
|
75
|
-
'worksheetDetails.targetProduct',
|
|
76
|
-
'worksheetDetails.targetProduct.product',
|
|
77
|
-
'worksheetDetails.targetInventory',
|
|
78
|
-
'worksheetDetails.targetInventory.releaseGood',
|
|
79
|
-
'worksheetDetails.targetInventory.product',
|
|
80
|
-
'worksheetDetails.targetInventory.inventory',
|
|
81
|
-
'worksheetDetails.targetInventory.inventory.product',
|
|
82
|
-
'worksheetDetails.targetInventory.inventory.warehouse',
|
|
83
|
-
'worksheetDetails.targetInventory.inventory.location',
|
|
84
|
-
'worksheetDetails.targetInventory.inspectedLocation',
|
|
85
|
-
'creator',
|
|
86
|
-
'updater'
|
|
87
|
-
]
|
|
88
|
-
})) as WorksheetInterface
|
|
89
|
-
}
|
|
96
|
+
let pWorksheetPickingItemSorting = getRepository(Setting).findOne({
|
|
97
|
+
where: { domain, category: 'location', name: 'rule-for-worksheet-release-goods-item' }
|
|
98
|
+
})
|
|
90
99
|
|
|
91
|
-
|
|
92
|
-
|
|
100
|
+
if (worksheet?.arrivalNotice?.id) {
|
|
101
|
+
worksheet.orderProducts = await getRepository(OrderProduct).find({
|
|
102
|
+
where: {
|
|
103
|
+
domain,
|
|
104
|
+
bizplace: worksheet.bizplace,
|
|
105
|
+
arrivalNotice: worksheet.arrivalNotice
|
|
106
|
+
}
|
|
93
107
|
})
|
|
94
108
|
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
109
|
+
worksheet.orderVass = await getRepository(OrderVas).find({
|
|
110
|
+
where: {
|
|
111
|
+
domain,
|
|
112
|
+
bizplace: worksheet.bizplace,
|
|
113
|
+
arrivalNotice: worksheet.arrivalNotice
|
|
114
|
+
},
|
|
115
|
+
relations: ['targetProduct']
|
|
116
|
+
})
|
|
117
|
+
}
|
|
103
118
|
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
119
|
+
if (worksheet.type === WORKSHEET_TYPE.BATCH_PICKING) {
|
|
120
|
+
let qbOrderInventories = getRepository(OrderInventory)
|
|
121
|
+
.createQueryBuilder('oi')
|
|
122
|
+
.leftJoinAndSelect('oi.releaseGood', 'releaseGood')
|
|
123
|
+
.leftJoinAndSelect('oi.inventory', 'inventory')
|
|
124
|
+
.leftJoinAndSelect('oi.product', 'product')
|
|
125
|
+
.leftJoinAndSelect('inventory.location', 'location')
|
|
126
|
+
.leftJoinAndSelect('oi.bizplace', 'bizplace')
|
|
127
|
+
.where('"oi"."domain_id" = :domain')
|
|
128
|
+
.andWhere('"oi"."bizplace_id" = :bizplace')
|
|
129
|
+
.andWhere('"oi"."ref_worksheet_id" = :refWorksheetId')
|
|
130
|
+
.setParameters({
|
|
131
|
+
domain: domain.id,
|
|
132
|
+
bizplace: worksheet.bizplace.id,
|
|
133
|
+
refWorksheetId: worksheet.id
|
|
111
134
|
})
|
|
112
|
-
}
|
|
113
135
|
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
.
|
|
119
|
-
.leftJoinAndSelect('oi.product', 'product')
|
|
120
|
-
.leftJoinAndSelect('inventory.location', 'location')
|
|
121
|
-
.leftJoinAndSelect('oi.bizplace', 'bizplace')
|
|
122
|
-
.where('"oi"."domain_id" = :domain')
|
|
123
|
-
.andWhere('"oi"."bizplace_id" = :bizplace')
|
|
124
|
-
.andWhere('"oi"."ref_worksheet_id" = :refWorksheetId')
|
|
125
|
-
.setParameters({
|
|
126
|
-
domain: domain.id,
|
|
127
|
-
bizplace: worksheet.bizplace.id,
|
|
128
|
-
refWorksheetId: worksheet.id
|
|
129
|
-
})
|
|
130
|
-
|
|
131
|
-
let sortingSetting: Setting = await pWorksheetPickingItemSorting
|
|
132
|
-
if (sortingSetting?.value) {
|
|
133
|
-
let settingValue = JSON.parse(sortingSetting.value)
|
|
134
|
-
for (const key in settingValue) {
|
|
135
|
-
qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
|
|
136
|
-
}
|
|
136
|
+
let sortingSetting: Setting = await pWorksheetPickingItemSorting
|
|
137
|
+
if (sortingSetting?.value) {
|
|
138
|
+
let settingValue = JSON.parse(sortingSetting.value)
|
|
139
|
+
for (const key in settingValue) {
|
|
140
|
+
qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
|
|
137
141
|
}
|
|
138
|
-
|
|
139
|
-
let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
|
|
140
|
-
worksheet.orderInventories = orderInventories
|
|
141
142
|
}
|
|
142
143
|
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
.leftJoinAndSelect('oi.releaseGood', 'releaseGood')
|
|
147
|
-
.leftJoinAndSelect('oi.inventory', 'inventory')
|
|
148
|
-
.leftJoinAndSelect('oi.product', 'product')
|
|
149
|
-
.leftJoinAndSelect('inventory.location', 'location')
|
|
150
|
-
.leftJoinAndSelect('oi.bizplace', 'bizplace')
|
|
151
|
-
.where('"oi"."domain_id" = :domain')
|
|
152
|
-
.andWhere('"oi"."bizplace_id" = :bizplace')
|
|
153
|
-
.andWhere('"oi"."release_good_id" = :releaseGood')
|
|
154
|
-
.andWhere('"oi"."status" NOT IN (:...statuses)')
|
|
155
|
-
.setParameters({
|
|
156
|
-
domain: domain.id,
|
|
157
|
-
bizplace: worksheet.bizplace.id,
|
|
158
|
-
releaseGood: worksheet.releaseGood.id,
|
|
159
|
-
statuses: [ORDER_INVENTORY_STATUS.CANCELLED, ORDER_INVENTORY_STATUS.REPLACED]
|
|
160
|
-
})
|
|
161
|
-
|
|
162
|
-
let sortingSetting: Setting = await pWorksheetPickingItemSorting
|
|
163
|
-
if (sortingSetting?.value) {
|
|
164
|
-
let settingValue = JSON.parse(sortingSetting.value)
|
|
165
|
-
for (const key in settingValue) {
|
|
166
|
-
qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
|
|
167
|
-
}
|
|
168
|
-
}
|
|
169
|
-
|
|
170
|
-
let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
|
|
171
|
-
worksheet.orderInventories = orderInventories
|
|
172
|
-
|
|
173
|
-
if (worksheet.releaseGood.type == 'b2c') {
|
|
174
|
-
worksheet.marketplaceOrder = await getRepository(MarketplaceOrder).findOne({
|
|
175
|
-
where: { orderNo: worksheet.releaseGood.refNo },
|
|
176
|
-
relations: ['marketplaceOrderItems', 'marketplaceStore']
|
|
177
|
-
})
|
|
178
|
-
|
|
179
|
-
if (worksheet.marketplaceOrder) {
|
|
180
|
-
let marketplaceOrderShipping: MarketplaceOrderShipping
|
|
181
|
-
if (worksheet.marketplaceOrder.isSplitted) {
|
|
182
|
-
marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
|
|
183
|
-
where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
|
|
184
|
-
})
|
|
185
|
-
} else {
|
|
186
|
-
marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
|
|
187
|
-
where: { orderNoRef: worksheet.releaseGood.refNo }
|
|
188
|
-
})
|
|
189
|
-
}
|
|
190
|
-
|
|
191
|
-
worksheet.marketplaceOrder.trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
192
|
-
? marketplaceOrderShipping.ownTrackingNo
|
|
193
|
-
: marketplaceOrderShipping.trackingNo
|
|
194
|
-
worksheet.marketplaceOrder.shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
195
|
-
? marketplaceOrderShipping.ownTransporter
|
|
196
|
-
: marketplaceOrderShipping.transporter
|
|
197
|
-
}
|
|
198
|
-
}
|
|
144
|
+
let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
|
|
145
|
+
worksheet.orderInventories = orderInventories
|
|
146
|
+
}
|
|
199
147
|
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
148
|
+
if (worksheet?.releaseGood?.id) {
|
|
149
|
+
let qbOrderInventories = getRepository(OrderInventory)
|
|
150
|
+
.createQueryBuilder('oi')
|
|
151
|
+
.leftJoinAndSelect('oi.releaseGood', 'releaseGood')
|
|
152
|
+
.leftJoinAndSelect('oi.inventory', 'inventory')
|
|
153
|
+
.leftJoinAndSelect('oi.product', 'product')
|
|
154
|
+
.leftJoinAndSelect('inventory.location', 'location')
|
|
155
|
+
.leftJoinAndSelect('oi.bizplace', 'bizplace')
|
|
156
|
+
.where('"oi"."domain_id" = :domain')
|
|
157
|
+
.andWhere('"oi"."bizplace_id" = :bizplace')
|
|
158
|
+
.andWhere('"oi"."release_good_id" = :releaseGood')
|
|
159
|
+
.andWhere('"oi"."status" NOT IN (:...statuses)')
|
|
160
|
+
.setParameters({
|
|
161
|
+
domain: domain.id,
|
|
162
|
+
bizplace: worksheet.bizplace.id,
|
|
163
|
+
releaseGood: worksheet.releaseGood.id,
|
|
164
|
+
statuses: [ORDER_INVENTORY_STATUS.CANCELLED, ORDER_INVENTORY_STATUS.REPLACED]
|
|
207
165
|
})
|
|
166
|
+
|
|
167
|
+
let sortingSetting: Setting = await pWorksheetPickingItemSorting
|
|
168
|
+
if (sortingSetting?.value) {
|
|
169
|
+
let settingValue = JSON.parse(sortingSetting.value)
|
|
170
|
+
for (const key in settingValue) {
|
|
171
|
+
qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC')
|
|
172
|
+
}
|
|
208
173
|
}
|
|
209
174
|
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
where: {
|
|
213
|
-
domain,
|
|
214
|
-
bizplace: worksheet.bizplace,
|
|
215
|
-
returnOrder: worksheet.returnOrder,
|
|
216
|
-
status: Not(Equal(ORDER_INVENTORY_STATUS.CANCELLED))
|
|
217
|
-
},
|
|
218
|
-
relations: ['product', 'inventory', 'inventory.location']
|
|
219
|
-
})
|
|
175
|
+
let orderInventories: OrderInventory[] = await qbOrderInventories.getMany()
|
|
176
|
+
worksheet.orderInventories = orderInventories
|
|
220
177
|
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
returnOrder: worksheet.returnOrder
|
|
226
|
-
},
|
|
227
|
-
relations: ['targetProduct']
|
|
178
|
+
if (worksheet.releaseGood.type == 'b2c') {
|
|
179
|
+
worksheet.marketplaceOrder = await getRepository(MarketplaceOrder).findOne({
|
|
180
|
+
where: { orderNo: worksheet.releaseGood.refNo },
|
|
181
|
+
relations: ['marketplaceOrderItems', 'marketplaceStore']
|
|
228
182
|
})
|
|
229
|
-
}
|
|
230
183
|
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
}
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
184
|
+
if (worksheet.marketplaceOrder) {
|
|
185
|
+
let marketplaceOrderShipping: MarketplaceOrderShipping
|
|
186
|
+
if (worksheet.marketplaceOrder.isSplitted) {
|
|
187
|
+
marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
|
|
188
|
+
where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
|
|
189
|
+
})
|
|
190
|
+
} else {
|
|
191
|
+
marketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).findOne({
|
|
192
|
+
where: { orderNoRef: worksheet.releaseGood.refNo }
|
|
193
|
+
})
|
|
194
|
+
}
|
|
241
195
|
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
relations: ['targetProduct']
|
|
250
|
-
})
|
|
196
|
+
worksheet.marketplaceOrder.trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
197
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
198
|
+
: marketplaceOrderShipping.trackingNo
|
|
199
|
+
worksheet.marketplaceOrder.shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
200
|
+
? marketplaceOrderShipping.ownTransporter
|
|
201
|
+
: marketplaceOrderShipping.transporter
|
|
202
|
+
}
|
|
251
203
|
}
|
|
252
204
|
|
|
253
|
-
|
|
205
|
+
worksheet.orderVass = await getRepository(OrderVas).find({
|
|
206
|
+
where: {
|
|
207
|
+
domain,
|
|
208
|
+
bizplace: worksheet.bizplace,
|
|
209
|
+
releaseGood: worksheet.releaseGood
|
|
210
|
+
},
|
|
211
|
+
relations: ['targetProduct']
|
|
212
|
+
})
|
|
254
213
|
}
|
|
214
|
+
|
|
215
|
+
if (worksheet?.returnOrder?.id) {
|
|
216
|
+
worksheet.orderInventories = await getRepository(OrderInventory).find({
|
|
217
|
+
where: {
|
|
218
|
+
domain,
|
|
219
|
+
bizplace: worksheet.bizplace,
|
|
220
|
+
returnOrder: worksheet.returnOrder,
|
|
221
|
+
status: Not(Equal(ORDER_INVENTORY_STATUS.CANCELLED))
|
|
222
|
+
},
|
|
223
|
+
relations: ['product', 'inventory', 'inventory.location']
|
|
224
|
+
})
|
|
225
|
+
|
|
226
|
+
worksheet.orderVass = await getRepository(OrderVas).find({
|
|
227
|
+
where: {
|
|
228
|
+
domain,
|
|
229
|
+
bizplace: worksheet.bizplace,
|
|
230
|
+
returnOrder: worksheet.returnOrder
|
|
231
|
+
},
|
|
232
|
+
relations: ['targetProduct']
|
|
233
|
+
})
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
if (worksheet?.inventoryCheck?.id) {
|
|
237
|
+
worksheet.orderInventories = await getRepository(OrderInventory).find({
|
|
238
|
+
where: {
|
|
239
|
+
domain,
|
|
240
|
+
bizplace: worksheet.bizplace,
|
|
241
|
+
inventoryCheck: worksheet.inventoryCheck
|
|
242
|
+
},
|
|
243
|
+
relations: ['product', 'inventory', 'inventory.location']
|
|
244
|
+
})
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
if (worksheet?.vasOrder?.id) {
|
|
248
|
+
worksheet.orderVass = await getRepository(OrderVas).find({
|
|
249
|
+
where: {
|
|
250
|
+
domain,
|
|
251
|
+
bizplace: worksheet.bizplace,
|
|
252
|
+
vasOrder: worksheet.vasOrder
|
|
253
|
+
},
|
|
254
|
+
relations: ['targetProduct']
|
|
255
|
+
})
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
return worksheet
|
|
255
259
|
}
|