@things-factory/worksheet-base 4.3.414 → 4.3.415
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-manifest.js +4 -1
- package/dist-server/controllers/render-manifest.js.map +1 -1
- package/dist-server/entities/active-worksheet-picking-view.js +3 -1
- package/dist-server/entities/active-worksheet-picking-view.js.map +1 -1
- package/package.json +3 -3
- package/server/controllers/render-manifest.ts +16 -3
- package/server/entities/active-worksheet-picking-view.ts +10 -2
|
@@ -8,10 +8,10 @@ const form_data_1 = __importDefault(require("form-data"));
|
|
|
8
8
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
9
9
|
const typeorm_1 = require("typeorm");
|
|
10
10
|
const attachment_base_1 = require("@things-factory/attachment-base");
|
|
11
|
+
const biz_base_1 = require("@things-factory/biz-base");
|
|
11
12
|
const env_1 = require("@things-factory/env");
|
|
12
13
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
13
14
|
const shell_1 = require("@things-factory/shell");
|
|
14
|
-
const biz_base_1 = require("@things-factory/biz-base");
|
|
15
15
|
const constants_1 = require("../constants");
|
|
16
16
|
const datetime_util_1 = require("../utils/datetime-util");
|
|
17
17
|
const REPORT_API_URL = env_1.config.get('reportApiUrl', 'http://localhost:8888/rest/report/show_html');
|
|
@@ -29,6 +29,9 @@ async function renderManifest({ manifestNo }, context) {
|
|
|
29
29
|
let qb = (0, typeorm_1.getRepository)(sales_base_1.OrderPackage).createQueryBuilder('opk');
|
|
30
30
|
qb.innerJoinAndSelect('opk.releaseGood', 'rg').where('opk.manifest_id = :manifestId', { manifestId: manifest.id });
|
|
31
31
|
qb.innerJoinAndSelect('rg.bizplace', 'b');
|
|
32
|
+
if (context.query && context.query.biz !== 'null') {
|
|
33
|
+
qb.andWhere('b.name = :filter', { filter: context.query.biz });
|
|
34
|
+
}
|
|
32
35
|
qb.orderBy('opk.trackingNo');
|
|
33
36
|
const orderPackages = await qb.getMany();
|
|
34
37
|
// 7. find grn template based on category
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-manifest.js","sourceRoot":"","sources":["../../server/controllers/render-manifest.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAgC;AAChC,4DAA8B;AAC9B,qCAAuC;AAEvC,
|
|
1
|
+
{"version":3,"file":"render-manifest.js","sourceRoot":"","sources":["../../server/controllers/render-manifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -155,7 +155,9 @@ ActiveWorksheetPickingView = ActiveWorksheetPickingView_1 = __decorate([
|
|
|
155
155
|
LEFT JOIN product_barcodes pb ON pb.product_detail_id = oi.product_detail_id
|
|
156
156
|
left join product_bundle_settings pbs on pbs.product_bundle_id = pb2.id and pbs.product_id = oi.product_id and pbs.product_detail_id = oi.product_detail_id
|
|
157
157
|
WHERE w.type::text = 'PICKING'::text AND w.status::text = 'EXECUTING'::text
|
|
158
|
-
|
|
158
|
+
GROUP BY oi.id, wd.id, w.id, op.id, pb.id, p.is_require_serial_number_scanning_outbound,i.id,rg.name,rg.ref_no
|
|
159
|
+
ORDER BY w.domain_id, w.bizplace_id, wd.id
|
|
160
|
+
`
|
|
159
161
|
})
|
|
160
162
|
], ActiveWorksheetPickingView);
|
|
161
163
|
exports.ActiveWorksheetPickingView = ActiveWorksheetPickingView;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active-worksheet-picking-view.js","sourceRoot":"","sources":["../../server/entities/active-worksheet-picking-view.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"active-worksheet-picking-view.js","sourceRoot":"","sources":["../../server/entities/active-worksheet-picking-view.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAMgB;AA0CT,IAAM,0BAA0B,kCAAhC,MAAM,0BAA0B;IACrC,MAAM,CAAC,KAAK,CAAC,WAAW;QACtB,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAiB,EAAE,EAAE;YAC5D,MAAM,EAAE;iBACL,aAAa,CAAC,4BAA0B,CAAC;iBACzC,KAAK,CAAC,uEAAuE,CAAC;iBAC9E,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;iBACrE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC,CAAA;QAC/E,CAAC,CAAC,CAAA;IACJ,CAAC;CA+EF,CAAA;AA7EC;IAAC,IAAA,eAAK,EACJ,+BAA+B,EAC/B,CAAC,0BAAsD,EAAE,EAAE,CAAC;QAC1D,0BAA0B,CAAC,gBAAgB;QAC3C,0BAA0B,CAAC,gBAAgB;KAC5C,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;IACA,IAAA,eAAK,EAAC,+BAA+B,EAAE,CAAC,0BAAsD,EAAE,EAAE,CAAC;QAClG,0BAA0B,CAAC,iBAAiB;KAC7C,CAAC;IACD,IAAA,eAAK,EAAC,+BAA+B,EAAE,CAAC,0BAAsD,EAAE,EAAE,CAAC;QAClG,0BAA0B,CAAC,QAAQ;QACnC,0BAA0B,CAAC,mBAAmB;KAC/C,CAAC;IACD,IAAA,oBAAU,GAAE;;qEACY;AAEzB;IAAC,IAAA,oBAAU,GAAE;;uEACc;AAE3B;IAAC,IAAA,oBAAU,GAAE;;+DACM;AAEnB;IAAC,IAAA,oBAAU,GAAE;;4DACG;AAEhB;IAAC,IAAA,oBAAU,GAAE;;8DACK;AAElB;IAAC,IAAA,oBAAU,GAAE;;mEACU;AAEvB;IAAC,IAAA,oBAAU,GAAE;;6DACI;AAEjB;IAAC,IAAA,oBAAU,GAAE;;mEACU;AAEvB;IAAC,IAAA,oBAAU,GAAE;;4DACG;AAEhB;IAAC,IAAA,oBAAU,GAAE;;oEACW;AAExB;IAAC,IAAA,oBAAU,GAAE;;wDACD;AAEZ;IAAC,IAAA,oBAAU,GAAE;;gGACuC;AAEpD;IAAC,IAAA,oBAAU,GAAE;;iEACQ;AAErB;IAAC,IAAA,oBAAU,GAAE;;mEACU;AAEvB;IAAC,IAAA,oBAAU,GAAE;;yDACA;AAEb;IAAC,IAAA,oBAAU,GAAE;;oEACW;AAExB;IAAC,IAAA,oBAAU,GAAE;;wEACe;AAE5B;IAAC,IAAA,oBAAU,GAAE;;+DACM;AAEnB;IAAC,IAAA,oBAAU,GAAE;;qEACY;AAEzB;IAAC,IAAA,oBAAU,GAAE;;mEACU;AAEvB;IAAC,IAAA,oBAAU,GAAE;;4EACmB;AAvFrB,0BAA0B;IAxCtC,IAAA,oBAAU,EAAC;QACV,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCX;KACF,CAAC;GACW,0BAA0B,CAwFtC;AAxFY,gEAA0B"}
|
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.415",
|
|
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.411",
|
|
37
37
|
"@things-factory/marketplace-base": "^4.3.414",
|
|
38
38
|
"@things-factory/notification": "^4.3.381",
|
|
39
|
-
"@things-factory/sales-base": "^4.3.
|
|
39
|
+
"@things-factory/sales-base": "^4.3.415",
|
|
40
40
|
"@things-factory/setting-base": "^4.3.381",
|
|
41
41
|
"@things-factory/shell": "^4.3.381",
|
|
42
42
|
"@things-factory/transport-base": "^4.3.381",
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"puppeteer": "21.0.3",
|
|
46
46
|
"uuid": "^9.0.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "434faf6cc9f277aa9d4bc264540468cdc40ee57e"
|
|
49
49
|
}
|
|
@@ -2,11 +2,20 @@ 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'
|
|
9
|
+
import {
|
|
10
|
+
Bizplace,
|
|
11
|
+
getCompanyBizplace
|
|
12
|
+
} from '@things-factory/biz-base'
|
|
6
13
|
import { config } from '@things-factory/env'
|
|
7
|
-
import {
|
|
14
|
+
import {
|
|
15
|
+
Manifest,
|
|
16
|
+
OrderPackage
|
|
17
|
+
} from '@things-factory/sales-base'
|
|
8
18
|
import { Domain } from '@things-factory/shell'
|
|
9
|
-
import { Bizplace, getCompanyBizplace } from '@things-factory/biz-base'
|
|
10
19
|
|
|
11
20
|
import { TEMPLATE_TYPE } from '../constants'
|
|
12
21
|
import { DateTimeConverter } from '../utils/datetime-util'
|
|
@@ -30,6 +39,10 @@ export async function renderManifest({ manifestNo }, context: any) {
|
|
|
30
39
|
qb.innerJoinAndSelect('opk.releaseGood', 'rg').where('opk.manifest_id = :manifestId', { manifestId: manifest.id })
|
|
31
40
|
qb.innerJoinAndSelect('rg.bizplace', 'b')
|
|
32
41
|
|
|
42
|
+
if (context.query && context.query.biz !== 'null') {
|
|
43
|
+
qb.andWhere('b.name = :filter', { filter: context.query.biz })
|
|
44
|
+
}
|
|
45
|
+
|
|
33
46
|
qb.orderBy('opk.trackingNo')
|
|
34
47
|
|
|
35
48
|
const orderPackages: OrderPackage[] = await qb.getMany()
|
|
@@ -1,4 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
EntityManager,
|
|
3
|
+
getConnection,
|
|
4
|
+
Index,
|
|
5
|
+
ViewColumn,
|
|
6
|
+
ViewEntity
|
|
7
|
+
} from 'typeorm'
|
|
2
8
|
|
|
3
9
|
@ViewEntity({
|
|
4
10
|
materialized: true,
|
|
@@ -36,7 +42,9 @@ import { EntityManager, getConnection, Index, ViewColumn, ViewEntity } from 'typ
|
|
|
36
42
|
LEFT JOIN product_barcodes pb ON pb.product_detail_id = oi.product_detail_id
|
|
37
43
|
left join product_bundle_settings pbs on pbs.product_bundle_id = pb2.id and pbs.product_id = oi.product_id and pbs.product_detail_id = oi.product_detail_id
|
|
38
44
|
WHERE w.type::text = 'PICKING'::text AND w.status::text = 'EXECUTING'::text
|
|
39
|
-
|
|
45
|
+
GROUP BY oi.id, wd.id, w.id, op.id, pb.id, p.is_require_serial_number_scanning_outbound,i.id,rg.name,rg.ref_no
|
|
46
|
+
ORDER BY w.domain_id, w.bizplace_id, wd.id
|
|
47
|
+
`
|
|
40
48
|
})
|
|
41
49
|
export class ActiveWorksheetPickingView {
|
|
42
50
|
static async refreshView() {
|