@things-factory/operato-hub 4.3.780 → 4.3.781
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/routers/api/restful-apis/v1/warehouse/get-delivery-order-list.js +4 -1
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-delivery-order-list.js.map +1 -1
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-draft-order-list.js +19 -74
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-draft-order-list.js.map +1 -1
- package/package.json +3 -3
- package/server/routers/api/restful-apis/v1/warehouse/get-delivery-order-list.ts +5 -1
- package/server/routers/api/restful-apis/v1/warehouse/get-draft-order-list.ts +20 -74
|
@@ -30,7 +30,10 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-delivery-order-list', middlewares_
|
|
|
30
30
|
delete filter['toDate'];
|
|
31
31
|
delete filter['limit'];
|
|
32
32
|
delete filter['offset'];
|
|
33
|
-
|
|
33
|
+
// Separate count (no JOINs needed — all filters are on delivery_orders columns)
|
|
34
|
+
const totalCount = await (0, typeorm_1.getRepository)(sales_base_1.DeliveryOrder).count({ where: filter });
|
|
35
|
+
// Data query with relations (paginated — only processes 'limit' rows)
|
|
36
|
+
const deliveryOrders = await (0, typeorm_1.getRepository)(sales_base_1.DeliveryOrder).find({
|
|
34
37
|
where: filter,
|
|
35
38
|
relations: [
|
|
36
39
|
'releaseGood',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-delivery-order-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-delivery-order-list.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,qCAAgD;AAEhD,6CAAgE;AAChE,2DAA0D;AAE1D,gDAA4F;AAC5F,oDAAyF;AAEzF,sBAAM,CAAC,GAAG,CACR,uCAAuC,EACvC,gCAAkB,EAClB,kCAAoB,EACpB,+BAAiB,EACjB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,IAAI;QACF,uCAAuC;QACvC,kCAAkC;QAClC,IAAI,MAAM,qBAAQ,OAAO,CAAC,KAAK,CAAE,CAAA;QACjC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;QAClD,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;QACzC,OAAO,MAAM,CAAC,YAAY,CAAC,CAAA;QAC3B,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YACzB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;YAC/B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;SACtB;QACD,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE;YAC9B,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAA;YACvC,OAAO,MAAM,CAAC,WAAW,CAAC,CAAA;SAC3B;QACD,MAAM,CAAC,WAAW,CAAC,GAAG,IAAA,iBAAO,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAE/C,OAAO,MAAM,CAAC,UAAU,CAAC,CAAA;QACzB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAA;QACvB,OAAO,MAAM,CAAC,OAAO,CAAC,CAAA;QACtB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAA;QACvB,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"get-delivery-order-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-delivery-order-list.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,qCAAgD;AAEhD,6CAAgE;AAChE,2DAA0D;AAE1D,gDAA4F;AAC5F,oDAAyF;AAEzF,sBAAM,CAAC,GAAG,CACR,uCAAuC,EACvC,gCAAkB,EAClB,kCAAoB,EACpB,+BAAiB,EACjB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,IAAI;QACF,uCAAuC;QACvC,kCAAkC;QAClC,IAAI,MAAM,qBAAQ,OAAO,CAAC,KAAK,CAAE,CAAA;QACjC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;QAClD,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;QACzC,OAAO,MAAM,CAAC,YAAY,CAAC,CAAA;QAC3B,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YACzB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,CAAA;YAC/B,OAAO,MAAM,CAAC,MAAM,CAAC,CAAA;SACtB;QACD,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE;YAC9B,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAA;YACvC,OAAO,MAAM,CAAC,WAAW,CAAC,CAAA;SAC3B;QACD,MAAM,CAAC,WAAW,CAAC,GAAG,IAAA,iBAAO,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAE/C,OAAO,MAAM,CAAC,UAAU,CAAC,CAAA;QACzB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAA;QACvB,OAAO,MAAM,CAAC,OAAO,CAAC,CAAA;QACtB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAA;QACvB,gFAAgF;QAChF,MAAM,UAAU,GAAW,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QAEtF,sEAAsE;QACtE,MAAM,cAAc,GAAoB,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,IAAI,CAAC;YAC9E,KAAK,EAAE,MAAM;YACb,SAAS,EAAE;gBACT,aAAa;gBACb,kBAAkB;gBAClB,0BAA0B;gBAC1B,iCAAiC;gBACjC,2CAA2C;gBAC3C,0DAA0D;gBAC1D,2BAA2B;gBAC3B,UAAU;gBACV,QAAQ;gBACR,iBAAiB;gBACjB,kBAAkB;aACnB;YACD,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;SAC7B,CAAC,CAAA;QAEF,kCAAkC;QAClC,IAAI,IAAI,GAAG,EAAE,CAAA;QACb,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE;YAC1C,IAAI,gBAAgB,GAAG,EAAE,CAAA;YACzB,KAAK,MAAM,cAAc,IAAI,aAAa,CAAC,gBAAgB,EAAE;gBAC3D,IAAI,EAAE,GAAG;oBACP,OAAO,EAAE,cAAc,CAAC,OAAO;oBAC/B,UAAU,EAAE,cAAc,CAAC,UAAU;oBACrC,WAAW,EAAE,cAAc,CAAC,WAAW;oBACvC,WAAW,EAAE,cAAc,CAAC,WAAW;oBACvC,GAAG,EAAE,cAAc,CAAC,GAAG;oBACvB,UAAU,EAAE,cAAc,CAAC,UAAU;oBACrC,eAAe,EAAE,cAAc,CAAC,eAAe;oBAC/C,OAAO,EAAE;wBACP,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG;wBAC/B,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI;wBACjC,WAAW,EAAE,cAAc,CAAC,OAAO,CAAC,WAAW;wBAC/C,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,KAAK;wBACnC,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,QAAQ;wBACzC,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI;qBAClC;oBACD,cAAc,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;wBACtD,OAAO;4BACL,GAAG,EAAE,GAAG,CAAC,GAAG;4BACZ,SAAS,EAAE;gCACT,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI;gCACxB,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oCACrD,OAAO;wCACL,IAAI,EAAE,GAAG,CAAC,IAAI;qCACf,CAAA;gCACH,CAAC,CAAC;6BACH;yBACF,CAAA;oBACH,CAAC,CAAC;iBACH,CAAA;gBACD,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;aAC1B;YACD,MAAM,SAAS,GAAG;gBAChB,EAAE,EAAE,aAAa,CAAC,EAAE;gBACpB,IAAI,EAAE,aAAa,CAAC,IAAI;gBACxB,IAAI,EAAE,aAAa,CAAC,IAAI;gBACxB,EAAE,EAAE,aAAa,CAAC,EAAE;gBACpB,iBAAiB,EAAE,aAAa,CAAC,iBAAiB;gBAClD,OAAO,EAAE,aAAa,CAAC,OAAO;gBAC9B,eAAe,EAAE,aAAa,CAAC,eAAe;oBAC5C,CAAC,CAAC;wBACE,EAAE,EAAE,aAAa,CAAC,eAAe,CAAC,EAAE;wBACpC,IAAI,EAAE,aAAa,CAAC,eAAe,CAAC,IAAI;wBACxC,UAAU,EAAE,aAAa,CAAC,eAAe,CAAC,UAAU;qBACrD;oBACH,CAAC,CAAC,IAAI;gBACR,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;oBAC9C,CAAC,CAAC;wBACE,EAAE,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAAE;wBACrC,IAAI,EAAE,aAAa,CAAC,gBAAgB,CAAC,IAAI;qBAC1C;oBACH,CAAC,CAAC,IAAI;gBACR,WAAW,EAAE,aAAa,CAAC,WAAW;gBACtC,YAAY,EAAE,aAAa,CAAC,YAAY;gBACxC,MAAM,EAAE,aAAa,CAAC,MAAM;gBAC5B,aAAa,EAAE,aAAa,CAAC,aAAa;gBAC1C,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;gBAChD,UAAU,EAAE,aAAa,CAAC,UAAU;gBACpC,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,OAAO,EAAE,aAAa,CAAC,OAAO;gBAC9B,KAAK,EAAE,aAAa,CAAC,KAAK;gBAC1B,KAAK,EAAE,aAAa,CAAC,KAAK;gBAC1B,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,MAAM,EAAE,aAAa,CAAC,MAAM;gBAC5B,WAAW,EAAE,aAAa,CAAC,WAAW;gBACtC,cAAc,EAAE,aAAa,CAAC,cAAc;gBAC5C,WAAW,EAAE,aAAa,CAAC,WAAW;gBACtC,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;gBAChD,sBAAsB;gBACtB,IAAI,EAAE,aAAa,CAAC,IAAI;gBACxB,OAAO,EAAE,aAAa,CAAC,OAAO;gBAC9B,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;gBAChD,MAAM,EAAE,aAAa,CAAC,MAAM;gBAC5B,UAAU,EAAE,aAAa,CAAC,UAAU;gBACpC,KAAK,EAAE,aAAa,CAAC,KAAK;gBAC1B,cAAc,EAAE,aAAa,CAAC,cAAc;gBAC5C,WAAW,EAAE,aAAa,CAAC,WAAW;gBACtC,cAAc,EAAE,aAAa,CAAC,cAAc;gBAC5C,iBAAiB,EAAE,aAAa,CAAC,iBAAiB;gBAClD,YAAY,EAAE,aAAa,CAAC,YAAY;gBACxC,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,QAAQ,EAAE;oBACR,EAAE,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE;oBAC7B,IAAI,EAAE,aAAa,CAAC,QAAQ,CAAC,IAAI;oBACjC,WAAW,EAAE,aAAa,CAAC,QAAQ,CAAC,WAAW;iBAChD;gBACD,MAAM,EAAE;oBACN,EAAE,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE;oBAC3B,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI;iBAChC;gBACD,WAAW,EAAE;oBACX,EAAE,EAAE,aAAa,CAAC,WAAW,CAAC,EAAE;oBAChC,IAAI,EAAE,aAAa,CAAC,WAAW,CAAC,IAAI;oBACpC,WAAW,EAAE,aAAa,CAAC,WAAW,CAAC,WAAW;oBAClD,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,MAAM;oBACxC,KAAK,EAAE,aAAa,CAAC,WAAW,CAAC,KAAK;oBACtC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,MAAM;oBACxC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,MAAM;oBACxC,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,OAAO;oBAC1C,YAAY,EAAE,aAAa,CAAC,WAAW,CAAC,YAAY;oBACpD,YAAY,EAAE,aAAa,CAAC,WAAW,CAAC,YAAY;oBACpD,YAAY,EAAE,aAAa,CAAC,WAAW,CAAC,YAAY;oBACpD,eAAe,EAAE,aAAa,CAAC,WAAW,CAAC,eAAe;oBAC1D,WAAW,EAAE,aAAa,CAAC,WAAW,CAAC,WAAW;oBAClD,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,MAAM;oBACxC,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,aAAa;oBACtD,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,aAAa;oBACtD,IAAI,EAAE,aAAa,CAAC,WAAW,CAAC,IAAI;oBACpC,UAAU,EAAE,aAAa,CAAC,WAAW,CAAC,UAAU;oBAChD,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC,SAAS;oBAC9C,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC,SAAS;oBAC9C,sBAAsB,EAAE,aAAa,CAAC,WAAW,CAAC,sBAAsB;oBACxE,cAAc,EAAE,aAAa,CAAC,WAAW,CAAC,cAAc;oBACxD,gBAAgB,EAAE,aAAa,CAAC,WAAW,CAAC,gBAAgB;oBAC5D,gBAAgB,EAAE,aAAa,CAAC,WAAW,CAAC,gBAAgB;oBAC5D,gBAAgB,EAAE,aAAa,CAAC,WAAW,CAAC,gBAAgB;oBAC5D,gBAAgB,EAAE,aAAa,CAAC,WAAW,CAAC,gBAAgB;oBAC5D,gBAAgB,EAAE,aAAa,CAAC,WAAW,CAAC,gBAAgB;oBAC5D,WAAW,EAAE,aAAa,CAAC,WAAW,CAAC,WAAW;oBAClD,gBAAgB,EAAE,aAAa,CAAC,WAAW,CAAC,gBAAgB;oBAC5D,IAAI,EAAE,aAAa,CAAC,WAAW,CAAC,IAAI;oBACpC,KAAK,EAAE,aAAa,CAAC,WAAW,CAAC,KAAK;oBACtC,UAAU,EAAE,aAAa,CAAC,WAAW,CAAC,UAAU;oBAChD,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,OAAO;oBAC1C,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,MAAM;oBACxC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,MAAM;oBACxC,KAAK,EAAE,aAAa,CAAC,WAAW,CAAC,KAAK;oBACtC,WAAW,EAAE,aAAa,CAAC,WAAW,CAAC,WAAW;oBAClD,UAAU,EAAE,aAAa,CAAC,WAAW,CAAC,UAAU;oBAChD,UAAU,EAAE,aAAa,CAAC,WAAW,CAAC,UAAU;oBAChD,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,OAAO;oBAC1C,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,aAAa;oBACtD,UAAU,EAAE,aAAa,CAAC,WAAW,CAAC,UAAU;oBAChD,YAAY,EAAE,aAAa,CAAC,WAAW,CAAC,YAAY;oBACpD,cAAc,EAAE,aAAa,CAAC,WAAW,CAAC,cAAc;oBACxD,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC,SAAS;oBAC9C,aAAa,EAAE,EAAE;oBACjB,aAAa,EAAE,aAAa,CAAC,WAAW,CAAC,aAAa;wBACpD,CAAC,CAAC;4BACE,oBAAoB,EAAE,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,oBAAoB;4BAClF,oBAAoB,EAAE,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,oBAAoB;4BAClF,WAAW,EAAE,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,WAAW;4BAChE,QAAQ,EAAE,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ;yBAC3D;wBACH,CAAC,CAAC,IAAI;iBACT;gBACD,gBAAgB;aACjB,CAAA;YACD,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;SACrB;QAED,OAAO,CAAC,IAAI,GAAG;YACb,IAAI;YACJ,UAAU;YACV,KAAK;YACL,MAAM;SACP,CAAA;KACF;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,CAAC,YAAY,qBAAQ;YAAE,IAAA,4BAAe,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;;YACjD,IAAA,qCAAwB,EAAC,OAAO,EAAE,CAAC,CAAC,CAAA;KAC1C;AACH,CAAC,CACF,CAAA"}
|
|
@@ -39,6 +39,24 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-draft-order-list', middlewares_1.b
|
|
|
39
39
|
delete filter['toDate'];
|
|
40
40
|
delete filter['limit'];
|
|
41
41
|
delete filter['offset'];
|
|
42
|
+
// Separate count query (no JOINs needed — all filters are on draft_release_goods columns)
|
|
43
|
+
const countQb = (0, typeorm_1.getRepository)(sales_base_1.DraftReleaseGood).createQueryBuilder('drg');
|
|
44
|
+
for (const key in filter) {
|
|
45
|
+
if (filter.hasOwnProperty(key)) {
|
|
46
|
+
const value = filter[key];
|
|
47
|
+
if (value) {
|
|
48
|
+
if (value._type == 'between') {
|
|
49
|
+
countQb.andWhere(`drg.${key} BETWEEN :from AND :to`, { from: value._value[0], to: value._value[1] });
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
const valueParamName = `value_${key}`;
|
|
53
|
+
countQb.andWhere(`drg.${key} = :${valueParamName}`, { [valueParamName]: value });
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
const totalCount = await countQb.getCount();
|
|
59
|
+
// Data query with relations (paginated — only processes 'limit' rows)
|
|
42
60
|
const qb = (0, typeorm_1.getRepository)(sales_base_1.DraftReleaseGood).createQueryBuilder('drg');
|
|
43
61
|
qb.innerJoinAndSelect('drg.bizplace', 'b')
|
|
44
62
|
.innerJoinAndSelect('drg.orderProducts', 'op')
|
|
@@ -57,17 +75,13 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-draft-order-list', middlewares_1.b
|
|
|
57
75
|
qb.andWhere(`drg.${key} BETWEEN :from AND :to`, { from: value._value[0], to: value._value[1] });
|
|
58
76
|
}
|
|
59
77
|
else {
|
|
60
|
-
// if (key == 'bizplace') {
|
|
61
|
-
// qb.andWhere(`b.${id} = :value`, { value })
|
|
62
|
-
// }
|
|
63
78
|
const valueParamName = `value_${key}`;
|
|
64
79
|
qb.andWhere(`drg.${key} = :${valueParamName}`, { [valueParamName]: value });
|
|
65
80
|
}
|
|
66
81
|
}
|
|
67
82
|
}
|
|
68
83
|
}
|
|
69
|
-
const
|
|
70
|
-
// const totalCount = draftReleaseGoods.length
|
|
84
|
+
const draftReleaseGoods = await qb.getMany();
|
|
71
85
|
// create and format data response
|
|
72
86
|
let data = [];
|
|
73
87
|
data = await Promise.all(draftReleaseGoods.map(async (draftReleaseGood) => {
|
|
@@ -141,75 +155,6 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-draft-order-list', middlewares_1.b
|
|
|
141
155
|
};
|
|
142
156
|
return datapoint;
|
|
143
157
|
}));
|
|
144
|
-
// for (const draftReleaseGood of draftReleaseGoods) {
|
|
145
|
-
// let orderProducts = []
|
|
146
|
-
// for (const orderProduct of draftReleaseGood.orderProducts) {
|
|
147
|
-
// const orderProductsDataPoint = {
|
|
148
|
-
// product: {
|
|
149
|
-
// sku: orderProduct?.productBundle ? orderProduct.productBundle?.sku : orderProduct?.product?.sku
|
|
150
|
-
// },
|
|
151
|
-
// productDetail: {
|
|
152
|
-
// refCode: orderProduct.productDetail?.refCode
|
|
153
|
-
// },
|
|
154
|
-
// packingType: orderProduct.packingType,
|
|
155
|
-
// releaseQty: orderProduct.releaseQty,
|
|
156
|
-
// packingSize: orderProduct.packingSize,
|
|
157
|
-
// status: await orderProductStatus(orderProduct, draftReleaseGood)
|
|
158
|
-
// }
|
|
159
|
-
// orderProducts.push(orderProductsDataPoint)
|
|
160
|
-
// }
|
|
161
|
-
// const datapoint = {
|
|
162
|
-
// id: draftReleaseGood.id,
|
|
163
|
-
// name: draftReleaseGood.name,
|
|
164
|
-
// draftOrderNo: draftReleaseGood.draftOrderNo,
|
|
165
|
-
// refNo: draftReleaseGood.refNo,
|
|
166
|
-
// refNo2: draftReleaseGood.refNo2,
|
|
167
|
-
// refNo3: draftReleaseGood.refNo3,
|
|
168
|
-
// refOrderId: draftReleaseGood.refOrderId,
|
|
169
|
-
// type: draftReleaseGood.type,
|
|
170
|
-
// releaseDate: draftReleaseGood.releaseDate,
|
|
171
|
-
// collectionOrderNo: draftReleaseGood.collectionOrderNo,
|
|
172
|
-
// ownTransport: draftReleaseGood.ownTransport,
|
|
173
|
-
// exportOption: draftReleaseGood.exportOption,
|
|
174
|
-
// packingOption: draftReleaseGood.packingOption,
|
|
175
|
-
// courierOption: draftReleaseGood.courierOption,
|
|
176
|
-
// codOption: draftReleaseGood.codOption,
|
|
177
|
-
// lmdOption: draftReleaseGood.lmdOption,
|
|
178
|
-
// storeName: draftReleaseGood.storeName,
|
|
179
|
-
// storeId: draftReleaseGood.storeId,
|
|
180
|
-
// routeId: draftReleaseGood.routeId,
|
|
181
|
-
// stopId: draftReleaseGood.stopId,
|
|
182
|
-
// status: await draftReleaseGoodStatus(draftReleaseGood.bizplace.id, draftReleaseGood),
|
|
183
|
-
// releaseGood: draftReleaseGood.releaseGood
|
|
184
|
-
// ? {
|
|
185
|
-
// id: draftReleaseGood.releaseGood[0]?.id,
|
|
186
|
-
// name: draftReleaseGood.releaseGood[0]?.name
|
|
187
|
-
// }
|
|
188
|
-
// : null,
|
|
189
|
-
// billTo: {
|
|
190
|
-
// billingAddress: draftReleaseGood.billingAddress
|
|
191
|
-
// },
|
|
192
|
-
// deliverTo: {
|
|
193
|
-
// deliveryAddress1: draftReleaseGood.deliveryAddress1,
|
|
194
|
-
// deliveryAddress2: draftReleaseGood.deliveryAddress2,
|
|
195
|
-
// deliveryAddress3: draftReleaseGood.deliveryAddress3,
|
|
196
|
-
// deliveryAddress4: draftReleaseGood.deliveryAddress4,
|
|
197
|
-
// deliveryAddress5: draftReleaseGood.deliveryAddress5,
|
|
198
|
-
// attentionTo: draftReleaseGood.attentionTo,
|
|
199
|
-
// attentionCompany: draftReleaseGood.attentionCompany,
|
|
200
|
-
// city: draftReleaseGood.city,
|
|
201
|
-
// district: draftReleaseGood.district,
|
|
202
|
-
// state: draftReleaseGood.state,
|
|
203
|
-
// postalCode: draftReleaseGood.postalCode,
|
|
204
|
-
// country: draftReleaseGood.country,
|
|
205
|
-
// phone1: draftReleaseGood.phone1,
|
|
206
|
-
// phone2: draftReleaseGood.phone2,
|
|
207
|
-
// email: draftReleaseGood.email
|
|
208
|
-
// },
|
|
209
|
-
// orderProducts
|
|
210
|
-
// }
|
|
211
|
-
// data.push(datapoint)
|
|
212
|
-
// }
|
|
213
158
|
context.body = {
|
|
214
159
|
data,
|
|
215
160
|
totalCount,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-draft-order-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-draft-order-list.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"get-draft-order-list.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-draft-order-list.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.781",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -110,7 +110,7 @@
|
|
|
110
110
|
"@things-factory/system-ui": "^4.3.767",
|
|
111
111
|
"@things-factory/transport-base": "^4.3.767",
|
|
112
112
|
"@things-factory/warehouse-base": "^4.3.780",
|
|
113
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
113
|
+
"@things-factory/worksheet-base": "^4.3.781",
|
|
114
114
|
"cron-parser": "^4.7.0",
|
|
115
115
|
"koa2-swagger-ui": "^5.0.2",
|
|
116
116
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -123,5 +123,5 @@
|
|
|
123
123
|
"resolutions": {
|
|
124
124
|
"core-js": "^3.16.0"
|
|
125
125
|
},
|
|
126
|
-
"gitHead": "
|
|
126
|
+
"gitHead": "c458ec42a3e32341a04c27e382e5604d51a3dc59"
|
|
127
127
|
}
|
|
@@ -34,7 +34,11 @@ router.get(
|
|
|
34
34
|
delete filter['toDate']
|
|
35
35
|
delete filter['limit']
|
|
36
36
|
delete filter['offset']
|
|
37
|
-
|
|
37
|
+
// Separate count (no JOINs needed — all filters are on delivery_orders columns)
|
|
38
|
+
const totalCount: number = await getRepository(DeliveryOrder).count({ where: filter })
|
|
39
|
+
|
|
40
|
+
// Data query with relations (paginated — only processes 'limit' rows)
|
|
41
|
+
const deliveryOrders: DeliveryOrder[] = await getRepository(DeliveryOrder).find({
|
|
38
42
|
where: filter,
|
|
39
43
|
relations: [
|
|
40
44
|
'releaseGood',
|
|
@@ -49,6 +49,24 @@ router.get(
|
|
|
49
49
|
delete filter['limit']
|
|
50
50
|
delete filter['offset']
|
|
51
51
|
|
|
52
|
+
// Separate count query (no JOINs needed — all filters are on draft_release_goods columns)
|
|
53
|
+
const countQb: SelectQueryBuilder<DraftReleaseGood> = getRepository(DraftReleaseGood).createQueryBuilder('drg')
|
|
54
|
+
for (const key in filter) {
|
|
55
|
+
if (filter.hasOwnProperty(key)) {
|
|
56
|
+
const value = filter[key]
|
|
57
|
+
if (value) {
|
|
58
|
+
if (value._type == 'between') {
|
|
59
|
+
countQb.andWhere(`drg.${key} BETWEEN :from AND :to`, { from: value._value[0], to: value._value[1] })
|
|
60
|
+
} else {
|
|
61
|
+
const valueParamName = `value_${key}`
|
|
62
|
+
countQb.andWhere(`drg.${key} = :${valueParamName}`, { [valueParamName]: value })
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
const totalCount: number = await countQb.getCount()
|
|
68
|
+
|
|
69
|
+
// Data query with relations (paginated — only processes 'limit' rows)
|
|
52
70
|
const qb: SelectQueryBuilder<DraftReleaseGood> = getRepository(DraftReleaseGood).createQueryBuilder('drg')
|
|
53
71
|
qb.innerJoinAndSelect('drg.bizplace', 'b')
|
|
54
72
|
.innerJoinAndSelect('drg.orderProducts', 'op')
|
|
@@ -67,9 +85,6 @@ router.get(
|
|
|
67
85
|
if (value._type == 'between') {
|
|
68
86
|
qb.andWhere(`drg.${key} BETWEEN :from AND :to`, { from: value._value[0], to: value._value[1] })
|
|
69
87
|
} else {
|
|
70
|
-
// if (key == 'bizplace') {
|
|
71
|
-
// qb.andWhere(`b.${id} = :value`, { value })
|
|
72
|
-
// }
|
|
73
88
|
const valueParamName = `value_${key}`
|
|
74
89
|
qb.andWhere(`drg.${key} = :${valueParamName}`, { [valueParamName]: value })
|
|
75
90
|
}
|
|
@@ -77,8 +92,7 @@ router.get(
|
|
|
77
92
|
}
|
|
78
93
|
}
|
|
79
94
|
|
|
80
|
-
const
|
|
81
|
-
// const totalCount = draftReleaseGoods.length
|
|
95
|
+
const draftReleaseGoods: DraftReleaseGood[] = await qb.getMany()
|
|
82
96
|
|
|
83
97
|
// create and format data response
|
|
84
98
|
let data = []
|
|
@@ -154,75 +168,7 @@ router.get(
|
|
|
154
168
|
return datapoint
|
|
155
169
|
})
|
|
156
170
|
)
|
|
157
|
-
|
|
158
|
-
// let orderProducts = []
|
|
159
|
-
// for (const orderProduct of draftReleaseGood.orderProducts) {
|
|
160
|
-
// const orderProductsDataPoint = {
|
|
161
|
-
// product: {
|
|
162
|
-
// sku: orderProduct?.productBundle ? orderProduct.productBundle?.sku : orderProduct?.product?.sku
|
|
163
|
-
// },
|
|
164
|
-
// productDetail: {
|
|
165
|
-
// refCode: orderProduct.productDetail?.refCode
|
|
166
|
-
// },
|
|
167
|
-
// packingType: orderProduct.packingType,
|
|
168
|
-
// releaseQty: orderProduct.releaseQty,
|
|
169
|
-
// packingSize: orderProduct.packingSize,
|
|
170
|
-
// status: await orderProductStatus(orderProduct, draftReleaseGood)
|
|
171
|
-
// }
|
|
172
|
-
// orderProducts.push(orderProductsDataPoint)
|
|
173
|
-
// }
|
|
174
|
-
// const datapoint = {
|
|
175
|
-
// id: draftReleaseGood.id,
|
|
176
|
-
// name: draftReleaseGood.name,
|
|
177
|
-
// draftOrderNo: draftReleaseGood.draftOrderNo,
|
|
178
|
-
// refNo: draftReleaseGood.refNo,
|
|
179
|
-
// refNo2: draftReleaseGood.refNo2,
|
|
180
|
-
// refNo3: draftReleaseGood.refNo3,
|
|
181
|
-
// refOrderId: draftReleaseGood.refOrderId,
|
|
182
|
-
// type: draftReleaseGood.type,
|
|
183
|
-
// releaseDate: draftReleaseGood.releaseDate,
|
|
184
|
-
// collectionOrderNo: draftReleaseGood.collectionOrderNo,
|
|
185
|
-
// ownTransport: draftReleaseGood.ownTransport,
|
|
186
|
-
// exportOption: draftReleaseGood.exportOption,
|
|
187
|
-
// packingOption: draftReleaseGood.packingOption,
|
|
188
|
-
// courierOption: draftReleaseGood.courierOption,
|
|
189
|
-
// codOption: draftReleaseGood.codOption,
|
|
190
|
-
// lmdOption: draftReleaseGood.lmdOption,
|
|
191
|
-
// storeName: draftReleaseGood.storeName,
|
|
192
|
-
// storeId: draftReleaseGood.storeId,
|
|
193
|
-
// routeId: draftReleaseGood.routeId,
|
|
194
|
-
// stopId: draftReleaseGood.stopId,
|
|
195
|
-
// status: await draftReleaseGoodStatus(draftReleaseGood.bizplace.id, draftReleaseGood),
|
|
196
|
-
// releaseGood: draftReleaseGood.releaseGood
|
|
197
|
-
// ? {
|
|
198
|
-
// id: draftReleaseGood.releaseGood[0]?.id,
|
|
199
|
-
// name: draftReleaseGood.releaseGood[0]?.name
|
|
200
|
-
// }
|
|
201
|
-
// : null,
|
|
202
|
-
// billTo: {
|
|
203
|
-
// billingAddress: draftReleaseGood.billingAddress
|
|
204
|
-
// },
|
|
205
|
-
// deliverTo: {
|
|
206
|
-
// deliveryAddress1: draftReleaseGood.deliveryAddress1,
|
|
207
|
-
// deliveryAddress2: draftReleaseGood.deliveryAddress2,
|
|
208
|
-
// deliveryAddress3: draftReleaseGood.deliveryAddress3,
|
|
209
|
-
// deliveryAddress4: draftReleaseGood.deliveryAddress4,
|
|
210
|
-
// deliveryAddress5: draftReleaseGood.deliveryAddress5,
|
|
211
|
-
// attentionTo: draftReleaseGood.attentionTo,
|
|
212
|
-
// attentionCompany: draftReleaseGood.attentionCompany,
|
|
213
|
-
// city: draftReleaseGood.city,
|
|
214
|
-
// district: draftReleaseGood.district,
|
|
215
|
-
// state: draftReleaseGood.state,
|
|
216
|
-
// postalCode: draftReleaseGood.postalCode,
|
|
217
|
-
// country: draftReleaseGood.country,
|
|
218
|
-
// phone1: draftReleaseGood.phone1,
|
|
219
|
-
// phone2: draftReleaseGood.phone2,
|
|
220
|
-
// email: draftReleaseGood.email
|
|
221
|
-
// },
|
|
222
|
-
// orderProducts
|
|
223
|
-
// }
|
|
224
|
-
// data.push(datapoint)
|
|
225
|
-
// }
|
|
171
|
+
|
|
226
172
|
context.body = {
|
|
227
173
|
data,
|
|
228
174
|
totalCount,
|