@things-factory/worksheet-base 4.0.21 → 4.0.25
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/ecommerce/ecommerce-controller.js +10 -3
- package/dist-server/controllers/ecommerce/ecommerce-controller.js.map +1 -1
- package/dist-server/controllers/ecommerce/sellercraft-controller.js +5 -3
- package/dist-server/controllers/ecommerce/sellercraft-controller.js.map +1 -1
- package/dist-server/controllers/inbound/putaway-returning-worksheet-controller.js +24 -4
- package/dist-server/controllers/inbound/putaway-returning-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js +98 -140
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/packing-worksheet-controller.js +2 -6
- package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +4 -4
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/render-orientage-do.js +3 -3
- package/dist-server/controllers/render-orientage-do.js.map +1 -1
- package/dist-server/controllers/render-orientage-grn.js +4 -4
- package/dist-server/controllers/render-orientage-grn.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +5 -5
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.js +14 -0
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/index.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +8 -4
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js +6 -4
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +4 -7
- 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 +64 -54
- package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.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/putaway-returning-worksheet.js +3 -1
- package/dist-server/graphql/resolvers/worksheet/putaway-returning-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/putaway-worksheet.js +4 -2
- package/dist-server/graphql/resolvers/worksheet/putaway-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/return-worksheet.js +3 -1
- package/dist-server/graphql/resolvers/worksheet/return-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/sorting-worksheet.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/sorting-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading/index.js +4 -5
- package/dist-server/graphql/resolvers/worksheet/unloading/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading/undo-unloading.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/unloading/undo-unloading.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading-worksheet.js +4 -2
- package/dist-server/graphql/resolvers/worksheet/unloading-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/worksheet.js +28 -1
- package/dist-server/graphql/resolvers/worksheet/worksheet.js.map +1 -1
- package/dist-server/graphql/types/worksheet/index.js +7 -8
- package/dist-server/graphql/types/worksheet/index.js.map +1 -1
- package/dist-server/graphql/types/worksheet/worksheet-info.js +1 -0
- package/dist-server/graphql/types/worksheet/worksheet-info.js.map +1 -1
- package/package.json +16 -16
- package/server/controllers/ecommerce/ecommerce-controller.ts +18 -4
- package/server/controllers/ecommerce/sellercraft-controller.ts +11 -5
- package/server/controllers/inbound/putaway-returning-worksheet-controller.ts +28 -6
- package/server/controllers/inbound/unloading-worksheet-controller.ts +130 -152
- package/server/controllers/outbound/packing-worksheet-controller.ts +2 -7
- package/server/controllers/outbound/picking-worksheet-controller.ts +4 -4
- package/server/controllers/render-orientage-do.ts +7 -5
- package/server/controllers/render-orientage-grn.ts +9 -7
- package/server/controllers/worksheet-controller.ts +5 -5
- package/server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts +22 -0
- package/server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts +3 -1
- package/server/graphql/resolvers/worksheet/generate-worksheet/index.ts +2 -0
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +9 -5
- package/server/graphql/resolvers/worksheet/picking/activate-picking.ts +7 -4
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +4 -8
- package/server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts +67 -56
- package/server/graphql/resolvers/worksheet/picking-worksheet.ts +1 -0
- package/server/graphql/resolvers/worksheet/putaway-returning-worksheet.ts +7 -3
- package/server/graphql/resolvers/worksheet/putaway-worksheet.ts +7 -3
- package/server/graphql/resolvers/worksheet/return-worksheet.ts +7 -3
- package/server/graphql/resolvers/worksheet/sorting-worksheet.ts +5 -2
- package/server/graphql/resolvers/worksheet/unloading/index.ts +3 -5
- package/server/graphql/resolvers/worksheet/unloading/undo-unloading.ts +9 -6
- package/server/graphql/resolvers/worksheet/unloading-worksheet.ts +7 -3
- package/server/graphql/resolvers/worksheet/worksheet.ts +29 -1
- package/server/graphql/types/worksheet/index.ts +8 -9
- package/server/graphql/types/worksheet/worksheet-info.ts +1 -0
- package/dist-server/graphql/resolvers/worksheet/unloading/undo-product-scan-unload.js +0 -15
- package/dist-server/graphql/resolvers/worksheet/unloading/undo-product-scan-unload.js.map +0 -1
- package/server/graphql/resolvers/worksheet/unloading/undo-product-scan-unload.ts +0 -23
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.putawayWorksheetResolver = void 0;
|
|
4
|
-
const sales_base_1 = require("@things-factory/sales-base");
|
|
5
4
|
const typeorm_1 = require("typeorm");
|
|
6
|
-
const
|
|
5
|
+
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
6
|
const constants_1 = require("../../../constants");
|
|
7
|
+
const utils_1 = require("../../../utils");
|
|
8
8
|
exports.putawayWorksheetResolver = {
|
|
9
9
|
async putawayWorksheet(_, { arrivalNoticeNo }, context) {
|
|
10
10
|
var _a;
|
|
@@ -41,6 +41,8 @@ exports.putawayWorksheetResolver = {
|
|
|
41
41
|
partnerDomainId: customerBizplace === null || customerBizplace === void 0 ? void 0 : customerBizplace.domain.id,
|
|
42
42
|
customerCompanyDomainId: customerCompanyDomain.id,
|
|
43
43
|
refNo: arrivalNotice.refNo,
|
|
44
|
+
refNo2: arrivalNotice.refNo2,
|
|
45
|
+
refNo3: arrivalNotice.refNo3,
|
|
44
46
|
startedAt: worksheet.startedAt
|
|
45
47
|
},
|
|
46
48
|
worksheetDetailInfos: worksheet.worksheetDetails.map(async (putawayWSD) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"putaway-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/putaway-worksheet.ts"],"names":[],"mappings":";;;AAAA,2DAA0E;
|
|
1
|
+
{"version":3,"file":"putaway-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/putaway-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,2DAA0E;AAI1E,kDAAmD;AAEnD,0CAAwD;AAE3C,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,gBAAgB,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,EAAE,OAAY;;QAC9D,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,MAAM,aAAa,GAAkB,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,OAAO,CAAC;YAC9E,iGAAiG;YACjG,uDAAuD;YACvD,2DAA2D;YAC3D,KAAK,EAAE;gBACL,MAAM;gBACN,IAAI,EAAE,eAAe;gBACrB,oEAAoE;aACrE;YACD,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,yBAAyB,CAAC;SAC1F,CAAC,CAAA;QACF,MAAM,gBAAgB,GAAa,aAAa,CAAC,QAAQ,CAAA;QACzD,MAAM,qBAAqB,GAAW,MAAA,aAAa,CAAC,QAAQ,0CAAE,OAAO,CAAC,MAAM,CAAA;QAE5E,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;QACpE,MAAM,SAAS,GAAc,MAAM,IAAA,+BAAuB,EACxD,MAAM,EACN,aAAa,CAAC,QAAQ,EACtB;YACE,UAAU;YACV,eAAe;YACf,kBAAkB;YAClB,kCAAkC;YAClC,4CAA4C;YAC5C,qDAAqD;YACrD,oDAAoD;YACpD,2DAA2D;YAC3D,6BAA6B;SAC9B,EACD,0BAAc,CAAC,OAAO,EACtB,aAAa,CACd,CAAA;QAED,OAAO;YACL,aAAa,EAAE;gBACb,YAAY,EAAE,gBAAgB,CAAC,IAAI;gBACnC,eAAe,EAAE,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,MAAM,CAAC,EAAE;gBAC5C,uBAAuB,EAAE,qBAAqB,CAAC,EAAE;gBACjD,KAAK,EAAE,aAAa,CAAC,KAAK;gBAC1B,MAAM,EAAE,aAAa,CAAC,MAAM;gBAC5B,MAAM,EAAE,aAAa,CAAC,MAAM;gBAC5B,SAAS,EAAE,SAAS,CAAC,SAAS;aAC/B;YACD,oBAAoB,EAAE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,UAA2B,EAAE,EAAE;gBACzF,MAAM,eAAe,GAAmB,UAAU,CAAC,eAAe,CAAA;gBAClE,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;gBACtD,OAAO;oBACL,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,OAAO,EAAE,SAAS,CAAC,OAAO;oBAC1B,cAAc,EAAE,SAAS,CAAC,cAAc;oBACxC,UAAU,EAAE,SAAS,CAAC,UAAU;oBAChC,OAAO,EAAE,SAAS,CAAC,OAAO;oBAC1B,GAAG,EAAE,SAAS,CAAC,GAAG;oBAClB,MAAM,EAAE,UAAU,CAAC,MAAM;oBACzB,WAAW,EAAE,UAAU,CAAC,WAAW;oBACnC,UAAU,EAAE,eAAe,CAAC,IAAI;oBAChC,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,cAAc,EAAE,SAAS,CAAC,cAAc;iBACzC,CAAA;YACH,CAAC,CAAC;SACH,CAAA;IACH,CAAC;CACF,CAAA"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.returnWorksheetResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
-
const utils_1 = require("../../../utils");
|
|
6
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
6
|
const constants_1 = require("../../../constants");
|
|
7
|
+
const utils_1 = require("../../../utils");
|
|
8
8
|
exports.returnWorksheetResolver = {
|
|
9
9
|
async returnWorksheet(_, { releaseGoodNo }, context) {
|
|
10
10
|
var _a;
|
|
@@ -33,6 +33,8 @@ exports.returnWorksheetResolver = {
|
|
|
33
33
|
partnerDomainId: worksheet === null || worksheet === void 0 ? void 0 : worksheet.bizplace.domain.id,
|
|
34
34
|
customerCompanyDomainId: customerCompanyDomain.id,
|
|
35
35
|
refNo: releaseGood.refNo,
|
|
36
|
+
refNo2: releaseGood.refNo2,
|
|
37
|
+
refNo3: releaseGood.refNo3,
|
|
36
38
|
startedAt: worksheet.startedAt
|
|
37
39
|
},
|
|
38
40
|
worksheetDetailInfos: worksheet.worksheetDetails.map((returnWSD) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"return-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/return-worksheet.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"return-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/return-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,2DAAwE;AAIxE,kDAAmD;AAEnD,0CAAwD;AAE3C,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;;QAC3D,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,MAAM,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;YACtC,SAAS,EAAE,CAAC,UAAU,CAAC;SACxB,CAAC,CAAA;QACF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAEhE,MAAM,SAAS,GAAc,MAAM,IAAA,+BAAuB,EACxD,MAAM,EACN,WAAW,CAAC,QAAQ,EACpB;YACE,UAAU;YACV,iBAAiB;YACjB,kBAAkB;YAClB,yBAAyB;YACzB,kBAAkB;YAClB,kCAAkC;YAClC,4CAA4C;YAC5C,qDAAqD;YACrD,oDAAoD;SACrD,EACD,0BAAc,CAAC,gBAAgB,EAC/B,WAAW,CACZ,CAAA;QAED,MAAM,qBAAqB,GAAW,MAAA,SAAS,CAAC,QAAQ,0CAAE,OAAO,CAAC,MAAM,CAAA;QAExE,OAAO;YACL,aAAa,EAAE;gBACb,YAAY,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI;gBACvC,eAAe,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,MAAM,CAAC,EAAE;gBAC9C,uBAAuB,EAAE,qBAAqB,CAAC,EAAE;gBACjD,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,SAAS,EAAE,SAAS,CAAC,SAAS;aAC/B;YACD,oBAAoB,EAAE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,SAA0B,EAAE,EAAE;gBAClF,MAAM,eAAe,GAAmB,SAAS,CAAC,eAAe,CAAA;gBACjE,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;gBACtD,OAAO;oBACL,IAAI,EAAE,SAAS,CAAC,IAAI;oBACpB,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,QAAQ,EAAE,SAAS,CAAC,QAAQ;oBAC5B,OAAO,EAAE,SAAS,CAAC,OAAO;oBAC1B,UAAU,EAAE,SAAS,CAAC,UAAU;oBAChC,OAAO,EAAE,SAAS,CAAC,OAAO;oBAC1B,cAAc,EAAE,SAAS,CAAC,cAAc;oBACxC,GAAG,EAAE,eAAe,CAAC,UAAU;oBAC/B,MAAM,EAAE,SAAS,CAAC,MAAM;oBACxB,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,UAAU,EAAE,eAAe,CAAC,IAAI;oBAChC,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,QAAQ,EAAE,SAAS,CAAC,QAAQ;iBAC7B,CAAA;YACH,CAAC,CAAC;SACH,CAAA;IACH,CAAC;CACF,CAAA"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.sortingWorksheetResolver = void 0;
|
|
4
|
-
const sales_base_1 = require("@things-factory/sales-base");
|
|
5
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const sales_base_1 = require("@things-factory/sales-base");
|
|
6
6
|
const constants_1 = require("../../../constants");
|
|
7
7
|
const utils_1 = require("../../../utils");
|
|
8
8
|
exports.sortingWorksheetResolver = {
|
|
@@ -48,6 +48,7 @@ exports.sortingWorksheetResolver = {
|
|
|
48
48
|
startedAt: worksheet.startedAt,
|
|
49
49
|
refNo: releaseGood.refNo,
|
|
50
50
|
refNo2: releaseGood.refNo2,
|
|
51
|
+
refNo3: releaseGood.refNo3,
|
|
51
52
|
releaseGood
|
|
52
53
|
},
|
|
53
54
|
worksheetDetailInfos: items.map((item) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sorting-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/sorting-worksheet.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"sorting-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/sorting-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Mutations = void 0;
|
|
4
4
|
const activate_unloading_1 = require("./activate-unloading");
|
|
5
|
-
const unload_1 = require("./unload");
|
|
6
|
-
const scan_product_unload_1 = require("./scan-product-unload");
|
|
7
|
-
const undo_unloading_1 = require("./undo-unloading");
|
|
8
|
-
const undo_product_scan_unload_1 = require("./undo-product-scan-unload");
|
|
9
5
|
const complete_product_scan_unload_1 = require("./complete-product-scan-unload");
|
|
10
6
|
const complete_unloading_1 = require("./complete-unloading");
|
|
11
7
|
const complete_unloading_partially_1 = require("./complete-unloading-partially");
|
|
12
|
-
|
|
8
|
+
const scan_product_unload_1 = require("./scan-product-unload");
|
|
9
|
+
const undo_unloading_1 = require("./undo-unloading");
|
|
10
|
+
const unload_1 = require("./unload");
|
|
11
|
+
exports.Mutations = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, activate_unloading_1.activateUnloadingResolver), scan_product_unload_1.scanProductUnloadResolver), unload_1.unloadResolver), undo_unloading_1.undoUnloadingResolver), complete_product_scan_unload_1.completeProductScanUnloadResolver), complete_unloading_1.completeUnloadingResolver), complete_unloading_partially_1.completeUnloadingPartiallyResolver);
|
|
13
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/index.ts"],"names":[],"mappings":";;;AAAA,6DAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/index.ts"],"names":[],"mappings":";;;AAAA,6DAAgE;AAChE,iFAAkF;AAClF,6DAAgE;AAChE,iFAAmF;AACnF,+DAAiE;AACjE,qDAAwD;AACxD,qCAAyC;AAE5B,QAAA,SAAS,yGACjB,8CAAyB,GACzB,+CAAyB,GACzB,uBAAc,GACd,sCAAqB,GACrB,gEAAiC,GACjC,8CAAyB,GACzB,iEAAkC,EACtC"}
|
|
@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.undoUnloadingResolver = void 0;
|
|
4
4
|
const controllers_1 = require("../../../../controllers");
|
|
5
5
|
exports.undoUnloadingResolver = {
|
|
6
|
-
async undoUnloading(_, {
|
|
6
|
+
async undoUnloading(_, { orderType, orderNo, inventoryIds }, context) {
|
|
7
7
|
const { tx, domain, user } = context.state;
|
|
8
|
-
await undoUnloading(tx, domain, user,
|
|
8
|
+
await undoUnloading(tx, domain, user, orderType, orderNo, inventoryIds);
|
|
9
9
|
}
|
|
10
10
|
};
|
|
11
|
-
async function undoUnloading(tx, domain, user,
|
|
11
|
+
async function undoUnloading(tx, domain, user, orderType, orderNo, inventoryIds) {
|
|
12
12
|
const worksheetController = new controllers_1.UnloadingWorksheetController(tx, domain, user);
|
|
13
|
-
await worksheetController.undoUnload(
|
|
13
|
+
await worksheetController.undoUnload(orderType, orderNo, inventoryIds);
|
|
14
14
|
}
|
|
15
15
|
//# sourceMappingURL=undo-unloading.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"undo-unloading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/undo-unloading.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"undo-unloading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/undo-unloading.ts"],"names":[],"mappings":";;;AAKA,yDAAsE;AAEzD,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,OAAY;QAC5E,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;IACzE,CAAC;CACF,CAAA;AAED,KAAK,UAAU,aAAa,CAC1B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,SAAiB,EACjB,OAAe,EACf,YAAsB;IAEtB,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,MAAM,mBAAmB,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAA;AACxE,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.unloadingWorksheetResolver = void 0;
|
|
4
|
-
const sales_base_1 = require("@things-factory/sales-base");
|
|
5
4
|
const typeorm_1 = require("typeorm");
|
|
6
|
-
const
|
|
5
|
+
const sales_base_1 = require("@things-factory/sales-base");
|
|
7
6
|
const constants_1 = require("../../../constants");
|
|
8
7
|
const entities_1 = require("../../../entities");
|
|
8
|
+
const utils_1 = require("../../../utils");
|
|
9
9
|
exports.unloadingWorksheetResolver = {
|
|
10
10
|
async unloadingWorksheet(_, { arrivalNoticeNo }, context) {
|
|
11
11
|
var _a;
|
|
@@ -57,6 +57,8 @@ exports.unloadingWorksheetResolver = {
|
|
|
57
57
|
bufferLocation: worksheet.bufferLocation.name,
|
|
58
58
|
startedAt: worksheet.startedAt,
|
|
59
59
|
refNo: arrivalNotice.refNo,
|
|
60
|
+
refNo2: arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.refNo2,
|
|
61
|
+
refNo3: arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.refNo3,
|
|
60
62
|
looseItem: arrivalNotice.looseItem,
|
|
61
63
|
orderVas: vasWorksheet ? vasWorksheet.worksheetDetails : null
|
|
62
64
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unloading-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/unloading-worksheet.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"unloading-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/unloading-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,8 @@ exports.worksheetResolver = {
|
|
|
11
11
|
async worksheet(_, { name }, context) {
|
|
12
12
|
var _a, _b, _c, _d, _e;
|
|
13
13
|
const { domain } = context.state;
|
|
14
|
-
|
|
14
|
+
let worksheet;
|
|
15
|
+
worksheet = (await (0, typeorm_1.getRepository)(entities_1.Worksheet).findOne({
|
|
15
16
|
where: {
|
|
16
17
|
domain,
|
|
17
18
|
name
|
|
@@ -52,6 +53,32 @@ exports.worksheetResolver = {
|
|
|
52
53
|
'updater'
|
|
53
54
|
]
|
|
54
55
|
}));
|
|
56
|
+
if (!worksheet) {
|
|
57
|
+
worksheet = (await (0, typeorm_1.getRepository)(entities_1.Worksheet).findOne({
|
|
58
|
+
where: {
|
|
59
|
+
domain,
|
|
60
|
+
arrivalNotice: name
|
|
61
|
+
},
|
|
62
|
+
relations: [
|
|
63
|
+
'domain',
|
|
64
|
+
'bizplace',
|
|
65
|
+
'bizplace.domain',
|
|
66
|
+
'worksheetDetails',
|
|
67
|
+
'worksheetDetails.targetProduct',
|
|
68
|
+
'worksheetDetails.targetProduct.product',
|
|
69
|
+
'worksheetDetails.targetInventory',
|
|
70
|
+
'worksheetDetails.targetInventory.releaseGood',
|
|
71
|
+
'worksheetDetails.targetInventory.product',
|
|
72
|
+
'worksheetDetails.targetInventory.inventory',
|
|
73
|
+
'worksheetDetails.targetInventory.inventory.product',
|
|
74
|
+
'worksheetDetails.targetInventory.inventory.warehouse',
|
|
75
|
+
'worksheetDetails.targetInventory.inventory.location',
|
|
76
|
+
'worksheetDetails.targetInventory.inspectedLocation',
|
|
77
|
+
'creator',
|
|
78
|
+
'updater'
|
|
79
|
+
]
|
|
80
|
+
}));
|
|
81
|
+
}
|
|
55
82
|
let pWorksheetPickingItemSorting = (0, typeorm_1.getRepository)(setting_base_1.Setting).findOne({
|
|
56
83
|
where: { domain, category: 'location', name: 'rule-for-worksheet-release-goods-item' }
|
|
57
84
|
});
|
|
@@ -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;AAGtD,kDAAmD;AACnD,gDAA6C;AAShC,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,
|
|
1
|
+
{"version":3,"file":"worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,6 +63,10 @@ exports.Mutation = `
|
|
|
63
63
|
releaseGoodNo: String!
|
|
64
64
|
): ReleaseGoodWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
|
|
65
65
|
|
|
66
|
+
generateMultipleReleaseGoodWorksheet (
|
|
67
|
+
releaseGoodNos: [String!]
|
|
68
|
+
): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
|
|
69
|
+
|
|
66
70
|
fetchSellercraftAirwayBill (
|
|
67
71
|
releaseGoodNo: String!
|
|
68
72
|
): AirwayBill @privilege(category: "worksheet_control", privilege: "mutation") @transaction
|
|
@@ -188,14 +192,9 @@ exports.Mutation = `
|
|
|
188
192
|
): Boolean @transaction
|
|
189
193
|
|
|
190
194
|
undoUnloading (
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
undoProductScanUnload (
|
|
196
|
-
worksheetDetailName: String!
|
|
197
|
-
palletId: String
|
|
198
|
-
cartonId: String
|
|
195
|
+
orderType: String!
|
|
196
|
+
orderNo: String!
|
|
197
|
+
inventoryIds: [String]!
|
|
199
198
|
): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
|
|
200
199
|
|
|
201
200
|
completeUnloadingPartially (
|
|
@@ -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,+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;AAExD,QAAA,QAAQ,GAAiB
|
|
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,+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;AAExD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsfrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0IlC,CAAA;AAEY,QAAA,KAAK,GAAiB;IACjC,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;CAC1B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worksheet-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,aAAa,GAAG,IAAA,uBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"worksheet-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,aAAa,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2B/B,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.25",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,20 +24,20 @@
|
|
|
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.0.
|
|
28
|
-
"@things-factory/biz-base": "^4.0.
|
|
29
|
-
"@things-factory/document-template-base": "^4.0.
|
|
30
|
-
"@things-factory/id-rule-base": "^4.0.
|
|
31
|
-
"@things-factory/integration-lmd": "^4.0.
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.0.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.0.
|
|
34
|
-
"@things-factory/marketplace-base": "^4.0.
|
|
35
|
-
"@things-factory/notification": "^4.0.
|
|
36
|
-
"@things-factory/sales-base": "^4.0.
|
|
37
|
-
"@things-factory/setting-base": "^4.0.
|
|
38
|
-
"@things-factory/shell": "^4.0.
|
|
39
|
-
"@things-factory/transport-base": "^4.0.
|
|
40
|
-
"@things-factory/warehouse-base": "^4.0.
|
|
27
|
+
"@things-factory/auth-base": "^4.0.25",
|
|
28
|
+
"@things-factory/biz-base": "^4.0.25",
|
|
29
|
+
"@things-factory/document-template-base": "^4.0.25",
|
|
30
|
+
"@things-factory/id-rule-base": "^4.0.25",
|
|
31
|
+
"@things-factory/integration-lmd": "^4.0.25",
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.0.25",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.0.25",
|
|
34
|
+
"@things-factory/marketplace-base": "^4.0.25",
|
|
35
|
+
"@things-factory/notification": "^4.0.25",
|
|
36
|
+
"@things-factory/sales-base": "^4.0.25",
|
|
37
|
+
"@things-factory/setting-base": "^4.0.25",
|
|
38
|
+
"@things-factory/shell": "^4.0.25",
|
|
39
|
+
"@things-factory/transport-base": "^4.0.25",
|
|
40
|
+
"@things-factory/warehouse-base": "^4.0.25"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "9c44141d651dab7b4a9c0f0b6fecb8d6937d116f"
|
|
43
43
|
}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { Equal, Not } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { MarketplaceSetting, MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
|
|
2
4
|
import {
|
|
3
5
|
MarketplaceOrder,
|
|
@@ -6,7 +8,7 @@ import {
|
|
|
6
8
|
} from '@things-factory/marketplace-base'
|
|
7
9
|
import { ReleaseGood } from '@things-factory/sales-base'
|
|
8
10
|
import { Domain } from '@things-factory/shell'
|
|
9
|
-
import { getProductBundleInventory, Inventory } from '@things-factory/warehouse-base'
|
|
11
|
+
import { getProductBundleInventory, Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
|
|
10
12
|
|
|
11
13
|
import { WorksheetController } from '../worksheet-controller'
|
|
12
14
|
|
|
@@ -19,10 +21,20 @@ export class EcommerceController extends WorksheetController {
|
|
|
19
21
|
let inventoryProducts: any[] = await Promise.all(
|
|
20
22
|
orderProducts.map(async orderProduct => {
|
|
21
23
|
const product = orderProduct.product
|
|
22
|
-
|
|
23
|
-
where: {
|
|
24
|
+
let inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
|
|
25
|
+
where: {
|
|
26
|
+
domain: this.domain,
|
|
27
|
+
product: orderProduct.product,
|
|
28
|
+
status: Not(Equal(INVENTORY_STATUS.TERMINATED))
|
|
29
|
+
},
|
|
30
|
+
relations: ['location']
|
|
24
31
|
})
|
|
25
32
|
|
|
33
|
+
inventories = inventories.filter(
|
|
34
|
+
inventory =>
|
|
35
|
+
inventory?.location.type !== LOCATION_TYPE.QUARANTINE || inventory?.location.type !== LOCATION_TYPE.RESERVE
|
|
36
|
+
)
|
|
37
|
+
|
|
26
38
|
const inventoryQty: number = inventories.reduce((total, currentValue) => {
|
|
27
39
|
total += currentValue.qty
|
|
28
40
|
return total
|
|
@@ -74,7 +86,9 @@ export class EcommerceController extends WorksheetController {
|
|
|
74
86
|
}
|
|
75
87
|
|
|
76
88
|
let productVariationLocationId = marketplaceProductVariation?.locationId
|
|
77
|
-
let adjustQty: number = Math.floor(
|
|
89
|
+
let adjustQty: number = Math.floor(
|
|
90
|
+
(inventoryProduct.qty - marketplaceProductVariation.reserveQty) * (percentageValue / 100)
|
|
91
|
+
)
|
|
78
92
|
|
|
79
93
|
if (marketplaceStore.platform === 'shopify') {
|
|
80
94
|
let locationIds: any[] = JSON.parse(productVariationLocationId)
|
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
ReleaseGood,
|
|
11
11
|
ReturnOrder
|
|
12
12
|
} from '@things-factory/sales-base'
|
|
13
|
-
import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
|
|
13
|
+
import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
|
|
14
14
|
|
|
15
15
|
import { WorksheetController } from '../worksheet-controller'
|
|
16
16
|
|
|
@@ -113,10 +113,16 @@ export class SellercraftController extends WorksheetController {
|
|
|
113
113
|
async updateSellercraftStock(sellercraft: Sellercraft, inventory: Inventory): Promise<void> {
|
|
114
114
|
let product: Product = inventory.product
|
|
115
115
|
const productDetails: ProductDetail[] = product.productDetails
|
|
116
|
-
|
|
117
|
-
where: { domain: this.domain, product, status: Not(Equal(INVENTORY_STATUS.TERMINATED)) }
|
|
116
|
+
let inventories: Inventory[] = await this.trxMgr.getRepository(Inventory).find({
|
|
117
|
+
where: { domain: this.domain, product, status: Not(Equal(INVENTORY_STATUS.TERMINATED)) },
|
|
118
|
+
relations: ['location']
|
|
118
119
|
})
|
|
119
120
|
|
|
121
|
+
inventories = inventories.filter(
|
|
122
|
+
inventory =>
|
|
123
|
+
inventory?.location.type !== LOCATION_TYPE.QUARANTINE || inventory?.location.type !== LOCATION_TYPE.RESERVE
|
|
124
|
+
)
|
|
125
|
+
|
|
120
126
|
let defaultProductDetail: ProductDetail
|
|
121
127
|
const sellercraftInvs: any[] = await Promise.all(
|
|
122
128
|
inventories.map(async (inventory: Inventory) => {
|
|
@@ -158,7 +164,7 @@ export class SellercraftController extends WorksheetController {
|
|
|
158
164
|
await SellercraftAPI.updateProduct(sellercraft, { sellercraftInv })
|
|
159
165
|
}
|
|
160
166
|
|
|
161
|
-
async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<
|
|
167
|
+
async initiateOrderShipment(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<ReleaseGood> {
|
|
162
168
|
const orderInformation: any = {
|
|
163
169
|
accountId: sellercraft.accountId,
|
|
164
170
|
orderId: releaseGood.refNo2,
|
|
@@ -179,7 +185,7 @@ export class SellercraftController extends WorksheetController {
|
|
|
179
185
|
}
|
|
180
186
|
if (dropoffAddress) releaseGood.dropoffAddress = dropoffAddress
|
|
181
187
|
releaseGood.updater = this.user
|
|
182
|
-
await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
|
|
188
|
+
return await this.trxMgr.getRepository(ReleaseGood).save(releaseGood)
|
|
183
189
|
}
|
|
184
190
|
|
|
185
191
|
async initiateOrderDocument(sellercraft: Sellercraft, releaseGood: ReleaseGood): Promise<void> {
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
+
import { Equal, In, Not } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { Bizplace } from '@things-factory/biz-base'
|
|
2
4
|
import {
|
|
3
|
-
OrderInventory,
|
|
4
|
-
OrderNoGenerator,
|
|
5
5
|
ORDER_INVENTORY_STATUS,
|
|
6
6
|
ORDER_PRODUCT_STATUS,
|
|
7
7
|
ORDER_STATUS,
|
|
8
8
|
ORDER_TYPES,
|
|
9
|
+
OrderInventory,
|
|
10
|
+
OrderNoGenerator,
|
|
9
11
|
ReturnOrder
|
|
10
12
|
} from '@things-factory/sales-base'
|
|
11
13
|
import {
|
|
@@ -17,7 +19,7 @@ import {
|
|
|
17
19
|
Pallet,
|
|
18
20
|
Warehouse
|
|
19
21
|
} from '@things-factory/warehouse-base'
|
|
20
|
-
|
|
22
|
+
|
|
21
23
|
import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
|
|
22
24
|
import { Worksheet, WorksheetDetail } from '../../entities'
|
|
23
25
|
import { switchLocationStatus } from '../../utils'
|
|
@@ -207,7 +209,13 @@ export class PutawayReturningWorksheetController extends VasWorksheetController
|
|
|
207
209
|
where: {
|
|
208
210
|
domain: this.domain,
|
|
209
211
|
name: locationName,
|
|
210
|
-
type: In([
|
|
212
|
+
type: In([
|
|
213
|
+
LOCATION_TYPE.SHELF,
|
|
214
|
+
LOCATION_TYPE.BUFFER,
|
|
215
|
+
LOCATION_TYPE.FLOOR,
|
|
216
|
+
LOCATION_TYPE.QUARANTINE,
|
|
217
|
+
LOCATION_TYPE.RESERVED
|
|
218
|
+
])
|
|
211
219
|
},
|
|
212
220
|
relations: ['warehouse']
|
|
213
221
|
})
|
|
@@ -253,7 +261,14 @@ export class PutawayReturningWorksheetController extends VasWorksheetController
|
|
|
253
261
|
where: {
|
|
254
262
|
domain: this.domain,
|
|
255
263
|
name: locationName,
|
|
256
|
-
type: In([
|
|
264
|
+
type: In([
|
|
265
|
+
LOCATION_TYPE.SHELF,
|
|
266
|
+
LOCATION_TYPE.BUFFER,
|
|
267
|
+
LOCATION_TYPE.FLOOR,
|
|
268
|
+
LOCATION_TYPE.BIN,
|
|
269
|
+
LOCATION_TYPE.QUARANTINE,
|
|
270
|
+
LOCATION_TYPE.RESERVED
|
|
271
|
+
])
|
|
257
272
|
},
|
|
258
273
|
relations: ['warehouse']
|
|
259
274
|
})
|
|
@@ -298,7 +313,14 @@ export class PutawayReturningWorksheetController extends VasWorksheetController
|
|
|
298
313
|
where: {
|
|
299
314
|
domain: this.domain,
|
|
300
315
|
name: locationName,
|
|
301
|
-
type: In([
|
|
316
|
+
type: In([
|
|
317
|
+
LOCATION_TYPE.SHELF,
|
|
318
|
+
LOCATION_TYPE.FLOOR,
|
|
319
|
+
LOCATION_TYPE.BIN,
|
|
320
|
+
LOCATION_TYPE.BUFFER,
|
|
321
|
+
LOCATION_TYPE.QUARANTINE,
|
|
322
|
+
LOCATION_TYPE.RESERVED
|
|
323
|
+
])
|
|
302
324
|
},
|
|
303
325
|
relations: ['warehouse']
|
|
304
326
|
})
|