@things-factory/sales-base 4.3.69 → 4.3.70
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/constants/index.js +1 -5
- package/dist-server/constants/index.js.map +1 -1
- package/dist-server/controllers/ecommerce/index.js +1 -5
- package/dist-server/controllers/ecommerce/index.js.map +1 -1
- package/dist-server/controllers/index.js +1 -5
- package/dist-server/controllers/index.js.map +1 -1
- package/dist-server/errors/index.js +1 -5
- package/dist-server/errors/index.js.map +1 -1
- package/dist-server/errors/validation-error.js +1 -5
- package/dist-server/errors/validation-error.js.map +1 -1
- package/dist-server/index.js +1 -5
- package/dist-server/index.js.map +1 -1
- package/dist-server/service/arrival-notice/index.js +1 -5
- package/dist-server/service/arrival-notice/index.js.map +1 -1
- package/dist-server/service/claim/index.js +1 -5
- package/dist-server/service/claim/index.js.map +1 -1
- package/dist-server/service/claim-detail/index.js +1 -5
- package/dist-server/service/claim-detail/index.js.map +1 -1
- package/dist-server/service/claim-order/index.js +1 -5
- package/dist-server/service/claim-order/index.js.map +1 -1
- package/dist-server/service/collection-order/index.js +1 -5
- package/dist-server/service/collection-order/index.js.map +1 -1
- package/dist-server/service/delivery-order/delivery-order-mutation.js +32 -0
- package/dist-server/service/delivery-order/delivery-order-mutation.js.map +1 -1
- package/dist-server/service/delivery-order/delivery-order-query.js +0 -1
- package/dist-server/service/delivery-order/delivery-order-query.js.map +1 -1
- package/dist-server/service/delivery-order/index.js +1 -5
- package/dist-server/service/delivery-order/index.js.map +1 -1
- package/dist-server/service/draft-release-good/index.js +1 -5
- package/dist-server/service/draft-release-good/index.js.map +1 -1
- package/dist-server/service/goods-receival-note/index.js +1 -5
- package/dist-server/service/goods-receival-note/index.js.map +1 -1
- package/dist-server/service/index.js +1 -5
- package/dist-server/service/index.js.map +1 -1
- package/dist-server/service/inventory-check/index.js +1 -5
- package/dist-server/service/inventory-check/index.js.map +1 -1
- package/dist-server/service/invoice/index.js +1 -5
- package/dist-server/service/invoice/index.js.map +1 -1
- package/dist-server/service/invoice-product/index.js +1 -5
- package/dist-server/service/invoice-product/index.js.map +1 -1
- package/dist-server/service/job-sheet/index.js +1 -5
- package/dist-server/service/job-sheet/index.js.map +1 -1
- package/dist-server/service/order-inventory/index.js +1 -5
- package/dist-server/service/order-inventory/index.js.map +1 -1
- package/dist-server/service/order-product/index.js +1 -5
- package/dist-server/service/order-product/index.js.map +1 -1
- package/dist-server/service/order-tote/index.js +1 -5
- package/dist-server/service/order-tote/index.js.map +1 -1
- package/dist-server/service/order-tote-item/index.js +1 -5
- package/dist-server/service/order-tote-item/index.js.map +1 -1
- package/dist-server/service/order-tote-seal/index.js +1 -5
- package/dist-server/service/order-tote-seal/index.js.map +1 -1
- package/dist-server/service/order-vas/index.js +1 -5
- package/dist-server/service/order-vas/index.js.map +1 -1
- package/dist-server/service/others/index.js +1 -5
- package/dist-server/service/others/index.js.map +1 -1
- package/dist-server/service/purchase-order/index.js +1 -5
- package/dist-server/service/purchase-order/index.js.map +1 -1
- package/dist-server/service/purchase-order-other-charge/index.js +1 -5
- package/dist-server/service/purchase-order-other-charge/index.js.map +1 -1
- package/dist-server/service/release-good/index.js +1 -5
- package/dist-server/service/release-good/index.js.map +1 -1
- package/dist-server/service/retail-replenishment-order/index.js +1 -5
- package/dist-server/service/retail-replenishment-order/index.js.map +1 -1
- package/dist-server/service/return-order/index.js +1 -5
- package/dist-server/service/return-order/index.js.map +1 -1
- package/dist-server/service/reverse-kitting-order/index.js +1 -5
- package/dist-server/service/reverse-kitting-order/index.js.map +1 -1
- package/dist-server/service/reverse-kitting-order-inventory/index.js +1 -5
- package/dist-server/service/reverse-kitting-order-inventory/index.js.map +1 -1
- package/dist-server/service/shipping-order/index.js +1 -5
- package/dist-server/service/shipping-order/index.js.map +1 -1
- package/dist-server/service/transfer-order/index.js +1 -5
- package/dist-server/service/transfer-order/index.js.map +1 -1
- package/dist-server/service/vas/index.js +1 -5
- package/dist-server/service/vas/index.js.map +1 -1
- package/dist-server/service/vas-order/index.js +1 -5
- package/dist-server/service/vas-order/index.js.map +1 -1
- package/dist-server/utils/index.js +1 -5
- package/dist-server/utils/index.js.map +1 -1
- package/package.json +2 -2
- package/server/service/delivery-order/delivery-order-mutation.ts +43 -9
- package/server/service/delivery-order/delivery-order-query.ts +16 -18
|
@@ -143,8 +143,8 @@ export class DeliveryOrderQuery {
|
|
|
143
143
|
[arrChildSortData.indexOf(sort.name) >= 0
|
|
144
144
|
? 'releaseGood.' + sort.name
|
|
145
145
|
: arrNameSortData.indexOf(sort.name) >= 0
|
|
146
|
-
|
|
147
|
-
|
|
146
|
+
? sort.name + '.name'
|
|
147
|
+
: 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
|
|
148
148
|
}),
|
|
149
149
|
params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {}
|
|
150
150
|
)
|
|
@@ -152,8 +152,6 @@ export class DeliveryOrderQuery {
|
|
|
152
152
|
qb.orderBy(sort)
|
|
153
153
|
|
|
154
154
|
let [items, total] = await qb.getManyAndCount()
|
|
155
|
-
|
|
156
|
-
console.time('orderProductsApiFilter')
|
|
157
155
|
if (orderProductsApiFilter?.value) {
|
|
158
156
|
items = await Promise.all(
|
|
159
157
|
items.map(async itm => {
|
|
@@ -323,12 +321,12 @@ export class DeliveryOrderQuery {
|
|
|
323
321
|
systemRemark: prod?.remark
|
|
324
322
|
? prod.remark
|
|
325
323
|
: prod.crossDocking
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
324
|
+
? prod.pallet === ''
|
|
325
|
+
? `${prod.palletQty} PALLET(S) [C/D]`
|
|
326
|
+
: `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
|
|
327
|
+
: prod.pallet === ''
|
|
328
|
+
? `${prod.palletQty} PALLET(S)`
|
|
329
|
+
: `${prod.palletQty} PALLET(S) (${prod.pallet})`
|
|
332
330
|
}
|
|
333
331
|
})
|
|
334
332
|
|
|
@@ -415,12 +413,12 @@ export class DeliveryOrderQuery {
|
|
|
415
413
|
systemRemark: prod?.remark
|
|
416
414
|
? prod.remark
|
|
417
415
|
: prod.crossDocking
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
416
|
+
? prod.pallet === ''
|
|
417
|
+
? `${prod.palletQty} PALLET(S) [C/D]`
|
|
418
|
+
: `${prod.palletQty} PALLET(S) (${prod.pallet}) [C/D]`
|
|
419
|
+
: prod.pallet === ''
|
|
420
|
+
? `${prod.palletQty} PALLET(S)`
|
|
421
|
+
: `${prod.palletQty} PALLET(S) (${prod.pallet})`
|
|
424
422
|
}
|
|
425
423
|
})
|
|
426
424
|
|
|
@@ -548,8 +546,8 @@ export class DeliveryOrderQuery {
|
|
|
548
546
|
[arrChildSortData.indexOf(sort.name) >= 0
|
|
549
547
|
? 'releaseGood.' + sort.name
|
|
550
548
|
: arrNameSortData.indexOf(sort.name) >= 0
|
|
551
|
-
|
|
552
|
-
|
|
549
|
+
? sort.name + '.name'
|
|
550
|
+
: 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC'
|
|
553
551
|
}),
|
|
554
552
|
params.sortings.length < 1 ? { rank: 'ASC', 'do.createdAt': 'DESC' } : {}
|
|
555
553
|
)
|