@things-factory/operato-hub 4.3.511 → 4.3.512
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-release-order-details.js +43 -23
- package/dist-server/routers/api/restful-apis/v1/warehouse/get-release-order-details.js.map +1 -1
- package/package.json +14 -14
- package/server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts +46 -24
|
@@ -45,22 +45,52 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
|
|
|
45
45
|
]
|
|
46
46
|
});
|
|
47
47
|
if (!releaseGood)
|
|
48
|
-
throw new error_util_1.ApiError('E04', `release order: ${filter['name']}
|
|
48
|
+
throw new error_util_1.ApiError('E04', `release order: ${filter['name']} do not exist.`);
|
|
49
|
+
const rgOrderProducts = await (0, typeorm_1.getRepository)(sales_base_1.OrderProduct).createQueryBuilder('op')
|
|
50
|
+
.leftJoinAndSelect('products', 'p', 'p.id = op.product_id')
|
|
51
|
+
.leftJoinAndSelect('product_details', 'pd', 'pd.id = op.product_detail_id')
|
|
52
|
+
.leftJoinAndSelect('product_bundles', 'pdb', 'pdb.id = op.product_bundle_id')
|
|
53
|
+
.where('op.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood.id })
|
|
54
|
+
.orderBy('p.sku', 'ASC')
|
|
55
|
+
.orderBy('pd.name', 'ASC')
|
|
56
|
+
.getRawMany();
|
|
57
|
+
let orderProducts = rgOrderProducts.map(src => {
|
|
58
|
+
return {
|
|
59
|
+
id: src.op_id,
|
|
60
|
+
packingType: src.op_packing_type,
|
|
61
|
+
packingSize: src.op_packing_size,
|
|
62
|
+
batchId: src.op_batch_id,
|
|
63
|
+
releaseQty: src.op_release_qty,
|
|
64
|
+
product: src.p_id ? {
|
|
65
|
+
sku: src.p_sku,
|
|
66
|
+
productDetail: {
|
|
67
|
+
refCode: src.pd_ref_code,
|
|
68
|
+
name: src.pd_name
|
|
69
|
+
}
|
|
70
|
+
} : undefined,
|
|
71
|
+
productBundle: src.pdb_id ? {
|
|
72
|
+
sku: src.pdb_sku,
|
|
73
|
+
name: src.pdb_name
|
|
74
|
+
} : undefined
|
|
75
|
+
};
|
|
76
|
+
});
|
|
49
77
|
const rgOrderInventories = await (0, typeorm_1.getRepository)(sales_base_1.OrderInventory).createQueryBuilder('oi')
|
|
50
78
|
.leftJoinAndSelect('products', 'p', 'p.id = oi.product_id')
|
|
51
79
|
.leftJoinAndSelect('product_details', 'pd', 'pd.id = oi.product_detail_id')
|
|
52
|
-
.leftJoinAndSelect('
|
|
53
|
-
.leftJoinAndSelect('product_bundles', 'pdb', 'pdb.id = op.product_bundle_id')
|
|
80
|
+
.leftJoinAndSelect('inventories', 'inv', 'inv.id = oi.inventory_id')
|
|
54
81
|
.leftJoinAndSelect('delivery_orders', 'do', 'do.id = oi.delivery_order_id')
|
|
55
82
|
.where('oi.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood.id })
|
|
56
83
|
.orderBy('p.sku', 'ASC')
|
|
57
84
|
.orderBy('pd.name', 'ASC')
|
|
58
85
|
.getRawMany();
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
.
|
|
62
|
-
|
|
63
|
-
|
|
86
|
+
let rgOrderToteItems;
|
|
87
|
+
if (rgOrderInventories.length > 0) {
|
|
88
|
+
rgOrderToteItems = await (0, typeorm_1.getRepository)(sales_base_1.OrderToteItem).createQueryBuilder('oti')
|
|
89
|
+
.innerJoinAndSelect('oti.orderTote', 'ot')
|
|
90
|
+
.innerJoinAndSelect('ot.orderToteSeals', 'os')
|
|
91
|
+
.where('oti.order_inventory_id In (:...orderInventoryIds)', { orderInventoryIds: rgOrderInventories.map(src => src.oi_id) })
|
|
92
|
+
.getMany();
|
|
93
|
+
}
|
|
64
94
|
// create and format data response
|
|
65
95
|
let orderInventories = rgOrderInventories.map(src => {
|
|
66
96
|
return {
|
|
@@ -69,6 +99,8 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
|
|
|
69
99
|
packingType: src.oi_packing_type,
|
|
70
100
|
packingSize: src.oi_packing_size,
|
|
71
101
|
batchId: src.oi_batch_id,
|
|
102
|
+
palletId: src.inv_pallet_id,
|
|
103
|
+
cartonId: src.inv_carton_id,
|
|
72
104
|
product: {
|
|
73
105
|
sku: src.p_sku,
|
|
74
106
|
productDetail: {
|
|
@@ -80,20 +112,7 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
|
|
|
80
112
|
refCode: src.pd_ref_code,
|
|
81
113
|
name: src.pd_name
|
|
82
114
|
},
|
|
83
|
-
|
|
84
|
-
product: {
|
|
85
|
-
sku: src.p_sku,
|
|
86
|
-
productDetail: {
|
|
87
|
-
refCode: src.pd_ref_code,
|
|
88
|
-
name: src.pd_name
|
|
89
|
-
}
|
|
90
|
-
},
|
|
91
|
-
productBundle: {
|
|
92
|
-
sku: src.pdb_sku,
|
|
93
|
-
name: src.pdb_name
|
|
94
|
-
},
|
|
95
|
-
releaseQty: src.op_releaseQty
|
|
96
|
-
},
|
|
115
|
+
orderProducts: orderProducts.find(op => op.id === src.oi_order_product_id),
|
|
97
116
|
orderToteItems: rgOrderToteItems.filter(oti => oti.orderInventoryId === src.oi_id).map(oti => {
|
|
98
117
|
return {
|
|
99
118
|
qty: oti.qty,
|
|
@@ -223,7 +242,8 @@ api_1.restfulApiRouter.get('/v1/warehouse/get-release-order-details', middleware
|
|
|
223
242
|
phone2: releaseGood.phone2,
|
|
224
243
|
email: releaseGood.email
|
|
225
244
|
},
|
|
226
|
-
|
|
245
|
+
orderProducts: orderProducts.length > 0 ? orderProducts : null,
|
|
246
|
+
orderInventories: orderInventories.length > 0 ? orderInventories : null,
|
|
227
247
|
orderPackages: orderPackages.length > 0 ? orderPackages : null,
|
|
228
248
|
deliveryOrders: deliveryOrders.length > 0 ? deliveryOrders : null,
|
|
229
249
|
attachment: attachments.length > 0 ? attachments : null
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-release-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,qCAAqD;AAErD,6CAAgE;AAChE,qEAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"get-release-order-details.js","sourceRoot":"","sources":["../../../../../../server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,qCAAqD;AAErD,6CAAgE;AAChE,qEAA4D;AAC5D,2DAAoH;AAEpH,gDAA4F;AAC5F,oDAAyF;AAEzF,sBAAM,CAAC,GAAG,CACR,yCAAyC,EACzC,gCAAkB,EAClB,kCAAoB,EACpB,+BAAiB,EACjB,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IACtB,IAAI;QACF,uCAAuC;QACvC,kCAAkC;QAClC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAChC,IAAI,MAAM,mCAAQ,OAAO,CAAC,KAAK,KAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAE,CAAA;QACpD,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE;YAC/B,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC,CAAA;YACzC,OAAO,MAAM,CAAC,YAAY,CAAC,CAAA;SAC5B;QAED,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;QAED,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE;YAC5B,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAA;YACnC,OAAO,MAAM,CAAC,SAAS,CAAC,CAAA;SACzB;QAED,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE;YAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;YACrC,OAAO,MAAM,CAAC,UAAU,CAAC,CAAA;SAC1B;QAED,IAAI,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE;YAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;YACrC,OAAO,MAAM,CAAC,UAAU,CAAC,CAAA;SAC1B;QAED,MAAM,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE,MAAM;YACb,SAAS,EAAE;gBACT,eAAe;gBACf,iCAAiC;gBACjC,UAAU;aACX;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,qBAAQ,CAAC,KAAK,EAAE,kBAAkB,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;QAE7F,MAAM,eAAe,GAAU,MAAM,IAAA,uBAAa,EAAC,yBAAY,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC;aACtF,iBAAiB,CAAC,UAAU,EAAE,GAAG,EAAE,sBAAsB,CAAC;aAC1D,iBAAiB,CAAC,iBAAiB,EAAE,IAAI,EAAE,8BAA8B,CAAC;aAC1E,iBAAiB,CAAC,iBAAiB,EAAE,KAAK,EAAE,+BAA+B,CAAC;aAC5E,KAAK,CAAC,qCAAqC,EAAE,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC;aAC/E,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC;aACvB,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC;aACzB,UAAU,EAAE,CAAA;QAEf,IAAI,aAAa,GAAmB,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC5D,OAAO;gBACL,EAAE,EAAE,GAAG,CAAC,KAAK;gBACb,WAAW,EAAE,GAAG,CAAC,eAAe;gBAChC,WAAW,EAAE,GAAG,CAAC,eAAe;gBAChC,OAAO,EAAE,GAAG,CAAC,WAAW;gBACxB,UAAU,EAAE,GAAG,CAAC,cAAc;gBAC9B,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;oBAClB,GAAG,EAAE,GAAG,CAAC,KAAK;oBACd,aAAa,EAAE;wBACb,OAAO,EAAE,GAAG,CAAC,WAAW;wBACxB,IAAI,EAAE,GAAG,CAAC,OAAO;qBAClB;iBACF,CAAC,CAAC,CAAC,SAAS;gBACb,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;oBAC1B,GAAG,EAAE,GAAG,CAAC,OAAO;oBAChB,IAAI,EAAE,GAAG,CAAC,QAAQ;iBACnB,CAAC,CAAC,CAAC,SAAS;aACd,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,kBAAkB,GAAU,MAAM,IAAA,uBAAa,EAAC,2BAAc,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC;aAC3F,iBAAiB,CAAC,UAAU,EAAE,GAAG,EAAE,sBAAsB,CAAC;aAC1D,iBAAiB,CAAC,iBAAiB,EAAE,IAAI,EAAE,8BAA8B,CAAC;aAC1E,iBAAiB,CAAC,aAAa,EAAE,KAAK,EAAE,0BAA0B,CAAC;aACnE,iBAAiB,CAAC,iBAAiB,EAAE,IAAI,EAAE,8BAA8B,CAAC;aAC1E,KAAK,CAAC,qCAAqC,EAAE,EAAE,aAAa,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC;aAC/E,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC;aACvB,OAAO,CAAC,SAAS,EAAE,KAAK,CAAC;aACzB,UAAU,EAAE,CAAA;QAEf,IAAI,gBAAuB,CAAA;QAC3B,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;YACjC,gBAAgB,GAAG,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC;iBAC5E,kBAAkB,CAAC,eAAe,EAAE,IAAI,CAAC;iBACzC,kBAAkB,CAAC,mBAAmB,EAAE,IAAI,CAAC;iBAC7C,KAAK,CAAC,mDAAmD,EAAE,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;iBAC3H,OAAO,EAAE,CAAA;SACb;QAED,kCAAkC;QAClC,IAAI,gBAAgB,GAAqB,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YACpE,OAAO;gBACL,EAAE,EAAE,GAAG,CAAC,KAAK;gBACb,UAAU,EAAE,GAAG,CAAC,cAAc;gBAC9B,WAAW,EAAE,GAAG,CAAC,eAAe;gBAChC,WAAW,EAAE,GAAG,CAAC,eAAe;gBAChC,OAAO,EAAE,GAAG,CAAC,WAAW;gBACxB,QAAQ,EAAE,GAAG,CAAC,aAAa;gBAC3B,QAAQ,EAAE,GAAG,CAAC,aAAa;gBAC3B,OAAO,EAAE;oBACP,GAAG,EAAE,GAAG,CAAC,KAAK;oBACd,aAAa,EAAE;wBACb,OAAO,EAAE,GAAG,CAAC,WAAW;wBACxB,IAAI,EAAE,GAAG,CAAC,OAAO;qBAClB;iBACF;gBACD,aAAa,EAAE;oBACb,OAAO,EAAE,GAAG,CAAC,WAAW;oBACxB,IAAI,EAAE,GAAG,CAAC,OAAO;iBAClB;gBACD,aAAa,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,GAAG,CAAC,mBAAmB,CAAC;gBAC1E,cAAc,EAAE,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,gBAAgB,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBAC3F,OAAO;wBACL,GAAG,EAAE,GAAG,CAAC,GAAG;wBACZ,SAAS,EAAE;4BACT,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,IAAI;4BACxB,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gCACrD,OAAO;oCACL,IAAI,EAAE,GAAG,CAAC,IAAI;iCACf,CAAA;4BACH,CAAC,CAAC;yBACH;qBACF,CAAA;gBACH,CAAC,CAAC;gBACF,aAAa,EAAE;oBACb,EAAE,EAAE,GAAG,CAAC,KAAK;oBACb,IAAI,EAAE,GAAG,CAAC,OAAO;iBAClB;aACF,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,IAAI,aAAa,GAAG,EAAE,CAAA;QACtB,KAAK,MAAM,YAAY,IAAI,WAAW,CAAC,aAAa,EAAE;YACpD,MAAM,sBAAsB,GAAG;gBAC7B,iBAAiB,EAAE,YAAY,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBAC1D,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAA;gBACrG,CAAC,CAAC;gBACF,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,SAAS,EAAE,YAAY,CAAC,SAAS;gBACjC,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,UAAU,EAAE,YAAY,CAAC,UAAU;gBACnC,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,kBAAkB,EAAE,YAAY,CAAC,kBAAkB;aACpD,CAAA;YACD,aAAa,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;SAC3C;QAED,IAAI,cAAc,GAAoB,EAAE,CAAA;QACxC,cAAc,GAAG,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,IAAI,CAAC;YACvD,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE;YACtC,SAAS,EAAE;gBACT,iBAAiB;gBACjB,kBAAkB;gBAClB,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAA;QAEF,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;YAClD,OAAO;gBACL,EAAE,EAAE,aAAa,CAAC,EAAE;gBACpB,IAAI,EAAE,aAAa,CAAC,IAAI;gBACxB,EAAE,EAAE,aAAa,CAAC,EAAE;gBACpB,OAAO,EAAE,aAAa,CAAC,OAAO;gBAC9B,aAAa,EAAE,aAAa,CAAC,aAAa;gBAC1C,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,YAAY,EAAE,aAAa,CAAC,YAAY;gBACxC,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,MAAM,EAAE,aAAa,CAAC,MAAM;gBAC5B,MAAM,EAAE,aAAa,CAAC,MAAM;gBAC5B,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI;gBAC1G,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI;gBAC1G,SAAS,EAAE,aAAa,CAAC,SAAS;gBAClC,eAAe,EAAE,aAAa,CAAC,eAAe;oBAC5C,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE;oBACpF,CAAC,CAAC,IAAI;gBACR,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;oBAC9C,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,gBAAgB,CAAC,IAAI,EAAE;oBACtF,CAAC,CAAC,IAAI;gBACR,gBAAgB,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,KAAK,aAAa,CAAC,EAAE,CAAC,IAAI,IAAI;aAClG,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,IAAI,WAAW,GAAiB,EAAE,CAAA;QAClC,WAAW,GAAG,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,IAAI,CAAC;YACjD,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,EAAE,EAAE;SACjC,CAAC,CAAA;QAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBACzC,OAAO;oBACL,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,QAAQ,EAAE,GAAG,OAAO,CAAC,MAAM,eAAe,UAAU,CAAC,IAAI,EAAE;iBAC5D,CAAA;YACH,CAAC,CAAC,CAAA;SACH;QAED,MAAM,IAAI,GAAG;YACX,EAAE,EAAE,WAAW,CAAC,EAAE;YAClB,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,WAAW,EAAE,WAAW,CAAC,WAAW;YACpC,iBAAiB,EAAE,WAAW,CAAC,iBAAiB;YAChD,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,YAAY,EAAE,WAAW,CAAC,YAAY;YACtC,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,aAAa,EAAE,WAAW,CAAC,aAAa;YACxC,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,WAAW,EAAE,WAAW,CAAC,WAAW;YACpC,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,sBAAsB,EAAE,WAAW,CAAC,sBAAsB;YAC1D,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;YAC5B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,QAAQ,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE;YAC1E,MAAM,EAAE;gBACN,cAAc,EAAE,WAAW,CAAC,cAAc;aAC3C;YACD,SAAS,EAAE;gBACT,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,WAAW,EAAE,WAAW,CAAC,WAAW;gBACpC,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;gBAC9C,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,QAAQ,EAAE,WAAW,CAAC,QAAQ;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,KAAK,EAAE,WAAW,CAAC,KAAK;aACzB;YACD,aAAa,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI;YAC9D,gBAAgB,EAAE,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI;YACvE,aAAa,EAAE,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI;YAC9D,cAAc,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI;YACjE,UAAU,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI;SACxD,CAAA;QAED,OAAO,CAAC,IAAI,GAAG;YACb,IAAI;SACL,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"}
|
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.512",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -77,22 +77,22 @@
|
|
|
77
77
|
"@things-factory/i18n-base": "^4.3.434",
|
|
78
78
|
"@things-factory/import-ui": "^4.3.434",
|
|
79
79
|
"@things-factory/import-ui-excel": "^4.3.434",
|
|
80
|
-
"@things-factory/integration-accounting": "^4.3.
|
|
81
|
-
"@things-factory/integration-fulfillment": "^4.3.
|
|
82
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
83
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
84
|
-
"@things-factory/integration-pos": "^4.3.
|
|
85
|
-
"@things-factory/integration-powrup": "^4.3.
|
|
86
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
87
|
-
"@things-factory/integration-sftp": "^4.3.
|
|
80
|
+
"@things-factory/integration-accounting": "^4.3.512",
|
|
81
|
+
"@things-factory/integration-fulfillment": "^4.3.512",
|
|
82
|
+
"@things-factory/integration-lmd": "^4.3.512",
|
|
83
|
+
"@things-factory/integration-marketplace": "^4.3.512",
|
|
84
|
+
"@things-factory/integration-pos": "^4.3.512",
|
|
85
|
+
"@things-factory/integration-powrup": "^4.3.512",
|
|
86
|
+
"@things-factory/integration-sellercraft": "^4.3.512",
|
|
87
|
+
"@things-factory/integration-sftp": "^4.3.512",
|
|
88
88
|
"@things-factory/lite-menu": "^4.3.452",
|
|
89
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
89
|
+
"@things-factory/marketplace-base": "^4.3.512",
|
|
90
90
|
"@things-factory/more-ui": "^4.3.434",
|
|
91
91
|
"@things-factory/notification": "^4.3.452",
|
|
92
92
|
"@things-factory/pdf": "^4.3.381",
|
|
93
93
|
"@things-factory/product-ui": "^4.3.495",
|
|
94
94
|
"@things-factory/resource-ui": "^4.3.452",
|
|
95
|
-
"@things-factory/sales-base": "^4.3.
|
|
95
|
+
"@things-factory/sales-base": "^4.3.512",
|
|
96
96
|
"@things-factory/scene-data-transform": "^4.3.381",
|
|
97
97
|
"@things-factory/scene-excel": "^4.3.381",
|
|
98
98
|
"@things-factory/scene-firebase": "^4.3.381",
|
|
@@ -108,8 +108,8 @@
|
|
|
108
108
|
"@things-factory/shell": "^4.3.434",
|
|
109
109
|
"@things-factory/system-ui": "^4.3.434",
|
|
110
110
|
"@things-factory/transport-base": "^4.3.452",
|
|
111
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
112
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
111
|
+
"@things-factory/warehouse-base": "^4.3.512",
|
|
112
|
+
"@things-factory/worksheet-base": "^4.3.512",
|
|
113
113
|
"cron-parser": "^4.7.0",
|
|
114
114
|
"koa2-swagger-ui": "^5.0.2",
|
|
115
115
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -122,5 +122,5 @@
|
|
|
122
122
|
"resolutions": {
|
|
123
123
|
"core-js": "^3.16.0"
|
|
124
124
|
},
|
|
125
|
-
"gitHead": "
|
|
125
|
+
"gitHead": "4275f848e44681880ac2651ca4e630aa2b711edc"
|
|
126
126
|
}
|
|
@@ -3,7 +3,7 @@ import { getRepository, QueryBuilder } from 'typeorm'
|
|
|
3
3
|
|
|
4
4
|
import { restfulApiRouter as router } from '@things-factory/api'
|
|
5
5
|
import { Attachment } from '@things-factory/attachment-base'
|
|
6
|
-
import { DeliveryOrder, ReleaseGood, OrderInventory, OrderToteItem } from '@things-factory/sales-base'
|
|
6
|
+
import { DeliveryOrder, ReleaseGood, OrderProduct, OrderInventory, OrderToteItem } from '@things-factory/sales-base'
|
|
7
7
|
|
|
8
8
|
import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
|
|
9
9
|
import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
|
|
@@ -53,24 +53,56 @@ router.get(
|
|
|
53
53
|
]
|
|
54
54
|
})
|
|
55
55
|
|
|
56
|
-
if (!releaseGood) throw new ApiError('E04', `release order: ${filter['name']}
|
|
56
|
+
if (!releaseGood) throw new ApiError('E04', `release order: ${filter['name']} do not exist.`)
|
|
57
|
+
|
|
58
|
+
const rgOrderProducts: any[] = await getRepository(OrderProduct).createQueryBuilder('op')
|
|
59
|
+
.leftJoinAndSelect('products', 'p', 'p.id = op.product_id')
|
|
60
|
+
.leftJoinAndSelect('product_details', 'pd', 'pd.id = op.product_detail_id')
|
|
61
|
+
.leftJoinAndSelect('product_bundles', 'pdb', 'pdb.id = op.product_bundle_id')
|
|
62
|
+
.where('op.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood.id })
|
|
63
|
+
.orderBy('p.sku', 'ASC')
|
|
64
|
+
.orderBy('pd.name', 'ASC')
|
|
65
|
+
.getRawMany()
|
|
66
|
+
|
|
67
|
+
let orderProducts: OrderProduct[] = rgOrderProducts.map(src => {
|
|
68
|
+
return {
|
|
69
|
+
id: src.op_id,
|
|
70
|
+
packingType: src.op_packing_type,
|
|
71
|
+
packingSize: src.op_packing_size,
|
|
72
|
+
batchId: src.op_batch_id,
|
|
73
|
+
releaseQty: src.op_release_qty,
|
|
74
|
+
product: src.p_id ? {
|
|
75
|
+
sku: src.p_sku,
|
|
76
|
+
productDetail: {
|
|
77
|
+
refCode: src.pd_ref_code,
|
|
78
|
+
name: src.pd_name
|
|
79
|
+
}
|
|
80
|
+
} : undefined,
|
|
81
|
+
productBundle: src.pdb_id ? {
|
|
82
|
+
sku: src.pdb_sku,
|
|
83
|
+
name: src.pdb_name
|
|
84
|
+
} : undefined
|
|
85
|
+
}
|
|
86
|
+
})
|
|
57
87
|
|
|
58
88
|
const rgOrderInventories: any[] = await getRepository(OrderInventory).createQueryBuilder('oi')
|
|
59
89
|
.leftJoinAndSelect('products', 'p', 'p.id = oi.product_id')
|
|
60
90
|
.leftJoinAndSelect('product_details', 'pd', 'pd.id = oi.product_detail_id')
|
|
61
|
-
.leftJoinAndSelect('
|
|
62
|
-
.leftJoinAndSelect('product_bundles', 'pdb', 'pdb.id = op.product_bundle_id')
|
|
91
|
+
.leftJoinAndSelect('inventories', 'inv', 'inv.id = oi.inventory_id')
|
|
63
92
|
.leftJoinAndSelect('delivery_orders', 'do', 'do.id = oi.delivery_order_id')
|
|
64
93
|
.where('oi.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood.id })
|
|
65
94
|
.orderBy('p.sku', 'ASC')
|
|
66
95
|
.orderBy('pd.name', 'ASC')
|
|
67
96
|
.getRawMany()
|
|
68
97
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
.
|
|
72
|
-
|
|
73
|
-
|
|
98
|
+
let rgOrderToteItems: any[]
|
|
99
|
+
if (rgOrderInventories.length > 0) {
|
|
100
|
+
rgOrderToteItems = await getRepository(OrderToteItem).createQueryBuilder('oti')
|
|
101
|
+
.innerJoinAndSelect('oti.orderTote', 'ot')
|
|
102
|
+
.innerJoinAndSelect('ot.orderToteSeals', 'os')
|
|
103
|
+
.where('oti.order_inventory_id In (:...orderInventoryIds)', { orderInventoryIds: rgOrderInventories.map(src => src.oi_id) })
|
|
104
|
+
.getMany()
|
|
105
|
+
}
|
|
74
106
|
|
|
75
107
|
// create and format data response
|
|
76
108
|
let orderInventories: OrderInventory[] = rgOrderInventories.map(src => {
|
|
@@ -80,6 +112,8 @@ router.get(
|
|
|
80
112
|
packingType: src.oi_packing_type,
|
|
81
113
|
packingSize: src.oi_packing_size,
|
|
82
114
|
batchId: src.oi_batch_id,
|
|
115
|
+
palletId: src.inv_pallet_id,
|
|
116
|
+
cartonId: src.inv_carton_id,
|
|
83
117
|
product: {
|
|
84
118
|
sku: src.p_sku,
|
|
85
119
|
productDetail: {
|
|
@@ -91,20 +125,7 @@ router.get(
|
|
|
91
125
|
refCode: src.pd_ref_code,
|
|
92
126
|
name: src.pd_name
|
|
93
127
|
},
|
|
94
|
-
|
|
95
|
-
product: {
|
|
96
|
-
sku: src.p_sku,
|
|
97
|
-
productDetail: {
|
|
98
|
-
refCode: src.pd_ref_code,
|
|
99
|
-
name: src.pd_name
|
|
100
|
-
}
|
|
101
|
-
},
|
|
102
|
-
productBundle: {
|
|
103
|
-
sku: src.pdb_sku,
|
|
104
|
-
name: src.pdb_name
|
|
105
|
-
},
|
|
106
|
-
releaseQty: src.op_releaseQty
|
|
107
|
-
},
|
|
128
|
+
orderProducts: orderProducts.find(op => op.id === src.oi_order_product_id),
|
|
108
129
|
orderToteItems: rgOrderToteItems.filter(oti => oti.orderInventoryId === src.oi_id).map(oti => {
|
|
109
130
|
return {
|
|
110
131
|
qty: oti.qty,
|
|
@@ -240,7 +261,8 @@ router.get(
|
|
|
240
261
|
phone2: releaseGood.phone2,
|
|
241
262
|
email: releaseGood.email
|
|
242
263
|
},
|
|
243
|
-
|
|
264
|
+
orderProducts: orderProducts.length > 0 ? orderProducts : null,
|
|
265
|
+
orderInventories: orderInventories.length > 0 ? orderInventories : null,
|
|
244
266
|
orderPackages: orderPackages.length > 0 ? orderPackages : null,
|
|
245
267
|
deliveryOrders: deliveryOrders.length > 0 ? deliveryOrders : null,
|
|
246
268
|
attachment: attachments.length > 0 ? attachments : null
|