@things-factory/worksheet-base 4.3.61 → 4.3.66
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/outbound/picking-worksheet-controller.js +69 -92
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/returning-worksheet-controller.js +16 -0
- package/dist-server/controllers/outbound/returning-worksheet-controller.js.map +1 -1
- package/dist-server/entities/worksheet-detail.js +2 -1
- package/dist-server/entities/worksheet-detail.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/find-release-orders-by-task-no.js +1 -34
- package/dist-server/graphql/resolvers/worksheet/find-release-orders-by-task-no.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.js +70 -0
- package/dist-server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-batch-picking-worksheet.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-batch-picking-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js +7 -3
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/index.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js +18 -8
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/activate-batch-picking.js +0 -32
- package/dist-server/graphql/resolvers/worksheet/picking/activate-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +5 -0
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +5 -0
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js +6 -2
- package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/scan-product-batch-picking.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/picking/scan-product-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/scan-product-picking.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/picking/scan-product-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js +1 -0
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/worksheet.js +11 -3
- package/dist-server/graphql/resolvers/worksheet/worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet-detail/index.js +2 -1
- package/dist-server/graphql/resolvers/worksheet-detail/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.js +81 -0
- package/dist-server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.js.map +1 -0
- package/dist-server/graphql/types/worksheet/batch-pick-worksheet-info.js +12 -0
- package/dist-server/graphql/types/worksheet/batch-pick-worksheet-info.js.map +1 -0
- package/dist-server/graphql/types/worksheet/index.js +9 -4
- package/dist-server/graphql/types/worksheet/index.js.map +1 -1
- package/dist-server/graphql/types/worksheet-detail/index.js +10 -0
- package/dist-server/graphql/types/worksheet-detail/index.js.map +1 -1
- package/package.json +17 -17
- package/server/controllers/outbound/picking-worksheet-controller.ts +86 -111
- package/server/controllers/outbound/returning-worksheet-controller.ts +23 -0
- package/server/entities/worksheet-detail.ts +4 -0
- package/server/graphql/resolvers/worksheet/find-release-orders-by-task-no.ts +2 -42
- package/server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.ts +80 -0
- package/server/graphql/resolvers/worksheet/generate-worksheet/generate-batch-picking-worksheet.ts +7 -8
- package/server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts +16 -20
- package/server/graphql/resolvers/worksheet/index.ts +2 -0
- package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +32 -11
- package/server/graphql/resolvers/worksheet/picking/activate-batch-picking.ts +1 -49
- package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +8 -0
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +6 -0
- package/server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts +4 -0
- package/server/graphql/resolvers/worksheet/picking/scan-product-batch-picking.ts +7 -4
- package/server/graphql/resolvers/worksheet/picking/scan-product-picking.ts +7 -4
- package/server/graphql/resolvers/worksheet/picking-worksheet.ts +5 -4
- package/server/graphql/resolvers/worksheet/worksheet.ts +16 -3
- package/server/graphql/resolvers/worksheet-detail/index.ts +3 -1
- package/server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.ts +164 -0
- package/server/graphql/types/worksheet/batch-pick-worksheet-info.ts +9 -0
- package/server/graphql/types/worksheet/index.ts +10 -5
- package/server/graphql/types/worksheet-detail/index.ts +10 -0
|
@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.scanProductPicking = exports.scanProductPickingResolver = void 0;
|
|
4
4
|
const controllers_1 = require("../../../../controllers");
|
|
5
5
|
exports.scanProductPickingResolver = {
|
|
6
|
-
async scanProductPicking(_, { worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo }, context) {
|
|
6
|
+
async scanProductPicking(_, { worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo, pickingQty }, context) {
|
|
7
7
|
const { tx, domain, user } = context.state;
|
|
8
|
-
await scanProductPicking(tx, domain, user, worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo);
|
|
8
|
+
await scanProductPicking(tx, domain, user, worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo, pickingQty);
|
|
9
9
|
}
|
|
10
10
|
};
|
|
11
|
-
async function scanProductPicking(tx, domain, user, worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo) {
|
|
11
|
+
async function scanProductPicking(tx, domain, user, worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo, pickingQty) {
|
|
12
12
|
const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
13
|
-
await worksheetController.scanProductPicking(worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo);
|
|
13
|
+
await worksheetController.scanProductPicking(worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo, pickingQty);
|
|
14
14
|
}
|
|
15
15
|
exports.scanProductPicking = scanProductPicking;
|
|
16
16
|
//# sourceMappingURL=scan-product-picking.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan-product-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/scan-product-picking.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CACtB,CAAM,EACN,EAAE,mBAAmB,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"scan-product-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/scan-product-picking.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CACtB,CAAM,EACN,EAAE,mBAAmB,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,EAC/G,OAAY;QAEZ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,kBAAkB,CACtB,EAAE,EACF,MAAM,EACN,IAAI,EACJ,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,MAAM,EACN,UAAU,CACX,CAAA;IACH,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,aAAqB,EACrB,cAAsB,EACtB,QAAgB,EAChB,WAAoB,EACpB,YAAqB,EACrB,MAAe,EACf,UAAmB;IAEnB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,kBAAkB,CAC1C,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,MAAM,EACN,UAAU,CACX,CAAA;AACH,CAAC;AAxBD,gDAwBC"}
|
|
@@ -75,6 +75,7 @@ async function pickingWorksheet(domain, releaseGoodNo, locationSortingRules, tx)
|
|
|
75
75
|
refNo: releaseGood.refNo,
|
|
76
76
|
refNo2: releaseGood.refNo2,
|
|
77
77
|
refNo3: releaseGood.refNo3,
|
|
78
|
+
type: releaseGood.type,
|
|
78
79
|
containerNo: shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerNo,
|
|
79
80
|
marketplaceStatus: releaseGood.marketplaceOrderStatus,
|
|
80
81
|
shippingProvider: releaseGood.transporter,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAA+D;AAE/D,2DAA+G;AAE/G,mEAAqF;AAErF,kDAAqE;AACrE,gDAAmD;AACnD,0CAAwD;AAG3C,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,gBAAgB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,oBAAoB,EAAE,EAAE,OAAY;QAClF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,OAAO,MAAM,gBAAgB,CAAC,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,EAAE,CAAC,CAAA;IAChF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,aAAqB,EACrB,oBAAyB,EACzB,EAAiB;;IAEjB,IAAI,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;QACzE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,gCAAgC,EAAE;QACvE,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC;KAC3C,CAAC,CAAA;IAEF,kCAAkC;IAClC,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,WAAW,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,yBAAQ,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;SACvC,CAAC,CAAA;QAEF,MAAM,mBAAmB,GAAmB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,OAAO,CAAC;YACzF,KAAK,EAAE;gBACL,MAAM;gBACN,WAAW;gBACX,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,mCAAsB,CAAC,OAAO,EAAE,mCAAsB,CAAC,MAAM,CAAC,CAAC;aAC5E;YACD,KAAK,EAAE;gBACL,SAAS,EAAE,KAAK;aACjB;YACD,SAAS,EAAE,CAAC,aAAa,EAAE,sBAAsB,EAAE,6BAA6B,CAAC;SAClF,CAAC,CAAA;QAEF,IAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,WAAW,EAAE;YACpC,aAAa,GAAG,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAA;YACpD,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAA;SAC9C;KACF;IAED,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,aAAa,GAAG,CAAC,CAAA;IAEnG,IAAI,WAAW,CAAC,YAAY,EAAE;QAC5B,IAAI,aAAa,GAAkB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAa,CAAC,CAAC,OAAO,CAAC;YAC/E,KAAK,EAAE;gBACL,EAAE,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,eAAe;aACjC;SACF,CAAC,CAAA;KACH;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAuB,EAC7C,MAAM,EACN,WAAW,CAAC,QAAQ,EACpB,CAAC,UAAU,CAAC,EACZ,0BAAc,CAAC,OAAO,EACtB,WAAW,EACX,EAAE,CACH,CAAA;IAED,MAAM,EAAE,GAAwC,EAAE,CAAC,kBAAkB,CAAC,0BAAe,EAAE,KAAK,CAAC,CAAA;IAC7F,EAAE,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,OAAO,CAAC;SACjD,iBAAiB,CAAC,mBAAmB,EAAE,SAAS,CAAC;SACjD,iBAAiB,CAAC,iBAAiB,EAAE,KAAK,CAAC;SAC3C,iBAAiB,CAAC,eAAe,EAAE,MAAM,CAAC;SAC1C,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;IAE3C,IAAI,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,IAAG,CAAC,EAAE;QACpC,oBAAoB,CAAC,OAAO,CAAC,CAAC,IAAqC,EAAE,EAAE;YACrE,EAAE,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAC/D,CAAC,CAAC,CAAA;KACH;IAED,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,CAAA;IAEjC,MAAM,gBAAgB,GAAsB,MAAM,EAAE;SACjD,KAAK,CAAC,qCAAqC,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC;SAC3E,QAAQ,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,4BAAgB,CAAC,QAAQ,EAAE,CAAC;SAC5E,QAAQ,CAAC,kCAAkC,EAAE,EAAE,WAAW,EAAE,mCAAsB,CAAC,SAAS,EAAE,CAAC;SAC/F,OAAO,EAAE,CAAA;IAEZ,OAAO;QACL,aAAa,EAAE;YACb,YAAY,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI;YACvC,eAAe,EAAE,MAAA,WAAW,CAAC,QAAQ,0CAAE,MAAM,CAAC,EAAE;YAChD,SAAS,EAAE,SAAS,CAAC,SAAS;YAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;YACxB,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,WAAW,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,WAAW;YACvC,iBAAiB,EAAE,WAAW,CAAC,sBAAsB;YACrD,gBAAgB,EAAE,WAAW,CAAC,WAAW;YACzC,UAAU,EAAE,WAAW,CAAC,UAAU;YAClC,WAAW;SACZ;QACD,oBAAoB,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,UAA2B,EAAE,EAAE;YAC/E,MAAM,eAAe,GAAmB,UAAU,CAAC,eAAe,CAAA;YAClE,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;YAEtD,MAAM,qBAAqB,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,gCAAe,CAAC,CAAC,KAAK,CAAC;gBAClF,KAAK,EAAE;oBACL,SAAS,EAAE,SAAS,CAAC,EAAE;oBACvB,MAAM,EAAE,SAAS;oBACjB,eAAe,EAAE,SAAS;iBAC3B;gBACD,SAAS,EAAE,CAAC,WAAW,EAAE,SAAS,CAAC;aACpC,CAAC,CAAA;YAEF,OAAO;gBACL,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,QAAQ,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ;gBAC7B,QAAQ,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ;gBAC7B,OAAO,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO;gBAC3B,UAAU,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU;gBACjC,OAAO,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO;gBAC3B,GAAG,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG;gBACnB,WAAW,EAAE,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,WAAW,KAAI,EAAE;gBAC/C,UAAU,EAAE,eAAe,CAAC,UAAU;gBACtC,SAAS,EAAE,eAAe,CAAC,SAAS;gBACpC,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,WAAW,EAAE,UAAU,CAAC,WAAW;gBACnC,UAAU,EAAE,eAAe,CAAC,IAAI;gBAChC,WAAW,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW;gBACnC,WAAW,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW;gBACnC,cAAc,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,cAAc;gBACzC,QAAQ,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ;gBAC7B,eAAe,EAAE,eAAe;gBAChC,0BAA0B,EAAE,qBAAqB,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;aACrE,CAAA;QACH,CAAC,CAAC;KACH,CAAA;AACH,CAAC;AA9HD,4CA8HC"}
|
|
@@ -82,7 +82,7 @@ exports.worksheetResolver = {
|
|
|
82
82
|
}));
|
|
83
83
|
}
|
|
84
84
|
let pWorksheetPickingItemSorting = (0, typeorm_1.getRepository)(setting_base_1.Setting).findOne({
|
|
85
|
-
where: { domain, category: 'location', name: 'rule-for-
|
|
85
|
+
where: { domain, category: 'location', name: 'rule-for-picking-product' }
|
|
86
86
|
});
|
|
87
87
|
if ((_a = worksheet === null || worksheet === void 0 ? void 0 : worksheet.arrivalNotice) === null || _a === void 0 ? void 0 : _a.id) {
|
|
88
88
|
worksheet.orderProducts = await (0, typeorm_1.getRepository)(sales_base_1.OrderProduct).find({
|
|
@@ -139,9 +139,10 @@ exports.worksheetResolver = {
|
|
|
139
139
|
if (sortingSetting === null || sortingSetting === void 0 ? void 0 : sortingSetting.value) {
|
|
140
140
|
let settingValue = JSON.parse(sortingSetting.value);
|
|
141
141
|
for (const key in settingValue) {
|
|
142
|
-
qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC');
|
|
142
|
+
qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC');
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
|
+
qbOrderInventories.addOrderBy(`product.name`, 'ASC');
|
|
145
146
|
let orderInventories = await qbOrderInventories.getMany();
|
|
146
147
|
worksheet.orderInventories = orderInventories;
|
|
147
148
|
}
|
|
@@ -168,9 +169,10 @@ exports.worksheetResolver = {
|
|
|
168
169
|
if (sortingSetting === null || sortingSetting === void 0 ? void 0 : sortingSetting.value) {
|
|
169
170
|
let settingValue = JSON.parse(sortingSetting.value);
|
|
170
171
|
for (const key in settingValue) {
|
|
171
|
-
qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] ? 'ASC' : 'DESC');
|
|
172
|
+
qbOrderInventories.addOrderBy(`location.${key}`, settingValue[key] == 'ASC' ? 'ASC' : 'DESC');
|
|
172
173
|
}
|
|
173
174
|
}
|
|
175
|
+
qbOrderInventories.addOrderBy(`product.name`, 'ASC');
|
|
174
176
|
let orderInventories = await qbOrderInventories.getMany();
|
|
175
177
|
worksheet.orderInventories = orderInventories;
|
|
176
178
|
if (worksheet.releaseGood.type == 'b2c') {
|
|
@@ -207,6 +209,12 @@ exports.worksheetResolver = {
|
|
|
207
209
|
relations: ['targetProduct']
|
|
208
210
|
});
|
|
209
211
|
}
|
|
212
|
+
if (worksheet.orderInventories) {
|
|
213
|
+
worksheet.worksheetDetails.sort(function (a, b) {
|
|
214
|
+
return (worksheet.orderInventories.map(oi => oi.id).indexOf(a.targetInventory.id) -
|
|
215
|
+
worksheet.orderInventories.map(oi => oi.id).indexOf(b.targetInventory.id));
|
|
216
|
+
});
|
|
217
|
+
}
|
|
210
218
|
if ((_c = worksheet === null || worksheet === void 0 ? void 0 : worksheet.returnOrder) === null || _c === void 0 ? void 0 : _c.id) {
|
|
211
219
|
worksheet.orderInventories = await (0, typeorm_1.getRepository)(sales_base_1.OrderInventory).find({
|
|
212
220
|
where: {
|
|
@@ -1 +1 @@
|
|
|
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,sBAAsB;gBACtB,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,
|
|
1
|
+
{"version":3,"file":"worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,10 +10,11 @@ const generate_carton_id_1 = require("./generate-carton-id");
|
|
|
10
10
|
const generate_pallet_id_1 = require("./generate-pallet-id");
|
|
11
11
|
const generate_picking_worksheet_details_1 = require("./generate-picking-worksheet-details");
|
|
12
12
|
const generate_release_good_worksheet_details_1 = require("./generate-release-good-worksheet-details");
|
|
13
|
+
const regenerate_release_good_worksheet_details_1 = require("./regenerate-release-good-worksheet-details");
|
|
13
14
|
const update_worksheet_detail_1 = require("./update-worksheet-detail");
|
|
14
15
|
const worksheet_detail_1 = require("./worksheet-detail");
|
|
15
16
|
const worksheet_details_1 = require("./worksheet-details");
|
|
16
17
|
const worksheet_details_by_product_group_1 = require("./worksheet-details-by-product-group");
|
|
17
18
|
exports.Query = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, worksheet_details_1.worksheetDetailsResolver), worksheet_detail_1.worksheetDetailResolver), worksheet_details_by_product_group_1.worksheetDetailsByProductGroupResolver), check_progressing_pallet_1.checkProgressingPalletResolver), generate_pallet_id_1.generatePalletIdResolver), generate_carton_id_1.generateCartonIdResolver);
|
|
18
|
-
exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, update_worksheet_detail_1.updateWorksheetDetail), create_worksheet_detail_1.createWorksheetDetail), delete_worksheet_detail_1.deleteWorksheetDetail), generate_batch_picking_worksheet_details_1.generateBatchPickingWorksheetDetailsResolver), generate_batch_picking_worksheet_details_by_bulk_1.generateBatchPickingWorksheetDetailsByBulkResolver), generate_picking_worksheet_details_1.generatePickingWorksheetDetailsResolver), generate_release_good_worksheet_details_1.generateReleaseGoodWorksheetDetailsResolver);
|
|
19
|
+
exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, update_worksheet_detail_1.updateWorksheetDetail), create_worksheet_detail_1.createWorksheetDetail), delete_worksheet_detail_1.deleteWorksheetDetail), generate_batch_picking_worksheet_details_1.generateBatchPickingWorksheetDetailsResolver), generate_batch_picking_worksheet_details_by_bulk_1.generateBatchPickingWorksheetDetailsByBulkResolver), generate_picking_worksheet_details_1.generatePickingWorksheetDetailsResolver), generate_release_good_worksheet_details_1.generateReleaseGoodWorksheetDetailsResolver), regenerate_release_good_worksheet_details_1.regenerateReleaseGoodWorksheetDetailsResolver);
|
|
19
20
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/index.ts"],"names":[],"mappings":";;;AAAA,yEAA2E;AAC3E,uEAAiE;AACjE,uEAAiE;AACjE,yGAAyG;AACzG,yHAAuH;AACvH,6DAA+D;AAC/D,6DAA+D;AAC/D,6FAA8F;AAC9F,uGAAuG;AACvG,uEAAiE;AACjE,yDAA4D;AAC5D,2DAA8D;AAC9D,6FAA6F;AAEhF,QAAA,KAAK,2FACb,4CAAwB,GACxB,0CAAuB,GACvB,2EAAsC,GACtC,yDAA8B,GAC9B,6CAAwB,GACxB,6CAAwB,EAC5B;AAEY,QAAA,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/index.ts"],"names":[],"mappings":";;;AAAA,yEAA2E;AAC3E,uEAAiE;AACjE,uEAAiE;AACjE,yGAAyG;AACzG,yHAAuH;AACvH,6DAA+D;AAC/D,6DAA+D;AAC/D,6FAA8F;AAC9F,uGAAuG;AACvG,2GAA2G;AAC3G,uEAAiE;AACjE,yDAA4D;AAC5D,2DAA8D;AAC9D,6FAA6F;AAEhF,QAAA,KAAK,2FACb,4CAAwB,GACxB,0CAAuB,GACvB,2EAAsC,GACtC,yDAA8B,GAC9B,6CAAwB,GACxB,6CAAwB,EAC5B;AAEY,QAAA,QAAQ,uHAChB,+CAAqB,GACrB,+CAAqB,GACrB,+CAAqB,GACrB,uFAA4C,GAC5C,qGAAkD,GAClD,4EAAuC,GACvC,qFAA2C,GAC3C,yFAA6C,EACjD"}
|
package/dist-server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.js
ADDED
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.regenerateReleaseGoodWorksheetDetails = exports.regenerateReleaseGoodWorksheetDetailsResolver = void 0;
|
|
4
|
+
const product_base_1 = require("@things-factory/product-base");
|
|
5
|
+
const sales_base_1 = require("@things-factory/sales-base");
|
|
6
|
+
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
7
|
+
const constants_1 = require("../../../constants");
|
|
8
|
+
const entities_1 = require("../../../entities");
|
|
9
|
+
const utils_1 = require("../../../utils");
|
|
10
|
+
exports.regenerateReleaseGoodWorksheetDetailsResolver = {
|
|
11
|
+
async regenerateReleaseGoodWorksheetDetails(_, { worksheetNo, batchId, productId, packingType, packingSize, orderProductId, worksheetDetails }, context) {
|
|
12
|
+
const { tx, domain, user } = context.state;
|
|
13
|
+
return await regenerateReleaseGoodWorksheetDetails(tx, domain, user, worksheetNo, batchId, productId, packingType, packingSize, orderProductId, worksheetDetails);
|
|
14
|
+
}
|
|
15
|
+
};
|
|
16
|
+
async function regenerateReleaseGoodWorksheetDetails(tx, domain, user, worksheetNo, batchId, productId, packingType, packingSize, orderProductId, worksheetDetails) {
|
|
17
|
+
// 1. Remove prev worksheet details if it's exists
|
|
18
|
+
const worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
|
|
19
|
+
where: { name: worksheetNo, domain },
|
|
20
|
+
relations: [
|
|
21
|
+
'bizplace',
|
|
22
|
+
'releaseGood',
|
|
23
|
+
'worksheetDetails',
|
|
24
|
+
'worksheetDetails.targetInventory',
|
|
25
|
+
'worksheetDetails.targetInventory.inventory',
|
|
26
|
+
'worksheetDetails.targetInventory.product',
|
|
27
|
+
'worksheetDetails.targetInventory.releaseGood',
|
|
28
|
+
'worksheetDetails.targetInventory.orderProduct',
|
|
29
|
+
'worksheetDetails.targetInventory.bizplace'
|
|
30
|
+
]
|
|
31
|
+
});
|
|
32
|
+
const prevWSDs = worksheet.worksheetDetails.filter((wsd) => {
|
|
33
|
+
const targetInv = wsd.targetInventory;
|
|
34
|
+
if (targetInv.orderProductId === orderProductId)
|
|
35
|
+
return wsd.id;
|
|
36
|
+
});
|
|
37
|
+
// TODO: Update prev inventory locked qty and delete order inventories
|
|
38
|
+
if (prevWSDs === null || prevWSDs === void 0 ? void 0 : prevWSDs.length) {
|
|
39
|
+
const wsdIds = prevWSDs.map((wsd) => wsd.id);
|
|
40
|
+
const prevOrderInvIds = prevWSDs.map((wsd) => wsd.targetInventory.id);
|
|
41
|
+
const prevOrderInventories = prevWSDs.map((wsd) => wsd.targetInventory);
|
|
42
|
+
await Promise.all(prevOrderInventories.map(async (prevOI) => {
|
|
43
|
+
if (prevOI === null || prevOI === void 0 ? void 0 : prevOI.inventory) {
|
|
44
|
+
await tx.getRepository(warehouse_base_1.Inventory).update({ id: prevOI.inventory.id }, {
|
|
45
|
+
lockedQty: prevOI.inventory.lockedQty - prevOI.releaseQty,
|
|
46
|
+
lockedUomValue: prevOI.inventory.lockedUomValue - prevOI.releaseUomValue
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
}));
|
|
50
|
+
await tx.getRepository(entities_1.WorksheetDetail).delete(wsdIds);
|
|
51
|
+
await tx.getRepository(sales_base_1.OrderInventory).delete(prevOrderInvIds);
|
|
52
|
+
}
|
|
53
|
+
await Promise.all(worksheetDetails.map(async (wsd) => {
|
|
54
|
+
// 2. Create order inventory
|
|
55
|
+
let targetInventory = wsd.targetInventory;
|
|
56
|
+
const inventory = await tx.getRepository(warehouse_base_1.Inventory).findOne(targetInventory.inventory.id);
|
|
57
|
+
let targetProduct = await tx
|
|
58
|
+
.getRepository(sales_base_1.OrderProduct)
|
|
59
|
+
.findOne({ where: { id: wsd.targetProduct.id }, relations: ['releaseGood'] });
|
|
60
|
+
targetInventory = await tx.getRepository(sales_base_1.OrderInventory).save(Object.assign(Object.assign({}, targetInventory), { domain, bizplace: worksheet.bizplace, name: sales_base_1.OrderNoGenerator.orderInventory(), releaseGood: worksheet.type == constants_1.WORKSHEET_TYPE.BATCH_PICKING ? targetProduct.releaseGood : worksheet.releaseGood, inventory, batchId: inventory.batchId, batchIdRef: inventory.batchIdRef, status: sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PICK, product: await tx.getRepository(product_base_1.Product).findOne(productId), packingType,
|
|
61
|
+
packingSize, orderProduct: targetProduct, refWorksheetId: worksheet.type == constants_1.WORKSHEET_TYPE.BATCH_PICKING ? worksheet.id : null, creator: user, updater: user }));
|
|
62
|
+
const currentLockedQty = inventory.lockedQty;
|
|
63
|
+
const currentLockedUomValue = inventory.lockedUomValue;
|
|
64
|
+
await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, targetInventory.inventory), { lockedQty: Boolean(currentLockedQty)
|
|
65
|
+
? targetInventory.releaseQty + currentLockedQty
|
|
66
|
+
: targetInventory.releaseQty, lockedUomValue: Boolean(currentLockedUomValue)
|
|
67
|
+
? targetInventory.releaseUomValue + currentLockedUomValue
|
|
68
|
+
: targetInventory.releaseUomValue, updater: user }));
|
|
69
|
+
// update order product status to ASSIGNED
|
|
70
|
+
await tx
|
|
71
|
+
.getRepository(sales_base_1.OrderProduct)
|
|
72
|
+
.update({ id: targetProduct.id }, { status: sales_base_1.ORDER_PRODUCT_STATUS.ASSIGNED, updater: user });
|
|
73
|
+
// 3. Create worksheet details
|
|
74
|
+
await tx.getRepository(entities_1.WorksheetDetail).save(Object.assign(Object.assign({}, wsd), { domain, bizplace: worksheet.bizplace, worksheet, name: worksheet.type == constants_1.WORKSHEET_TYPE.BATCH_PICKING
|
|
75
|
+
? utils_1.WorksheetNoGenerator.batchPickingDetail()
|
|
76
|
+
: utils_1.WorksheetNoGenerator.pickingDetail(), targetProduct,
|
|
77
|
+
targetInventory, type: worksheet.type == constants_1.WORKSHEET_TYPE.BATCH_PICKING ? constants_1.WORKSHEET_TYPE.BATCH_PICKING : constants_1.WORKSHEET_TYPE.PICKING, status: constants_1.WORKSHEET_STATUS.DEACTIVATED, creator: user, updater: user }));
|
|
78
|
+
}));
|
|
79
|
+
}
|
|
80
|
+
exports.regenerateReleaseGoodWorksheetDetails = regenerateReleaseGoodWorksheetDetails;
|
|
81
|
+
//# sourceMappingURL=regenerate-release-good-worksheet-details.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"regenerate-release-good-worksheet-details.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.GenerateBatchPickInfo = void 0;
|
|
4
|
+
const apollo_server_koa_1 = require("apollo-server-koa");
|
|
5
|
+
exports.GenerateBatchPickInfo = (0, apollo_server_koa_1.gql) `
|
|
6
|
+
input GenerateBatchPickInfo {
|
|
7
|
+
releaseGoodNo: String
|
|
8
|
+
bizplaceId: String
|
|
9
|
+
bizplaceName: String
|
|
10
|
+
}
|
|
11
|
+
`;
|
|
12
|
+
//# sourceMappingURL=batch-pick-worksheet-info.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"batch-pick-worksheet-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/batch-pick-worksheet-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,qBAAqB,GAAG,IAAA,uBAAG,EAAA;;;;;;CAMvC,CAAA"}
|
|
@@ -7,6 +7,7 @@ const contact_point_info_1 = require("./contact-point-info");
|
|
|
7
7
|
const cycle_count_worksheet_1 = require("./cycle-count-worksheet");
|
|
8
8
|
const delivery_info_1 = require("./delivery-info");
|
|
9
9
|
const delivery_order_info_1 = require("./delivery-order-info");
|
|
10
|
+
const delivery_order_ro_1 = require("./delivery-order-ro");
|
|
10
11
|
const delivery_worksheet_1 = require("./delivery-worksheet");
|
|
11
12
|
const executing_worksheet_1 = require("./executing-worksheet");
|
|
12
13
|
const find_release_orders_by_task_no_1 = require("./find-release-orders-by-task-no");
|
|
@@ -26,7 +27,7 @@ const worksheet_info_1 = require("./worksheet-info");
|
|
|
26
27
|
const worksheet_list_1 = require("./worksheet-list");
|
|
27
28
|
const worksheet_patch_1 = require("./worksheet-patch");
|
|
28
29
|
const worksheet_with_pagination_1 = require("./worksheet-with-pagination");
|
|
29
|
-
const
|
|
30
|
+
const batch_pick_worksheet_info_1 = require("./batch-pick-worksheet-info");
|
|
30
31
|
exports.Mutation = `
|
|
31
32
|
createWorksheet (
|
|
32
33
|
worksheet: NewWorksheet!
|
|
@@ -82,8 +83,7 @@ exports.Mutation = `
|
|
|
82
83
|
): ReleaseGoodWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
|
|
83
84
|
|
|
84
85
|
generateBatchPickingWorksheet (
|
|
85
|
-
|
|
86
|
-
partnerBizplaceId: String!
|
|
86
|
+
releaseGoodWithBiz: [[GenerateBatchPickInfo!]]
|
|
87
87
|
): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
|
|
88
88
|
|
|
89
89
|
generateCycleCountWorksheet (
|
|
@@ -333,6 +333,7 @@ exports.Mutation = `
|
|
|
333
333
|
binLocation: String
|
|
334
334
|
serialNumber: String
|
|
335
335
|
toteNo: String
|
|
336
|
+
pickingQty: Int
|
|
336
337
|
): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
|
|
337
338
|
|
|
338
339
|
sortingProduct (
|
|
@@ -380,6 +381,7 @@ exports.Mutation = `
|
|
|
380
381
|
productBarcode: String!
|
|
381
382
|
inventory: InventoryPatch!
|
|
382
383
|
binLocationName: String
|
|
384
|
+
pickingQty: Int
|
|
383
385
|
): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
|
|
384
386
|
|
|
385
387
|
crossDockPicking (
|
|
@@ -710,6 +712,8 @@ exports.Query = `
|
|
|
710
712
|
|
|
711
713
|
recommendPutawayLocation(worksheetDetailName: String!, optCnt: Int): [Location] @privilege(category: "worksheet", privilege: "query")
|
|
712
714
|
|
|
715
|
+
findSortingReleaseOrdersByTaskNo(taskNo: String!): FindReleaseOrdersByTaskNo @privilege(category: "worksheet", privilege: "query") @transaction
|
|
716
|
+
|
|
713
717
|
findReleaseOrdersByTaskNo(taskNo: String!): FindReleaseOrdersByTaskNo @privilege(category: "worksheet", privilege: "query") @transaction
|
|
714
718
|
`;
|
|
715
719
|
exports.Types = [
|
|
@@ -738,6 +742,7 @@ exports.Types = [
|
|
|
738
742
|
picking_assignment_status_1.PickingAssignmentStatus,
|
|
739
743
|
my_picking_assignment_status_1.MyPickingAssignmentStatus,
|
|
740
744
|
find_release_orders_by_task_no_1.FindReleaseOrdersByTaskNo,
|
|
741
|
-
delivery_order_ro_1.DeliveryOrderRO
|
|
745
|
+
delivery_order_ro_1.DeliveryOrderRO,
|
|
746
|
+
batch_pick_worksheet_info_1.GenerateBatchPickInfo
|
|
742
747
|
];
|
|
743
748
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AACrE,2EAAmE;AAEtD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8hBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgJlC,CAAA;AAEY,QAAA,KAAK,GAAgB;IAChC,qBAAS;IACT,uBAAU;IACV,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;CACtB,CAAA"}
|
|
@@ -30,6 +30,16 @@ exports.Mutation = `
|
|
|
30
30
|
worksheetDetails: [NewWorksheetDetail]
|
|
31
31
|
): Boolean @transaction
|
|
32
32
|
|
|
33
|
+
regenerateReleaseGoodWorksheetDetails (
|
|
34
|
+
worksheetNo: String!
|
|
35
|
+
batchId: String!
|
|
36
|
+
productId: String!
|
|
37
|
+
packingType: String!
|
|
38
|
+
packingSize: Float!
|
|
39
|
+
orderProductId: String!
|
|
40
|
+
worksheetDetails: [NewWorksheetDetail]
|
|
41
|
+
): Boolean @transaction
|
|
42
|
+
|
|
33
43
|
generateBatchPickingWorksheetDetails (
|
|
34
44
|
worksheetNo: String!
|
|
35
45
|
batchId: String!
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/index.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AACpD,iEAA2D;AAC3D,+CAA0C;AAC1C,yDAAoD;AACpD,mEAA6D;AAC7D,qEAA+D;AAElD,QAAA,QAAQ,GAAiB
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/index.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AACpD,iEAA2D;AAC3D,+CAA0C;AAC1C,yDAAoD;AACpD,mEAA6D;AAC7D,qEAA+D;AAElD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuDrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;CAOlC,CAAA;AAEY,QAAA,KAAK,GAAG;IACnB,kCAAe;IACf,yCAAkB;IAClB,6CAAoB;IACpB,2CAAmB;IACnB,wBAAU;IACV,kCAAe;CAChB,CAAA"}
|
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.66",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,21 +24,21 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/auth-base": "^4.3.
|
|
28
|
-
"@things-factory/biz-base": "^4.3.
|
|
29
|
-
"@things-factory/document-template-base": "^4.3.
|
|
30
|
-
"@things-factory/id-rule-base": "^4.3.
|
|
31
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
34
|
-
"@things-factory/integration-sftp": "^4.3.
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
36
|
-
"@things-factory/notification": "^4.3.
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
38
|
-
"@things-factory/setting-base": "^4.3.
|
|
39
|
-
"@things-factory/shell": "^4.3.
|
|
40
|
-
"@things-factory/transport-base": "^4.3.
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
27
|
+
"@things-factory/auth-base": "^4.3.66",
|
|
28
|
+
"@things-factory/biz-base": "^4.3.66",
|
|
29
|
+
"@things-factory/document-template-base": "^4.3.66",
|
|
30
|
+
"@things-factory/id-rule-base": "^4.3.66",
|
|
31
|
+
"@things-factory/integration-lmd": "^4.3.66",
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.3.66",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.3.66",
|
|
34
|
+
"@things-factory/integration-sftp": "^4.3.66",
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.66",
|
|
36
|
+
"@things-factory/notification": "^4.3.66",
|
|
37
|
+
"@things-factory/sales-base": "^4.3.66",
|
|
38
|
+
"@things-factory/setting-base": "^4.3.66",
|
|
39
|
+
"@things-factory/shell": "^4.3.66",
|
|
40
|
+
"@things-factory/transport-base": "^4.3.66",
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.66"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "27536aa67eccfb17d20ced5c898a838a61ff634f"
|
|
44
44
|
}
|