@things-factory/worksheet-base 4.0.41 → 4.0.45
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/graphql/resolvers/worksheet/picking/complete-picking.js +6 -13
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/putaway-worksheet.js +2 -2
- package/dist-server/graphql/resolvers/worksheet/putaway-worksheet.js.map +1 -1
- package/package.json +17 -17
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +13 -14
- package/server/graphql/resolvers/worksheet/putaway-worksheet.ts +3 -2
|
@@ -33,18 +33,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
33
33
|
const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
|
|
34
34
|
let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
35
35
|
where: { domain, name: releaseGoodNo },
|
|
36
|
-
relations: [
|
|
37
|
-
'bizplace',
|
|
38
|
-
'bizplace.domain',
|
|
39
|
-
'bizplace.company',
|
|
40
|
-
'bizplace.company.domain',
|
|
41
|
-
'orderInventories',
|
|
42
|
-
'orderInventories.inventory',
|
|
43
|
-
'orderInventories.product',
|
|
44
|
-
'orderProducts',
|
|
45
|
-
'orderProducts.product',
|
|
46
|
-
'orderProducts.product.productDetails'
|
|
47
|
-
]
|
|
36
|
+
relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
|
|
48
37
|
});
|
|
49
38
|
const worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.PICKING, [
|
|
50
39
|
'worksheetDetails',
|
|
@@ -67,7 +56,11 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
67
56
|
if (sellercraft) {
|
|
68
57
|
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
69
58
|
if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId)) {
|
|
70
|
-
|
|
59
|
+
const orderProducts = await tx.getRepository(sales_base_1.OrderProduct).find({
|
|
60
|
+
where: { releaseGood },
|
|
61
|
+
relations: ['product', 'product.productDetails']
|
|
62
|
+
});
|
|
63
|
+
releaseGood = await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, releaseGood), { orderProducts }));
|
|
71
64
|
}
|
|
72
65
|
releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
|
|
73
66
|
await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":";;;AAGA,uDAAgF;AAChF,qEAA+E;AAC/E,qFAAkG;AAClG,qFAAwF;AACxF,uEAAuF;AACvF,uEAAmH;AACnH,
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,10 +20,10 @@ exports.putawayWorksheetResolver = {
|
|
|
20
20
|
},
|
|
21
21
|
relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
|
|
22
22
|
});
|
|
23
|
-
const customerBizplace = arrivalNotice.bizplace;
|
|
24
|
-
const customerCompanyDomain = (_a = arrivalNotice.bizplace) === null || _a === void 0 ? void 0 : _a.company.domain;
|
|
25
23
|
if (!arrivalNotice)
|
|
26
24
|
throw new Error(`Arrival notice dosen't exist.`);
|
|
25
|
+
const customerBizplace = arrivalNotice.bizplace;
|
|
26
|
+
const customerCompanyDomain = (_a = arrivalNotice.bizplace) === null || _a === void 0 ? void 0 : _a.company.domain;
|
|
27
27
|
const worksheet = await (0, utils_1.fetchExecutingWorksheet)(domain, arrivalNotice.bizplace, [
|
|
28
28
|
'bizplace',
|
|
29
29
|
'arrivalNotice',
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;QAEF,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;QAEpE,MAAM,gBAAgB,GAAa,aAAa,CAAC,QAAQ,CAAA;QACzD,MAAM,qBAAqB,GAAW,MAAA,aAAa,CAAC,QAAQ,0CAAE,OAAO,CAAC,MAAM,CAAA;QAC5E,MAAM,SAAS,GAAc,MAAM,IAAA,+BAAuB,EACxD,MAAM,EACN,aAAa,CAAC,QAAQ,EACtB;YACE,UAAU;YACV,eAAe;YACf,gBAAgB;YAChB,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,cAAc,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,cAAc,CAAC,IAAI;gBAC9C,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"}
|
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.45",
|
|
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.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/integration-sftp": "^4.0.
|
|
35
|
-
"@things-factory/marketplace-base": "^4.0.
|
|
36
|
-
"@things-factory/notification": "^4.0.
|
|
37
|
-
"@things-factory/sales-base": "^4.0.
|
|
38
|
-
"@things-factory/setting-base": "^4.0.
|
|
39
|
-
"@things-factory/shell": "^4.0.
|
|
40
|
-
"@things-factory/transport-base": "^4.0.
|
|
41
|
-
"@things-factory/warehouse-base": "^4.0.
|
|
27
|
+
"@things-factory/auth-base": "^4.0.45",
|
|
28
|
+
"@things-factory/biz-base": "^4.0.45",
|
|
29
|
+
"@things-factory/document-template-base": "^4.0.45",
|
|
30
|
+
"@things-factory/id-rule-base": "^4.0.45",
|
|
31
|
+
"@things-factory/integration-lmd": "^4.0.45",
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.0.45",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.0.45",
|
|
34
|
+
"@things-factory/integration-sftp": "^4.0.45",
|
|
35
|
+
"@things-factory/marketplace-base": "^4.0.45",
|
|
36
|
+
"@things-factory/notification": "^4.0.45",
|
|
37
|
+
"@things-factory/sales-base": "^4.0.45",
|
|
38
|
+
"@things-factory/setting-base": "^4.0.45",
|
|
39
|
+
"@things-factory/shell": "^4.0.45",
|
|
40
|
+
"@things-factory/transport-base": "^4.0.45",
|
|
41
|
+
"@things-factory/warehouse-base": "^4.0.45"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "6c37578551d77fed098e5eed4cd2cc9eb9c0dd4b"
|
|
44
44
|
}
|
|
@@ -7,7 +7,13 @@ import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integr
|
|
|
7
7
|
import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
|
|
8
8
|
import { COMPLETEDATAPATH, generateFile, Sftp } from '@things-factory/integration-sftp'
|
|
9
9
|
import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
|
|
10
|
-
import {
|
|
10
|
+
import {
|
|
11
|
+
ORDER_INVENTORY_STATUS,
|
|
12
|
+
ORDER_STATUS,
|
|
13
|
+
OrderInventory,
|
|
14
|
+
OrderProduct,
|
|
15
|
+
ReleaseGood
|
|
16
|
+
} from '@things-factory/sales-base'
|
|
11
17
|
import { PartnerSetting, Setting } from '@things-factory/setting-base'
|
|
12
18
|
import { Domain } from '@things-factory/shell'
|
|
13
19
|
|
|
@@ -48,18 +54,7 @@ export async function completePicking(
|
|
|
48
54
|
const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
|
|
49
55
|
let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
|
|
50
56
|
where: { domain, name: releaseGoodNo },
|
|
51
|
-
relations: [
|
|
52
|
-
'bizplace',
|
|
53
|
-
'bizplace.domain',
|
|
54
|
-
'bizplace.company',
|
|
55
|
-
'bizplace.company.domain',
|
|
56
|
-
'orderInventories',
|
|
57
|
-
'orderInventories.inventory',
|
|
58
|
-
'orderInventories.product',
|
|
59
|
-
'orderProducts',
|
|
60
|
-
'orderProducts.product',
|
|
61
|
-
'orderProducts.product.productDetails'
|
|
62
|
-
]
|
|
57
|
+
relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
|
|
63
58
|
})
|
|
64
59
|
|
|
65
60
|
const worksheet: Worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [
|
|
@@ -91,7 +86,11 @@ export async function completePicking(
|
|
|
91
86
|
const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
92
87
|
|
|
93
88
|
if (!releaseGood?.packageId) {
|
|
94
|
-
|
|
89
|
+
const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({
|
|
90
|
+
where: { releaseGood },
|
|
91
|
+
relations: ['product', 'product.productDetails']
|
|
92
|
+
})
|
|
93
|
+
releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
|
|
95
94
|
}
|
|
96
95
|
|
|
97
96
|
releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
@@ -23,10 +23,11 @@ export const putawayWorksheetResolver = {
|
|
|
23
23
|
},
|
|
24
24
|
relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
|
|
25
25
|
})
|
|
26
|
-
const customerBizplace: Bizplace = arrivalNotice.bizplace
|
|
27
|
-
const customerCompanyDomain: Domain = arrivalNotice.bizplace?.company.domain
|
|
28
26
|
|
|
29
27
|
if (!arrivalNotice) throw new Error(`Arrival notice dosen't exist.`)
|
|
28
|
+
|
|
29
|
+
const customerBizplace: Bizplace = arrivalNotice.bizplace
|
|
30
|
+
const customerCompanyDomain: Domain = arrivalNotice.bizplace?.company.domain
|
|
30
31
|
const worksheet: Worksheet = await fetchExecutingWorksheet(
|
|
31
32
|
domain,
|
|
32
33
|
arrivalNotice.bizplace,
|