@things-factory/worksheet-base 4.3.363 → 4.3.364
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/render-manual-do.js +9 -6
- package/dist-server/controllers/render-manual-do.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/delivery-order-by-worksheet.js +4 -3
- package/dist-server/graphql/resolvers/worksheet/delivery-order-by-worksheet.js.map +1 -1
- package/package.json +3 -3
- package/server/controllers/render-manual-do.ts +26 -10
- package/server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts +14 -6
|
@@ -57,7 +57,7 @@ async function renderManualDO({ doNo }, context) {
|
|
|
57
57
|
// #6. find list of order inventory
|
|
58
58
|
const orderInventories = await (0, typeorm_1.getRepository)(sales_base_1.OrderInventory).find({
|
|
59
59
|
where: { domain, deliveryOrder: foundDO },
|
|
60
|
-
relations: ['product']
|
|
60
|
+
relations: ['product', 'productDetail']
|
|
61
61
|
});
|
|
62
62
|
// #7. find DO template and logo
|
|
63
63
|
const foundTemplate = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
|
|
@@ -87,18 +87,19 @@ async function renderManualDO({ doNo }, context) {
|
|
|
87
87
|
productList = orderInventories
|
|
88
88
|
.map((oi) => {
|
|
89
89
|
const product = oi.product;
|
|
90
|
+
const productDetail = oi.productDetail;
|
|
90
91
|
return {
|
|
91
92
|
product_name: `${product.name} (${product.description})`,
|
|
92
93
|
product_desc: `${(product === null || product === void 0 ? void 0 : product.description) || ''}`,
|
|
93
94
|
product_nameOnly: `${product.name}`,
|
|
94
95
|
product_sku: `${product.sku}`,
|
|
95
|
-
product_type: `${
|
|
96
|
+
product_type: `${productDetail.packingType}`,
|
|
96
97
|
product_batch: `${oi.batchId}`,
|
|
97
98
|
product_qty: `${oi.releaseQty}`,
|
|
98
99
|
product_weight: `${oi.releaseWeight}`,
|
|
99
|
-
product_gross_weight:
|
|
100
|
+
product_gross_weight: productDetail.grossWeight,
|
|
100
101
|
product_uom_value: `${oi.releaseUomValue}`,
|
|
101
|
-
product_uom: `${
|
|
102
|
+
product_uom: `${productDetail.uom || ''}`,
|
|
102
103
|
remark: `${oi.remark}`,
|
|
103
104
|
cross_docking: `${oi.crossDocking}`,
|
|
104
105
|
pallet: ''
|
|
@@ -108,7 +109,9 @@ async function renderManualDO({ doNo }, context) {
|
|
|
108
109
|
var foundItem = newItem.find(newItem => newItem.product_name === item.product_name &&
|
|
109
110
|
newItem.product_batch === item.product_batch &&
|
|
110
111
|
newItem.cross_docking === item.cross_docking &&
|
|
111
|
-
newItem.pallet === item.pallet
|
|
112
|
+
newItem.pallet === item.pallet &&
|
|
113
|
+
newItem.product_type === item.product_type &&
|
|
114
|
+
newItem.product_sku === item.product_sku);
|
|
112
115
|
if (!foundItem) {
|
|
113
116
|
foundItem = {
|
|
114
117
|
product_sku: item.product_sku,
|
|
@@ -152,7 +155,7 @@ async function renderManualDO({ doNo }, context) {
|
|
|
152
155
|
company_address: domainBizplace.company.address,
|
|
153
156
|
company_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
|
|
154
157
|
warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
|
|
155
|
-
company_email: foundWarehouseCP.email,
|
|
158
|
+
company_email: foundWarehouseCP === null || foundWarehouseCP === void 0 ? void 0 : foundWarehouseCP.email,
|
|
156
159
|
customer_name: foundCP ? foundCP.name : null,
|
|
157
160
|
customer_delivery_address: foundCP ? foundCP.address : null,
|
|
158
161
|
customer_billing_address: foundCP ? foundCP.billingAddress : null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-manual-do.js","sourceRoot":"","sources":["../../server/controllers/render-manual-do.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,4DAA8B;AAC9B,qCAAuC;AAEvC,
|
|
1
|
+
{"version":3,"file":"render-manual-do.js","sourceRoot":"","sources":["../../server/controllers/render-manual-do.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deliveryOrderByWorksheetResolver = void 0;
|
|
4
4
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
|
+
const env_1 = require("@things-factory/env");
|
|
5
6
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
6
7
|
const transport_base_1 = require("@things-factory/transport-base");
|
|
7
|
-
const env_1 = require("@things-factory/env");
|
|
8
8
|
exports.deliveryOrderByWorksheetResolver = {
|
|
9
9
|
async deliveryOrderByWorksheet(_, { name }, context) {
|
|
10
10
|
var _a;
|
|
@@ -24,15 +24,16 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
24
24
|
.createQueryBuilder('oi')
|
|
25
25
|
.select('p.name', 'name')
|
|
26
26
|
.addSelect('p.sku', 'sku')
|
|
27
|
-
.addSelect('
|
|
27
|
+
.addSelect('pd.packing_type', 'packing_type')
|
|
28
28
|
.addSelect('oi.batch_id', 'batchNo')
|
|
29
29
|
.addSelect('oi.uom', 'uom')
|
|
30
30
|
.addSelect('sum(oi.release_qty)', 'loadedQty')
|
|
31
31
|
.addSelect('sum(oi.release_uom_value)', 'uomValue')
|
|
32
32
|
.innerJoin('products', 'p', 'p.id = oi.product_id')
|
|
33
|
+
.innerJoin('product_details', 'pd', 'pd.id = oi.product_detail_id')
|
|
33
34
|
.groupBy('p.name')
|
|
34
35
|
.addGroupBy('p.sku')
|
|
35
|
-
.addGroupBy('
|
|
36
|
+
.addGroupBy('pd.packing_type')
|
|
36
37
|
.addGroupBy('oi.batch_id')
|
|
37
38
|
.addGroupBy('oi.uom')
|
|
38
39
|
.where('oi.domain_id = :domainId', { domainId: domain.id })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.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.364",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@things-factory/integration-sftp": "^4.3.344",
|
|
37
37
|
"@things-factory/marketplace-base": "^4.3.363",
|
|
38
38
|
"@things-factory/notification": "^4.3.281",
|
|
39
|
-
"@things-factory/sales-base": "^4.3.
|
|
39
|
+
"@things-factory/sales-base": "^4.3.364",
|
|
40
40
|
"@things-factory/setting-base": "^4.3.281",
|
|
41
41
|
"@things-factory/shell": "^4.3.281",
|
|
42
42
|
"@things-factory/transport-base": "^4.3.344",
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"puppeteer": "21.0.3",
|
|
46
46
|
"uuid": "^9.0.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "3954cd6c7a9cda1f9866120be0fb9656a79fb4ca"
|
|
49
49
|
}
|
|
@@ -2,12 +2,24 @@ import FormData from 'form-data'
|
|
|
2
2
|
import fetch from 'node-fetch'
|
|
3
3
|
import { getRepository } from 'typeorm'
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
Attachment,
|
|
7
|
+
STORAGE
|
|
8
|
+
} from '@things-factory/attachment-base'
|
|
6
9
|
import { Partner } from '@things-factory/auth-base'
|
|
7
|
-
import {
|
|
10
|
+
import {
|
|
11
|
+
Bizplace,
|
|
12
|
+
ContactPoint
|
|
13
|
+
} from '@things-factory/biz-base'
|
|
8
14
|
import { config } from '@things-factory/env'
|
|
9
|
-
import {
|
|
10
|
-
|
|
15
|
+
import {
|
|
16
|
+
Product,
|
|
17
|
+
ProductDetail
|
|
18
|
+
} from '@things-factory/product-base'
|
|
19
|
+
import {
|
|
20
|
+
DeliveryOrder,
|
|
21
|
+
OrderInventory
|
|
22
|
+
} from '@things-factory/sales-base'
|
|
11
23
|
import { Domain } from '@things-factory/shell'
|
|
12
24
|
|
|
13
25
|
import { TEMPLATE_TYPE } from '../constants'
|
|
@@ -66,7 +78,7 @@ export async function renderManualDO({ doNo }, context: any) {
|
|
|
66
78
|
// #6. find list of order inventory
|
|
67
79
|
const orderInventories: OrderInventory[] = await getRepository(OrderInventory).find({
|
|
68
80
|
where: { domain, deliveryOrder: foundDO },
|
|
69
|
-
relations: ['product']
|
|
81
|
+
relations: ['product', 'productDetail']
|
|
70
82
|
})
|
|
71
83
|
|
|
72
84
|
// #7. find DO template and logo
|
|
@@ -100,18 +112,19 @@ export async function renderManualDO({ doNo }, context: any) {
|
|
|
100
112
|
productList = orderInventories
|
|
101
113
|
.map((oi: OrderInventory) => {
|
|
102
114
|
const product: Product = oi.product
|
|
115
|
+
const productDetail: ProductDetail = oi.productDetail
|
|
103
116
|
return {
|
|
104
117
|
product_name: `${product.name} (${product.description})`,
|
|
105
118
|
product_desc: `${product?.description || ''}`,
|
|
106
119
|
product_nameOnly: `${product.name}`,
|
|
107
120
|
product_sku: `${product.sku}`,
|
|
108
|
-
product_type: `${
|
|
121
|
+
product_type: `${productDetail.packingType}`,
|
|
109
122
|
product_batch: `${oi.batchId}`,
|
|
110
123
|
product_qty: `${oi.releaseQty}`,
|
|
111
124
|
product_weight: `${oi.releaseWeight}`,
|
|
112
|
-
product_gross_weight:
|
|
125
|
+
product_gross_weight: productDetail.grossWeight,
|
|
113
126
|
product_uom_value: `${oi.releaseUomValue}`,
|
|
114
|
-
product_uom: `${
|
|
127
|
+
product_uom: `${productDetail.uom || ''}`,
|
|
115
128
|
remark: `${oi.remark}`,
|
|
116
129
|
cross_docking: `${oi.crossDocking}`,
|
|
117
130
|
pallet: ''
|
|
@@ -123,7 +136,10 @@ export async function renderManualDO({ doNo }, context: any) {
|
|
|
123
136
|
newItem.product_name === item.product_name &&
|
|
124
137
|
newItem.product_batch === item.product_batch &&
|
|
125
138
|
newItem.cross_docking === item.cross_docking &&
|
|
126
|
-
newItem.pallet === item.pallet
|
|
139
|
+
newItem.pallet === item.pallet &&
|
|
140
|
+
newItem.product_type === item.product_type &&
|
|
141
|
+
newItem.product_sku === item.product_sku
|
|
142
|
+
|
|
127
143
|
)
|
|
128
144
|
if (!foundItem) {
|
|
129
145
|
foundItem = {
|
|
@@ -176,7 +192,7 @@ export async function renderManualDO({ doNo }, context: any) {
|
|
|
176
192
|
company_address: domainBizplace.company.address,
|
|
177
193
|
company_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
|
|
178
194
|
warehouse_phone: foundWarehouseCP ? foundWarehouseCP.phone : null,
|
|
179
|
-
company_email: foundWarehouseCP
|
|
195
|
+
company_email: foundWarehouseCP?.email,
|
|
180
196
|
customer_name: foundCP ? foundCP.name : null,
|
|
181
197
|
customer_delivery_address: foundCP ? foundCP.address : null,
|
|
182
198
|
customer_billing_address: foundCP ? foundCP.billingAddress : null,
|
|
@@ -1,9 +1,16 @@
|
|
|
1
|
-
import { Bizplace, ContactPoint } from '@things-factory/biz-base'
|
|
2
|
-
import { DeliveryOrder, OrderInventory } from '@things-factory/sales-base'
|
|
3
|
-
import { Domain } from '@things-factory/shell'
|
|
4
1
|
import { EntityManager } from 'typeorm'
|
|
5
|
-
|
|
2
|
+
|
|
3
|
+
import {
|
|
4
|
+
Bizplace,
|
|
5
|
+
ContactPoint
|
|
6
|
+
} from '@things-factory/biz-base'
|
|
6
7
|
import { logger } from '@things-factory/env'
|
|
8
|
+
import {
|
|
9
|
+
DeliveryOrder,
|
|
10
|
+
OrderInventory
|
|
11
|
+
} from '@things-factory/sales-base'
|
|
12
|
+
import { Domain } from '@things-factory/shell'
|
|
13
|
+
import { TransportDriver } from '@things-factory/transport-base'
|
|
7
14
|
|
|
8
15
|
export const deliveryOrderByWorksheetResolver = {
|
|
9
16
|
async deliveryOrderByWorksheet(_: any, { name }, context: any) {
|
|
@@ -24,15 +31,16 @@ export const deliveryOrderByWorksheetResolver = {
|
|
|
24
31
|
.createQueryBuilder('oi')
|
|
25
32
|
.select('p.name', 'name')
|
|
26
33
|
.addSelect('p.sku', 'sku')
|
|
27
|
-
.addSelect('
|
|
34
|
+
.addSelect('pd.packing_type', 'packing_type')
|
|
28
35
|
.addSelect('oi.batch_id', 'batchNo')
|
|
29
36
|
.addSelect('oi.uom', 'uom')
|
|
30
37
|
.addSelect('sum(oi.release_qty)', 'loadedQty')
|
|
31
38
|
.addSelect('sum(oi.release_uom_value)', 'uomValue')
|
|
32
39
|
.innerJoin('products', 'p', 'p.id = oi.product_id')
|
|
40
|
+
.innerJoin('product_details', 'pd', 'pd.id = oi.product_detail_id')
|
|
33
41
|
.groupBy('p.name')
|
|
34
42
|
.addGroupBy('p.sku')
|
|
35
|
-
.addGroupBy('
|
|
43
|
+
.addGroupBy('pd.packing_type')
|
|
36
44
|
.addGroupBy('oi.batch_id')
|
|
37
45
|
.addGroupBy('oi.uom')
|
|
38
46
|
.where('oi.domain_id = :domainId', { domainId: domain.id })
|