@things-factory/worksheet-base 4.3.211 → 4.3.213
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/inbound/putaway-worksheet-controller.js +11 -9
- package/dist-server/controllers/inbound/putaway-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js +77 -98
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +28 -8
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js +4 -2
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/putaway/putaway.js +3 -1
- package/dist-server/graphql/resolvers/worksheet/putaway/putaway.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/putaway-worksheet.js +86 -49
- package/dist-server/graphql/resolvers/worksheet/putaway-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading/unload.js +5 -3
- package/dist-server/graphql/resolvers/worksheet/unloading/unload.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading-worksheet.js +84 -74
- package/dist-server/graphql/resolvers/worksheet/unloading-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/worksheet.js +116 -0
- package/dist-server/graphql/resolvers/worksheet/worksheet.js.map +1 -1
- package/dist-server/graphql/types/worksheet/index.js +10 -4
- package/dist-server/graphql/types/worksheet/index.js.map +1 -1
- package/dist-server/graphql/types/worksheet/worksheet-detail-info.js +4 -0
- package/dist-server/graphql/types/worksheet/worksheet-detail-info.js.map +1 -1
- package/dist-server/utils/lmd-util.js +24 -8
- package/dist-server/utils/lmd-util.js.map +1 -1
- package/package.json +8 -8
- package/server/controllers/inbound/putaway-worksheet-controller.ts +12 -9
- package/server/controllers/inbound/unloading-worksheet-controller.ts +150 -130
- package/server/controllers/worksheet-controller.ts +28 -8
- package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts +6 -2
- package/server/graphql/resolvers/worksheet/putaway/putaway.ts +5 -1
- package/server/graphql/resolvers/worksheet/putaway-worksheet.ts +92 -46
- package/server/graphql/resolvers/worksheet/unloading/unload.ts +8 -4
- package/server/graphql/resolvers/worksheet/unloading-worksheet.ts +100 -82
- package/server/graphql/resolvers/worksheet/worksheet.ts +134 -0
- package/server/graphql/types/worksheet/index.ts +11 -5
- package/server/graphql/types/worksheet/worksheet-detail-info.ts +4 -0
- package/server/utils/lmd-util.ts +38 -26
|
@@ -258,6 +258,122 @@ exports.worksheetResolver = {
|
|
|
258
258
|
});
|
|
259
259
|
}
|
|
260
260
|
return worksheet;
|
|
261
|
+
},
|
|
262
|
+
async inboundWorksheetDetails(_, { name }, context) {
|
|
263
|
+
var _a, _b, _c;
|
|
264
|
+
const { domain } = context.state;
|
|
265
|
+
let qbWorksheet = (0, typeorm_1.getRepository)(entities_1.Worksheet)
|
|
266
|
+
.createQueryBuilder('w')
|
|
267
|
+
.select('w')
|
|
268
|
+
.addSelect('bizplace.id')
|
|
269
|
+
.addSelect('bizplace.name')
|
|
270
|
+
.addSelect('bizplaceDomain.id')
|
|
271
|
+
.addSelect('bizplaceDomain.name')
|
|
272
|
+
.addSelect('bufferLocation.name')
|
|
273
|
+
.addSelect('bufferLocationWarehouse.name')
|
|
274
|
+
.leftJoinAndSelect('w.domain', 'domain')
|
|
275
|
+
.leftJoin('w.bizplace', 'bizplace')
|
|
276
|
+
.leftJoin('bizplace.domain', 'bizplaceDomain')
|
|
277
|
+
.leftJoin('w.bufferLocation', 'bufferLocation')
|
|
278
|
+
.leftJoin('bufferLocation.warehouse', 'bufferLocationWarehouse')
|
|
279
|
+
.leftJoinAndSelect('w.arrivalNotice', 'arrivalNotice')
|
|
280
|
+
.leftJoinAndSelect('w.vasOrder', 'vasOrder')
|
|
281
|
+
.where('w.domain_id = :domain', { domain: domain.id })
|
|
282
|
+
.andWhere('w.name = :name', { name: name });
|
|
283
|
+
let foundWorksheet = await qbWorksheet.getOne();
|
|
284
|
+
let qbWorksheetDetails = (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).createQueryBuilder('worksheetDetails');
|
|
285
|
+
let worksheetDetails = [];
|
|
286
|
+
if (foundWorksheet.type === 'UNLOADING') {
|
|
287
|
+
qbWorksheetDetails.select('worksheetDetails')
|
|
288
|
+
.leftJoinAndSelect('worksheetDetails.targetProduct', 'targetProduct')
|
|
289
|
+
.leftJoinAndSelect('targetProduct.product', 'product')
|
|
290
|
+
.where('worksheetDetails.worksheet_id =:worksheetId', { worksheetId: foundWorksheet.id });
|
|
291
|
+
worksheetDetails = await qbWorksheetDetails.getMany();
|
|
292
|
+
}
|
|
293
|
+
if (foundWorksheet.type === 'PUTAWAY') {
|
|
294
|
+
qbWorksheetDetails
|
|
295
|
+
.select('worksheetDetails')
|
|
296
|
+
.addSelect('location.name')
|
|
297
|
+
.addSelect('location.description')
|
|
298
|
+
.addSelect('location.type')
|
|
299
|
+
.leftJoinAndSelect('worksheetDetails.targetInventory', 'targetInventory')
|
|
300
|
+
.leftJoinAndSelect('targetInventory.inventory', 'inventory')
|
|
301
|
+
.leftJoinAndSelect('inventory.product', 'product')
|
|
302
|
+
.leftJoin('inventory.location', 'location')
|
|
303
|
+
.where('worksheetDetails.worksheet_id =:worksheetId', { worksheetId: foundWorksheet.id });
|
|
304
|
+
worksheetDetails = await qbWorksheetDetails.getMany();
|
|
305
|
+
}
|
|
306
|
+
let orderInventories = worksheetDetails.filter(wd => { if (wd.targetInventory) {
|
|
307
|
+
return wd.targetInventory;
|
|
308
|
+
} });
|
|
309
|
+
let orderProducts = worksheetDetails.filter(wd => { if (wd.targetProduct) {
|
|
310
|
+
return wd.targetProduct;
|
|
311
|
+
} });
|
|
312
|
+
let orderVas = worksheetDetails.filter(wd => { if (wd.targetVas) {
|
|
313
|
+
return wd.targetVas;
|
|
314
|
+
} });
|
|
315
|
+
// console.time('map')
|
|
316
|
+
let worksheet = Object.assign(Object.assign({}, foundWorksheet), { worksheetDetails: worksheetDetails, orderInventories: orderInventories, orderProducts: orderProducts, orderVass: orderVas, marketplaceOrder: {} });
|
|
317
|
+
if (!worksheet) {
|
|
318
|
+
worksheet = (await (0, typeorm_1.getRepository)(entities_1.Worksheet).findOne({
|
|
319
|
+
where: {
|
|
320
|
+
domain,
|
|
321
|
+
arrivalNotice: name
|
|
322
|
+
},
|
|
323
|
+
relations: [
|
|
324
|
+
'domain',
|
|
325
|
+
'bizplace',
|
|
326
|
+
'bizplace.domain',
|
|
327
|
+
'worksheetDetails',
|
|
328
|
+
'worksheetDetails.targetProduct',
|
|
329
|
+
'worksheetDetails.targetProduct.product',
|
|
330
|
+
'worksheetDetails.targetInventory',
|
|
331
|
+
'worksheetDetails.targetInventory.releaseGood',
|
|
332
|
+
'worksheetDetails.targetInventory.product',
|
|
333
|
+
'worksheetDetails.targetInventory.inventory',
|
|
334
|
+
'worksheetDetails.targetInventory.inventory.product',
|
|
335
|
+
'worksheetDetails.targetInventory.inventory.warehouse',
|
|
336
|
+
'worksheetDetails.targetInventory.inventory.location',
|
|
337
|
+
'worksheetDetails.targetInventory.inspectedLocation',
|
|
338
|
+
'creator',
|
|
339
|
+
'updater'
|
|
340
|
+
]
|
|
341
|
+
}));
|
|
342
|
+
}
|
|
343
|
+
if ((_a = worksheet === null || worksheet === void 0 ? void 0 : worksheet.arrivalNotice) === null || _a === void 0 ? void 0 : _a.id) {
|
|
344
|
+
worksheet.orderProducts = await (0, typeorm_1.getRepository)(sales_base_1.OrderProduct).find({
|
|
345
|
+
where: {
|
|
346
|
+
domain,
|
|
347
|
+
bizplace: worksheet.bizplace,
|
|
348
|
+
arrivalNotice: worksheet.arrivalNotice
|
|
349
|
+
}
|
|
350
|
+
});
|
|
351
|
+
worksheet.orderVass = await (0, typeorm_1.getRepository)(sales_base_1.OrderVas).find({
|
|
352
|
+
where: {
|
|
353
|
+
domain,
|
|
354
|
+
bizplace: worksheet.bizplace,
|
|
355
|
+
arrivalNotice: worksheet.arrivalNotice
|
|
356
|
+
},
|
|
357
|
+
relations: ['targetProduct']
|
|
358
|
+
});
|
|
359
|
+
}
|
|
360
|
+
if (((_b = worksheet === null || worksheet === void 0 ? void 0 : worksheet.orderInventories) === null || _b === void 0 ? void 0 : _b.length) > 0) {
|
|
361
|
+
worksheet.worksheetDetails.sort(function (a, b) {
|
|
362
|
+
return (worksheet.orderInventories.map(oi => oi.id).indexOf(a.targetInventory.id) -
|
|
363
|
+
worksheet.orderInventories.map(oi => oi.id).indexOf(b.targetInventory.id));
|
|
364
|
+
});
|
|
365
|
+
}
|
|
366
|
+
if ((_c = worksheet === null || worksheet === void 0 ? void 0 : worksheet.vasOrder) === null || _c === void 0 ? void 0 : _c.id) {
|
|
367
|
+
worksheet.orderVass = await (0, typeorm_1.getRepository)(sales_base_1.OrderVas).find({
|
|
368
|
+
where: {
|
|
369
|
+
domain,
|
|
370
|
+
bizplace: worksheet.bizplace,
|
|
371
|
+
vasOrder: worksheet.vasOrder
|
|
372
|
+
},
|
|
373
|
+
relations: ['targetProduct']
|
|
374
|
+
});
|
|
375
|
+
}
|
|
376
|
+
return worksheet;
|
|
261
377
|
}
|
|
262
378
|
};
|
|
263
379
|
//# sourceMappingURL=worksheet.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AAEnD,uEAA6F;AAC7F,2DAA2G;AAC3G,+DAAsD;AAEtD,mEAA8F;AAE9F,kDAAmD;AACnD,gDAA8D;AASjD,QAAA,iBAAiB,GAAG;IAC/B,KAAK,CAAC,SAAS,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;;QAC5C,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,IAAI,SAA6B,CAAA;QACjC,SAAS,GAAG,CAAC,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAClD,KAAK,EAAE;gBACL,MAAM;gBACN,IAAI;aACL;YACD,SAAS,EAAE;gBACT,QAAQ;gBACR,UAAU;gBACV,iBAAiB;gBACjB,gBAAgB;gBAChB,0BAA0B;gBAC1B,eAAe;gBACf,2BAA2B;gBAC3B,aAAa;gBACb,2BAA2B;gBAC3B,2BAA2B;gBAC3B,2BAA2B;gBAC3B,eAAe;gBACf,aAAa;gBACb,gBAAgB;gBAChB,UAAU;gBACV,UAAU;gBACV,kBAAkB;gBAClB,6BAA6B;gBAC7B,gCAAgC;gBAChC,wCAAwC;gBACxC,4BAA4B;gBAC5B,gCAAgC;gBAChC,sCAAsC;gBACtC,+CAA+C;gBAC/C,0CAA0C;gBAC1C,kCAAkC;gBAClC,8CAA8C;gBAC9C,0CAA0C;gBAC1C,4CAA4C;gBAC5C,oDAAoD;gBACpD,sDAAsD;gBACtD,qDAAqD;gBACrD,oDAAoD;gBACpD,SAAS;gBACT,SAAS;aACV;SACF,CAAC,CAAuB,CAAA;QAEzB,IAAI,CAAC,SAAS,EAAE;YACd,SAAS,GAAG,CAAC,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBAClD,KAAK,EAAE;oBACL,MAAM;oBACN,aAAa,EAAE,IAAI;iBACpB;gBACD,SAAS,EAAE;oBACT,QAAQ;oBACR,UAAU;oBACV,iBAAiB;oBACjB,kBAAkB;oBAClB,gCAAgC;oBAChC,wCAAwC;oBACxC,kCAAkC;oBAClC,8CAA8C;oBAC9C,0CAA0C;oBAC1C,4CAA4C;oBAC5C,oDAAoD;oBACpD,sDAAsD;oBACtD,qDAAqD;oBACrD,oDAAoD;oBACpD,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAuB,CAAA;SAC1B;QAED,IAAI,4BAA4B,GAAG,IAAA,uBAAa,EAAC,sBAAO,CAAC,CAAC,OAAO,CAAC;YAChE,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,0BAA0B,EAAE;SAC1E,CAAC,CAAA;QAEF,IAAI,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,aAAa,0CAAE,EAAE,EAAE;YAChC,SAAS,CAAC,aAAa,GAAG,MAAM,IAAA,uBAAa,EAAC,yBAAY,CAAC,CAAC,IAAI,CAAC;gBAC/D,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,aAAa,EAAE,SAAS,CAAC,aAAa;iBACvC;aACF,CAAC,CAAA;YAEF,SAAS,CAAC,SAAS,GAAG,MAAM,IAAA,uBAAa,EAAC,qBAAQ,CAAC,CAAC,IAAI,CAAC;gBACvD,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,aAAa,EAAE,SAAS,CAAC,aAAa;iBACvC;gBACD,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;YAEF,2DAA2D;YAC3D,IACE,SAAS,CAAC,IAAI,KAAK,0BAAc,CAAC,OAAO;gBACzC,SAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,EACtE;gBACA,SAAS,CAAC,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC5C,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAoB,EAAE,EAAE;oBAC5D,IAAI,SAAS,GAAc,GAAG,CAAC,eAAe,CAAC,SAAS,CAAA;oBAExD,IAAI,YAAY,GAAqB,MAAM,IAAA,uBAAa,EAAC,iCAAgB,CAAC,CAAC,OAAO,CAAC;wBACjF,KAAK,EAAE;4BACL,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,iCAAgB,CAAC,QAAQ,EAAE;4BACxF,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,iCAAgB,CAAC,kBAAkB,EAAE;4BAClG,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,iCAAgB,CAAC,OAAO,EAAE;4BACvF,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,iCAAgB,CAAC,MAAM,EAAE;yBACvF;wBACD,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC;wBAClC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;qBACvB,CAAC,CAAA;oBAEF,GAAG,CAAC,eAAe,CAAC,SAAS,mCACxB,SAAS,KACZ,GAAG,EAAE,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,MAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,UAAU,CAAA,IAAI,CAAC,EACvD,QAAQ,EAAE,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,QAAQ,MAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,eAAe,CAAA,IAAI,CAAC,EACtE,QAAQ,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,QAAQ,EAChC,OAAO,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,EAC9B,QAAQ,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,QAAQ,EAChC,OAAO,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,EAC9B,UAAU,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,UAAU,EACpC,WAAW,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,EACtC,WAAW,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,EACtC,GAAG,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,GAAG,GACvB,CAAA;oBAED,OAAO,GAAG,CAAA;gBACZ,CAAC,CAAC,CACH,CAAA;aACF;SACF;QAED,IAAI,SAAS,CAAC,IAAI,KAAK,0BAAc,CAAC,aAAa,EAAE;YACnD,IAAI,kBAAkB,GAAG,IAAA,uBAAa,EAAC,2BAAc,CAAC;iBACnD,kBAAkB,CAAC,IAAI,CAAC;iBACxB,iBAAiB,CAAC,gBAAgB,EAAE,aAAa,CAAC;iBAClD,iBAAiB,CAAC,cAAc,EAAE,WAAW,CAAC;iBAC9C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;iBAC1C,iBAAiB,CAAC,iBAAiB,EAAE,cAAc,CAAC;iBACpD,iBAAiB,CAAC,oBAAoB,EAAE,UAAU,CAAC;iBACnD,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC;iBAC5C,KAAK,CAAC,4BAA4B,CAAC;iBACnC,QAAQ,CAAC,gCAAgC,CAAC;iBAC1C,QAAQ,CAAC,2CAA2C,CAAC;iBACrD,aAAa,CAAC;gBACb,MAAM,EAAE,MAAM,CAAC,EAAE;gBACjB,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE;gBAC/B,cAAc,EAAE,SAAS,CAAC,EAAE;aAC7B,CAAC,CAAA;YAEJ,IAAI,cAAc,GAAY,MAAM,4BAA4B,CAAA;YAChE,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,EAAE;gBACzB,IAAI,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;gBACnD,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;oBAC9B,kBAAkB,CAAC,UAAU,CAAC,YAAY,GAAG,EAAE,EAAE,YAAY,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;iBAC9F;aACF;YAED,kBAAkB,CAAC,UAAU,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;YAEpD,IAAI,gBAAgB,GAAqB,MAAM,kBAAkB,CAAC,OAAO,EAAE,CAAA;YAC3E,SAAS,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;SAC9C;QAED,IAAI,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,EAAE,EAAE;YAC9B,IAAI,kBAAkB,GAAG,IAAA,uBAAa,EAAC,2BAAc,CAAC;iBACnD,kBAAkB,CAAC,IAAI,CAAC;iBACxB,iBAAiB,CAAC,gBAAgB,EAAE,aAAa,CAAC;iBAClD,iBAAiB,CAAC,cAAc,EAAE,WAAW,CAAC;iBAC9C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;iBAC1C,iBAAiB,CAAC,iBAAiB,EAAE,cAAc,CAAC;iBACpD,iBAAiB,CAAC,oBAAoB,EAAE,UAAU,CAAC;iBACnD,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC;iBAC5C,KAAK,CAAC,4BAA4B,CAAC;iBACnC,QAAQ,CAAC,gCAAgC,CAAC;iBAC1C,QAAQ,CAAC,uCAAuC,CAAC;iBACjD,QAAQ,CAAC,qCAAqC,CAAC;iBAC/C,aAAa,CAAC;gBACb,MAAM,EAAE,MAAM,CAAC,EAAE;gBACjB,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE;gBAC/B,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC,EAAE;gBACrC,QAAQ,EAAE,CAAC,mCAAsB,CAAC,SAAS,EAAE,mCAAsB,CAAC,QAAQ,CAAC;aAC9E,CAAC,CAAA;YAEJ,IAAI,cAAc,GAAY,MAAM,4BAA4B,CAAA;YAChE,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,KAAK,EAAE;gBACzB,IAAI,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;gBACnD,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;oBAC9B,kBAAkB,CAAC,UAAU,CAAC,YAAY,GAAG,EAAE,EAAE,YAAY,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;iBAC9F;aACF;YAED,kBAAkB,CAAC,UAAU,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;YAEpD,IAAI,gBAAgB,GAAqB,MAAM,kBAAkB,CAAC,OAAO,EAAE,CAAA;YAC3E,SAAS,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;YAE7C,IAAI,SAAS,CAAC,WAAW,CAAC,IAAI,IAAI,KAAK,EAAE;gBACvC,SAAS,CAAC,gBAAgB,GAAG,MAAM,IAAA,uBAAa,EAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;oBACzE,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE;oBAC/C,SAAS,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;iBACzD,CAAC,CAAA;gBAEF,IAAI,SAAS,CAAC,gBAAgB,EAAE;oBAC9B,IAAI,wBAAkD,CAAA;oBACtD,IAAI,SAAS,CAAC,gBAAgB,CAAC,UAAU,EAAE;wBACzC,wBAAwB,GAAG,MAAM,IAAA,uBAAa,EAAC,2CAAwB,CAAC,CAAC,OAAO,CAAC;4BAC/E,KAAK,EAAE,EAAE,aAAa,EAAE,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE;yBACvD,CAAC,CAAA;qBACH;yBAAM;wBACL,wBAAwB,GAAG,MAAM,IAAA,uBAAa,EAAC,2CAAwB,CAAC,CAAC,OAAO,CAAC;4BAC/E,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE;yBACnD,CAAC,CAAA;qBACH;oBAED,SAAS,CAAC,gBAAgB,CAAC,UAAU,GAAG,wBAAwB,CAAC,aAAa;wBAC5E,CAAC,CAAC,wBAAwB,CAAC,aAAa;wBACxC,CAAC,CAAC,wBAAwB,CAAC,UAAU,CAAA;oBACvC,SAAS,CAAC,gBAAgB,CAAC,gBAAgB,GAAG,wBAAwB,CAAC,cAAc;wBACnF,CAAC,CAAC,wBAAwB,CAAC,cAAc;wBACzC,CAAC,CAAC,wBAAwB,CAAC,WAAW,CAAA;iBACzC;aACF;YAED,SAAS,CAAC,SAAS,GAAG,MAAM,IAAA,uBAAa,EAAC,qBAAQ,CAAC,CAAC,IAAI,CAAC;gBACvD,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,WAAW,EAAE,SAAS,CAAC,WAAW;iBACnC;gBACD,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;SACH;QAED,IAAI,SAAS,CAAC,gBAAgB,EAAE;YAC9B,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5C,OAAO,CACL,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC;oBACzE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAC1E,CAAA;YACH,CAAC,CAAC,CAAA;SACH;QAED,IAAI,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,0CAAE,EAAE,EAAE;YAC9B,SAAS,CAAC,gBAAgB,GAAG,MAAM,IAAA,uBAAa,EAAC,2BAAc,CAAC,CAAC,IAAI,CAAC;gBACpE,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,MAAM,EAAE,IAAA,aAAG,EAAC,IAAA,eAAK,EAAC,mCAAsB,CAAC,SAAS,CAAC,CAAC;iBACrD;gBACD,SAAS,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,oBAAoB,CAAC;aAC1D,CAAC,CAAA;YAEF,SAAS,CAAC,SAAS,GAAG,MAAM,IAAA,uBAAa,EAAC,qBAAQ,CAAC,CAAC,IAAI,CAAC;gBACvD,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,WAAW,EAAE,SAAS,CAAC,WAAW;iBACnC;gBACD,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;SACH;QAED,IAAI,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,cAAc,0CAAE,EAAE,EAAE;YACjC,SAAS,CAAC,gBAAgB,GAAG,MAAM,IAAA,uBAAa,EAAC,2BAAc,CAAC,CAAC,IAAI,CAAC;gBACpE,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,cAAc,EAAE,SAAS,CAAC,cAAc;iBACzC;gBACD,SAAS,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,oBAAoB,CAAC;aAC1D,CAAC,CAAA;SACH;QAED,IAAI,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,0CAAE,EAAE,EAAE;YAC3B,SAAS,CAAC,SAAS,GAAG,MAAM,IAAA,uBAAa,EAAC,qBAAQ,CAAC,CAAC,IAAI,CAAC;gBACvD,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,QAAQ,EAAE,SAAS,CAAC,QAAQ;iBAC7B;gBACD,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;SACH;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAGD,KAAK,CAAC,uBAAuB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;;QAC1D,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QAEpD,IAAI,WAAW,GAAG,IAAA,uBAAa,EAAC,oBAAS,CAAC;aACvC,kBAAkB,CAAC,GAAG,CAAC;aACvB,MAAM,CAAC,GAAG,CAAC;aACX,SAAS,CAAC,aAAa,CAAC;aACxB,SAAS,CAAC,eAAe,CAAC;aAC1B,SAAS,CAAC,mBAAmB,CAAC;aAC9B,SAAS,CAAC,qBAAqB,CAAC;aAChC,SAAS,CAAC,qBAAqB,CAAC;aAChC,SAAS,CAAC,8BAA8B,CAAC;aACzC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,CAAC;aACvC,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC;aAClC,QAAQ,CAAC,iBAAiB,EAAE,gBAAgB,CAAC;aAC7C,QAAQ,CAAC,kBAAkB,EAAE,gBAAgB,CAAC;aAC9C,QAAQ,CAAC,0BAA0B,EAAE,yBAAyB,CAAC;aAC/D,iBAAiB,CAAC,iBAAiB,EAAE,eAAe,CAAC;aACrD,iBAAiB,CAAC,YAAY,EAAE,UAAU,CAAC;aAC3C,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;aACrD,QAAQ,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QAE7C,IAAI,cAAc,GAAc,MAAM,WAAW,CAAC,MAAM,EAAE,CAAA;QAE1D,IAAI,kBAAkB,GAAG,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,CAAA;QAE9F,IAAI,gBAAgB,GAAsB,EAAE,CAAA;QAC5C,IAAI,cAAc,CAAC,IAAI,KAAK,WAAW,EAAE;YACvC,kBAAkB,CAAC,MAAM,CAAC,kBAAkB,CAAC;iBAC1C,iBAAiB,CAAC,gCAAgC,EAAE,eAAe,CAAC;iBACpE,iBAAiB,CAAC,uBAAuB,EAAE,SAAS,CAAC;iBACrD,KAAK,CAAC,6CAA6C,EAAE,EAAE,WAAW,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAA;YAC3F,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,CAAA;SACtD;QAED,IAAI,cAAc,CAAC,IAAI,KAAK,SAAS,EAAE;YACrC,kBAAkB;iBACf,MAAM,CAAC,kBAAkB,CAAC;iBAC1B,SAAS,CAAC,eAAe,CAAC;iBAC1B,SAAS,CAAC,sBAAsB,CAAC;iBACjC,SAAS,CAAC,eAAe,CAAC;iBAC1B,iBAAiB,CAAC,kCAAkC,EAAE,iBAAiB,CAAC;iBACxE,iBAAiB,CAAC,2BAA2B,EAAE,WAAW,CAAC;iBAC3D,iBAAiB,CAAC,mBAAmB,EAAE,SAAS,CAAC;iBACjD,QAAQ,CAAC,oBAAoB,EAAE,UAAU,CAAC;iBAC1C,KAAK,CAAC,6CAA6C,EAAE,EAAE,WAAW,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAA;YAC3F,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,OAAO,EAAE,CAAA;SACtD;QAED,IAAI,gBAAgB,GAAqB,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,eAAe,EAAE;YAAE,OAAO,EAAE,CAAC,eAAe,CAAA;SAAE,CAAC,CAAC,CAAC,CAAA;QAEjI,IAAI,aAAa,GAAmB,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,aAAa,EAAE;YAAE,OAAO,EAAE,CAAC,aAAa,CAAA;SAAE,CAAC,CAAC,CAAC,CAAA;QAExH,IAAI,QAAQ,GAAe,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,SAAS,EAAE;YAAE,OAAO,EAAE,CAAC,SAAS,CAAA;SAAE,CAAC,CAAC,CAAC,CAAA;QAEvG,sBAAsB;QACtB,IAAI,SAAS,mCACR,cAAc,KACjB,gBAAgB,EAAE,gBAAgB,EAClC,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,QAAQ,EACnB,gBAAgB,EAAE,EAAE,GACrB,CAAA;QAED,IAAI,CAAC,SAAS,EAAE;YACd,SAAS,GAAG,CAAC,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBAClD,KAAK,EAAE;oBACL,MAAM;oBACN,aAAa,EAAE,IAAI;iBACpB;gBACD,SAAS,EAAE;oBACT,QAAQ;oBACR,UAAU;oBACV,iBAAiB;oBACjB,kBAAkB;oBAClB,gCAAgC;oBAChC,wCAAwC;oBACxC,kCAAkC;oBAClC,8CAA8C;oBAC9C,0CAA0C;oBAC1C,4CAA4C;oBAC5C,oDAAoD;oBACpD,sDAAsD;oBACtD,qDAAqD;oBACrD,oDAAoD;oBACpD,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAuB,CAAA;SAC1B;QACD,IAAI,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,aAAa,0CAAE,EAAE,EAAE;YAChC,SAAS,CAAC,aAAa,GAAG,MAAM,IAAA,uBAAa,EAAC,yBAAY,CAAC,CAAC,IAAI,CAAC;gBAC/D,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,aAAa,EAAE,SAAS,CAAC,aAAa;iBACvC;aACF,CAAC,CAAA;YAEF,SAAS,CAAC,SAAS,GAAG,MAAM,IAAA,uBAAa,EAAC,qBAAQ,CAAC,CAAC,IAAI,CAAC;gBACvD,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,aAAa,EAAE,SAAS,CAAC,aAAa;iBACvC;gBACD,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;SACH;QAED,IAAI,CAAA,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,gBAAgB,0CAAE,MAAM,IAAG,CAAC,EAAE;YAC3C,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5C,OAAO,CACL,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC;oBACzE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAC1E,CAAA;YACH,CAAC,CAAC,CAAA;SACH;QAED,IAAI,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,0CAAE,EAAE,EAAE;YAC3B,SAAS,CAAC,SAAS,GAAG,MAAM,IAAA,uBAAa,EAAC,qBAAQ,CAAC,CAAC,IAAI,CAAC;gBACvD,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,QAAQ,EAAE,SAAS,CAAC,QAAQ;iBAC7B;gBACD,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;SACH;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;CACF,CAAA"}
|
|
@@ -202,7 +202,8 @@ exports.Mutation = `
|
|
|
202
202
|
worksheetDetailName: String!
|
|
203
203
|
inventory: InventoryPatch!
|
|
204
204
|
productBarcode: String
|
|
205
|
-
|
|
205
|
+
orderType: String
|
|
206
|
+
): ExecutingWorksheet @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
|
|
206
207
|
|
|
207
208
|
completeProductScanUnload (
|
|
208
209
|
worksheetDetailName: String!
|
|
@@ -262,11 +263,12 @@ exports.Mutation = `
|
|
|
262
263
|
): Worksheet @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
|
|
263
264
|
|
|
264
265
|
putaway (
|
|
266
|
+
arrivalNoticeNo: String!
|
|
265
267
|
worksheetDetailName: [String]!
|
|
266
268
|
palletId: String
|
|
267
269
|
cartonId: String
|
|
268
270
|
toLocation: String!
|
|
269
|
-
):
|
|
271
|
+
): ExecutingWorksheet @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
|
|
270
272
|
|
|
271
273
|
replenishmentPutaway (
|
|
272
274
|
worksheetDetailName: [String]!
|
|
@@ -624,9 +626,13 @@ exports.Query = `
|
|
|
624
626
|
name: String!
|
|
625
627
|
): Worksheet @privilege(category: "worksheet", privilege: "query")
|
|
626
628
|
|
|
629
|
+
inboundWorksheetDetails (
|
|
630
|
+
name: String!
|
|
631
|
+
): Worksheet @privilege(category: "worksheet", privilege: "query")
|
|
632
|
+
|
|
627
633
|
unloadingWorksheet (
|
|
628
634
|
arrivalNoticeNo: String!
|
|
629
|
-
): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
|
|
635
|
+
): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query") @transaction
|
|
630
636
|
|
|
631
637
|
unloadingReturnWorksheet (
|
|
632
638
|
returnOrderNo: String!
|
|
@@ -651,7 +657,7 @@ exports.Query = `
|
|
|
651
657
|
|
|
652
658
|
putawayWorksheet (
|
|
653
659
|
arrivalNoticeNo: String!
|
|
654
|
-
): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
|
|
660
|
+
): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query") @transaction
|
|
655
661
|
|
|
656
662
|
putawayReplenishmentWorksheet (
|
|
657
663
|
replenishmentNo: String!
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,2EAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,uFAAgF;AAChF,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,iEAA4D;AAC5D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,2EAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,uFAAgF;AAChF,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,iEAA4D;AAC5D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAykBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwJlC,CAAA;AAEY,QAAA,KAAK,GAAgB;IAChC,qBAAS;IACT,0CAAmB;IACnB,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;IACrB,8DAA4B;CAC7B,CAAA"}
|
|
@@ -67,6 +67,10 @@ exports.WorksheetDetailInfo = (0, apollo_server_koa_1.gql) `
|
|
|
67
67
|
isRequireSerialNumberScanningOutbound: Boolean
|
|
68
68
|
hasMissingInventoryChanges: Boolean
|
|
69
69
|
toteName: String
|
|
70
|
+
completed: Boolean
|
|
71
|
+
packingTypeSize: String
|
|
72
|
+
reusablePalletName: String
|
|
73
|
+
expirationPeriod: Int
|
|
70
74
|
}
|
|
71
75
|
`;
|
|
72
76
|
//# sourceMappingURL=worksheet-detail-info.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worksheet-detail-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-detail-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,mBAAmB,GAAG,IAAA,uBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"worksheet-detail-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-detail-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,mBAAmB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsErC,CAAA"}
|
|
@@ -60,7 +60,7 @@ async function createLmdParcel(releaseGoods, tx) {
|
|
|
60
60
|
};
|
|
61
61
|
let unprocessedOrderPackages = releaseGood.orderPackages.filter(op => !op.parcelId);
|
|
62
62
|
let packagesData = unprocessedOrderPackages.map(op => {
|
|
63
|
-
return Object.assign(Object.assign({}, data), { refNo: op.
|
|
63
|
+
return Object.assign(Object.assign({}, data), { refNo: op.name, items: op.orderPackageItems.map(opi => {
|
|
64
64
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
65
65
|
return {
|
|
66
66
|
quantity: ((_a = opi === null || opi === void 0 ? void 0 : opi.releaseQty) === null || _a === void 0 ? void 0 : _a.toString()) || ' ',
|
|
@@ -79,16 +79,21 @@ async function createLmdParcel(releaseGoods, tx) {
|
|
|
79
79
|
if (parcelsRequest && parcelsRequest.length > 0) {
|
|
80
80
|
let res = await integration_lmd_1.LastMileAPI.createParcel(Object.assign(Object.assign({}, releaseGoods[0].lastMileDelivery), { platform: 'lmdMiddleware' }), parcelsRequest);
|
|
81
81
|
for (let parcel of res) {
|
|
82
|
-
await tx.getRepository(sales_base_1.OrderPackage).update({
|
|
82
|
+
await tx.getRepository(sales_base_1.OrderPackage).update({ name: parcel.refNo }, { parcelId: parcel.parcelId });
|
|
83
83
|
}
|
|
84
|
-
const qb = tx
|
|
84
|
+
const qb = tx
|
|
85
|
+
.getRepository(sales_base_1.OrderPackage)
|
|
85
86
|
.createQueryBuilder('op')
|
|
86
87
|
.innerJoinAndSelect('op.releaseGood', 'rg')
|
|
87
88
|
.innerJoinAndSelect('rg.domain', 'd')
|
|
88
89
|
.innerJoinAndSelect('rg.bizplace', 'b')
|
|
89
90
|
.innerJoinAndSelect('b.domain', 'd2')
|
|
90
91
|
.leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
|
|
91
|
-
.where('op.
|
|
92
|
+
.where('op.name IN (:...orderPackageIds)', {
|
|
93
|
+
orderPackageIds: res.map(parcel => {
|
|
94
|
+
return parcel.refNo;
|
|
95
|
+
})
|
|
96
|
+
});
|
|
92
97
|
const orderPackages = await qb.getMany();
|
|
93
98
|
await processAwbAndTrackingNo(orderPackages, tx);
|
|
94
99
|
}
|
|
@@ -107,15 +112,26 @@ async function processAwbAndTrackingNo(orderPackages, tx) {
|
|
|
107
112
|
let awbRes = await integration_lmd_1.LastMileAPI.getAwb(Object.assign(Object.assign({}, orderPackage.releaseGood.lastMileDelivery), { platform: 'lmdMiddleware' }), { parcelId: orderPackage.parcelId, staging: (_a = orderPackage.releaseGood.lastMileDelivery) === null || _a === void 0 ? void 0 : _a.staging });
|
|
108
113
|
if (awbRes) {
|
|
109
114
|
let awbContent;
|
|
115
|
+
let awb;
|
|
110
116
|
const { deliveryConfirmationNo, tracking_no } = awbRes;
|
|
111
117
|
if (awbRes.content) {
|
|
112
|
-
|
|
118
|
+
if (orderPackage.releaseGood.lastMileDelivery.platform == 'POSLAJU' || orderPackage.releaseGood.lastMileDelivery.platform == 'SAPX') {
|
|
119
|
+
const response = await fetch(awbRes.content, {
|
|
120
|
+
method: 'get'
|
|
121
|
+
});
|
|
122
|
+
awbContent = await response.buffer();
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
awbContent = Buffer.from(awbRes.content, 'base64');
|
|
126
|
+
}
|
|
113
127
|
}
|
|
114
128
|
else {
|
|
115
129
|
awbContent = await constructAwb(orderPackage, awbRes);
|
|
116
130
|
}
|
|
117
|
-
|
|
118
|
-
await tx
|
|
131
|
+
awb = await uploadAwbToS3(awbContent, orderPackage);
|
|
132
|
+
await tx
|
|
133
|
+
.getRepository(sales_base_1.OrderPackage)
|
|
134
|
+
.update({ name: orderPackage.name }, { airwayBill: awb.url, trackingNo: deliveryConfirmationNo || tracking_no });
|
|
119
135
|
releaseOrders.push(orderPackage.releaseGood);
|
|
120
136
|
}
|
|
121
137
|
}
|
|
@@ -205,7 +221,7 @@ async function uploadAwbToS3(result, orderPackage) {
|
|
|
205
221
|
name: uuid,
|
|
206
222
|
mimetype: 'application/pdf',
|
|
207
223
|
category: 'LMD_AWB',
|
|
208
|
-
refBy: orderPackage.
|
|
224
|
+
refBy: orderPackage.name,
|
|
209
225
|
path: awb.url,
|
|
210
226
|
domain: releaseOrder.domain,
|
|
211
227
|
size: 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"lmd-util.js","sourceRoot":"","sources":["../../server/utils/lmd-util.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.213",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -28,18 +28,18 @@
|
|
|
28
28
|
"@things-factory/document-template-base": "^4.3.179",
|
|
29
29
|
"@things-factory/id-rule-base": "^4.3.187",
|
|
30
30
|
"@things-factory/integration-accounting": "^4.3.204",
|
|
31
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
31
|
+
"@things-factory/integration-lmd": "^4.3.212",
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.3.212",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.3.212",
|
|
34
34
|
"@things-factory/integration-sftp": "^4.3.190",
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.212",
|
|
36
36
|
"@things-factory/notification": "^4.3.186",
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
37
|
+
"@things-factory/sales-base": "^4.3.213",
|
|
38
38
|
"@things-factory/setting-base": "^4.3.186",
|
|
39
39
|
"@things-factory/shell": "^4.3.179",
|
|
40
40
|
"@things-factory/transport-base": "^4.3.179",
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.212",
|
|
42
42
|
"uuid": "^9.0.0"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "c5faf2eae4b713b81fd65f0ca79ba59b976d8c9d"
|
|
45
45
|
}
|
|
@@ -122,19 +122,22 @@ export class PutawayWorksheetController extends VasWorksheetController {
|
|
|
122
122
|
})
|
|
123
123
|
if (nonFinishedVasCnt) return
|
|
124
124
|
|
|
125
|
-
const
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
})
|
|
132
|
-
await this.
|
|
125
|
+
// const targetInventories: OrderInventory[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
|
|
126
|
+
// wsd.targetInventory.status = ORDER_PRODUCT_STATUS.PUTTING_AWAY
|
|
127
|
+
// wsd.targetInventory.updater = this.user
|
|
128
|
+
// return wsd.targetInventory
|
|
129
|
+
// })
|
|
130
|
+
// await this.updateOrderTargets(targetInventories)
|
|
131
|
+
const targetInventoriesId = worksheet.worksheetDetails.map(wsd=> { return wsd.targetInventory.id})
|
|
132
|
+
await this.trxMgr
|
|
133
|
+
.getRepository(OrderInventory)
|
|
134
|
+
.update({ id: In(targetInventoriesId) }, { status: ORDER_INVENTORY_STATUS.PUTTING_AWAY, updater: this.user })
|
|
135
|
+
|
|
133
136
|
|
|
134
137
|
arrivalNotice.status = ORDER_STATUS.PUTTING_AWAY
|
|
135
138
|
arrivalNotice.updater = this.user
|
|
136
139
|
await this.updateRefOrder(arrivalNotice)
|
|
137
|
-
return this.activateWorksheet(worksheet, worksheetDetails, putawayWorksheetDetails)
|
|
140
|
+
return this.activateWorksheet(worksheet, worksheet.worksheetDetails, putawayWorksheetDetails)
|
|
138
141
|
}
|
|
139
142
|
|
|
140
143
|
async completePutaway(arrivalNoticeNo: string): Promise<Worksheet> {
|