@things-factory/sales-base 3.6.38 → 3.6.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/entities/arrival-notice.js +5 -1
- package/dist-server/entities/arrival-notice.js.map +1 -1
- package/dist-server/graphql/resolvers/arrival-notice/arrival-notice.js +8 -0
- package/dist-server/graphql/resolvers/arrival-notice/arrival-notice.js.map +1 -1
- package/dist-server/graphql/resolvers/release-good/release-good-detail.js +2 -3
- package/dist-server/graphql/resolvers/release-good/release-good-detail.js.map +1 -1
- package/dist-server/graphql/types/arrival-notice/arrival-notice.js +1 -0
- package/dist-server/graphql/types/arrival-notice/arrival-notice.js.map +1 -1
- package/package.json +12 -12
- package/server/entities/arrival-notice.ts +9 -5
- package/server/graphql/resolvers/arrival-notice/arrival-notice.ts +8 -0
- package/server/graphql/resolvers/release-good/release-good-detail.ts +5 -3
- package/server/graphql/types/arrival-notice/arrival-notice.ts +1 -0
|
@@ -11,10 +11,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var _a, _b, _c, _d, _e, _f;
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.ArrivalNotice = void 0;
|
|
14
|
+
const typeorm_1 = require("typeorm");
|
|
14
15
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
15
16
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
16
17
|
const shell_1 = require("@things-factory/shell");
|
|
17
|
-
const typeorm_1 = require("typeorm");
|
|
18
18
|
const entities_1 = require("../entities");
|
|
19
19
|
let ArrivalNotice = class ArrivalNotice {
|
|
20
20
|
};
|
|
@@ -76,6 +76,10 @@ __decorate([
|
|
|
76
76
|
(0, typeorm_1.OneToMany)(type => entities_1.OrderProduct, orderProduct => orderProduct.arrivalNotice),
|
|
77
77
|
__metadata("design:type", Array)
|
|
78
78
|
], ArrivalNotice.prototype, "orderProducts", void 0);
|
|
79
|
+
__decorate([
|
|
80
|
+
(0, typeorm_1.OneToMany)(type => entities_1.OrderInventory, orderInventory => orderInventory.arrivalNotice),
|
|
81
|
+
__metadata("design:type", Array)
|
|
82
|
+
], ArrivalNotice.prototype, "orderInventories", void 0);
|
|
79
83
|
__decorate([
|
|
80
84
|
(0, typeorm_1.OneToMany)(type => entities_1.OrderVas, orderVas => orderVas.arrivalNotice),
|
|
81
85
|
__metadata("design:type", Array)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../server/entities/arrival-notice.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,uDAAiE;AACjE,iDAA8C;
|
|
1
|
+
{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../server/entities/arrival-notice.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,10 @@ exports.arrivalNoticeResolver = {
|
|
|
27
27
|
'purchaseOrder.bufferLocation',
|
|
28
28
|
'orderProducts',
|
|
29
29
|
'orderProducts.product',
|
|
30
|
+
'orderInventories',
|
|
31
|
+
'orderInventories.inventory',
|
|
32
|
+
'orderInventories.inventory.product',
|
|
33
|
+
'orderInventories.inventory.location',
|
|
30
34
|
'orderVass',
|
|
31
35
|
'orderVass.vas',
|
|
32
36
|
'orderVass.targetProduct',
|
|
@@ -52,6 +56,10 @@ exports.arrivalNoticeResolver = {
|
|
|
52
56
|
'purchaseOrder.bufferLocation',
|
|
53
57
|
'orderProducts',
|
|
54
58
|
'orderProducts.product',
|
|
59
|
+
'orderInventories',
|
|
60
|
+
'orderInventories.inventory',
|
|
61
|
+
'orderInventories.inventory.product',
|
|
62
|
+
'orderInventories.inventory.location',
|
|
55
63
|
'orderVass',
|
|
56
64
|
'orderVass.vas',
|
|
57
65
|
'orderVass.targetProduct',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAE3C,qEAA4D;AAE5D,uDAA4E;AAG5E,wEAAoE;AACpE,gDAAiD;AAEpC,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,OAAY;;QACvD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAuD,OAAO,CAAC,KAAK,CAAA;QAEpG,IAAI,QAAuB,CAAA;QAE3B,IAAI,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,QAAQ,EAAE;YAC5B,IAAI,KAAU,CAAA;YAEd,IAAI,IAAI;gBAAE,KAAK,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;;gBACvC,KAAK,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;YAExC,QAAQ,GAAG,MAAM,IAAA,uBAAa,EAAC,wBAAa,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,oBAAO,KAAK,CAAE;gBACnB,SAAS,EAAE;oBACT,QAAQ;oBACR,UAAU;oBACV,aAAa;oBACb,eAAe;oBACf,8BAA8B;oBAC9B,eAAe;oBACf,uBAAuB;oBACvB,WAAW;oBACX,eAAe;oBACf,yBAAyB;oBACzB,UAAU;oBACV,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAA;SACH;aAAM;YACL,IAAI,KAAU,CAAA;YAEd,IAAI,IAAI;gBAAE,KAAK,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAA,YAAE,EAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAA;;gBACxF,KAAK,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAA,YAAE,EAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAA;YAEzF,QAAQ,GAAG,MAAM,IAAA,uBAAa,EAAC,wBAAa,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,oBAAO,KAAK,CAAE;gBACnB,SAAS,EAAE;oBACT,QAAQ;oBACR,UAAU;oBACV,aAAa;oBACb,eAAe;oBACf,8BAA8B;oBAC9B,eAAe;oBACf,uBAAuB;oBACvB,WAAW;oBACX,eAAe;oBACf,yBAAyB;oBACzB,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAA;SACH;QAED,IAAI,IAAI,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAA;QAEpF,MAAM,gBAAgB,GAAiB,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,IAAI,CAAC;YAC1E,KAAK,EAAE;gBACL,MAAM;gBACN,KAAK,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,EAAE;gBACnB,QAAQ,EAAE,iCAAe,CAAC,GAAG;aAC9B;SACF,CAAC,CAAA;QAEF,MAAM,kBAAkB,GAAiB,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa,0CAAE,EAAE;YAClE,CAAC,CAAC,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,IAAI,CAAC;gBACnC,KAAK,EAAE;oBACL,MAAM;oBACN,KAAK,EAAE,MAAA,QAAQ,CAAC,aAAa,0CAAE,EAAE;oBACjC,QAAQ,EAAE,iCAAe,CAAC,EAAE;iBAC7B;aACF,CAAC;YACJ,CAAC,CAAC,EAAE,CAAA;QAEN,uCACK,QAAQ,KACX,UAAU,EAAE,CAAC,GAAG,kBAAkB,EAAE,GAAG,gBAAgB,CAAC,IACzD;IACH,CAAC;CACF,CAAA"}
|
|
1
|
+
{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ const orderBy_1 = __importDefault(require("lodash/orderBy"));
|
|
|
8
8
|
const attachment_base_1 = require("@things-factory/attachment-base");
|
|
9
9
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
10
10
|
const constants_1 = require("../../../constants");
|
|
11
|
-
const attachment_type_1 = require("../../../constants/attachment-type");
|
|
12
11
|
const entities_1 = require("../../../entities");
|
|
13
12
|
exports.releaseGoodDetailResolver = {
|
|
14
13
|
async releaseGoodDetail(_, { name, refNo }, context) {
|
|
@@ -46,12 +45,12 @@ exports.releaseGoodDetailResolver = {
|
|
|
46
45
|
where: {
|
|
47
46
|
domain,
|
|
48
47
|
refBy: releaseGood.id,
|
|
49
|
-
category:
|
|
48
|
+
category: constants_1.ATTACHMENT_TYPE.DELIVERY_ORDER
|
|
50
49
|
}
|
|
51
50
|
});
|
|
52
51
|
await prepOITempTable(domain, tx);
|
|
53
52
|
let invInfos = await Promise.all(releaseGood.orderInventories
|
|
54
|
-
.filter(itm => itm.status
|
|
53
|
+
.filter(itm => itm.status !== constants_1.ORDER_INVENTORY_STATUS.COMPLETE_SPLIT && itm.status !== constants_1.ORDER_INVENTORY_STATUS.REPLACED)
|
|
55
54
|
.map(async (orderInv) => {
|
|
56
55
|
var _a;
|
|
57
56
|
if ((_a = orderInv === null || orderInv === void 0 ? void 0 : orderInv.inventory) === null || _a === void 0 ? void 0 : _a.id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"release-good-detail.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/release-good-detail.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAoC;AAGpC,qEAA4D;AAG5D,mEAA0D;AAE1D,
|
|
1
|
+
{"version":3,"file":"release-good-detail.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/release-good-detail.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,7 @@ exports.ArrivalNotice = (0, graphql_tag_1.default) `
|
|
|
31
31
|
remark: String
|
|
32
32
|
purchaseOrder: PurchaseOrder
|
|
33
33
|
orderProducts: [OrderProduct]
|
|
34
|
+
orderInventories: [OrderInventory]
|
|
34
35
|
orderVass: [OrderVas]
|
|
35
36
|
collectionOrders: [CollectionOrder]
|
|
36
37
|
attachment: [Attachment]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/types/arrival-notice/arrival-notice.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/types/arrival-notice/arrival-notice.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,aAAa,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsC/B,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/sales-base",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.45",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,16 +24,16 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/attachment-base": "^3.6.
|
|
28
|
-
"@things-factory/auth-base": "^3.6.
|
|
29
|
-
"@things-factory/biz-base": "^3.6.
|
|
30
|
-
"@things-factory/code-base": "^3.6.
|
|
31
|
-
"@things-factory/notification": "^3.6.
|
|
32
|
-
"@things-factory/product-base": "^3.6.
|
|
33
|
-
"@things-factory/setting-base": "^3.6.
|
|
34
|
-
"@things-factory/shell": "^3.6.
|
|
35
|
-
"@things-factory/transport-base": "^3.6.
|
|
36
|
-
"@things-factory/warehouse-base": "^3.6.
|
|
27
|
+
"@things-factory/attachment-base": "^3.6.45",
|
|
28
|
+
"@things-factory/auth-base": "^3.6.45",
|
|
29
|
+
"@things-factory/biz-base": "^3.6.45",
|
|
30
|
+
"@things-factory/code-base": "^3.6.45",
|
|
31
|
+
"@things-factory/notification": "^3.6.45",
|
|
32
|
+
"@things-factory/product-base": "^3.6.45",
|
|
33
|
+
"@things-factory/setting-base": "^3.6.45",
|
|
34
|
+
"@things-factory/shell": "^3.6.45",
|
|
35
|
+
"@things-factory/transport-base": "^3.6.45",
|
|
36
|
+
"@things-factory/warehouse-base": "^3.6.45"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "a56491c920df03e4b3806923b9abb547efb39d83"
|
|
39
39
|
}
|
|
@@ -1,20 +1,21 @@
|
|
|
1
|
-
import { User } from '@things-factory/auth-base'
|
|
2
|
-
import { Bizplace, ContactPoint } from '@things-factory/biz-base'
|
|
3
|
-
import { Domain } from '@things-factory/shell'
|
|
4
1
|
import {
|
|
5
2
|
Column,
|
|
6
3
|
CreateDateColumn,
|
|
7
4
|
Entity,
|
|
8
5
|
Index,
|
|
6
|
+
JoinColumn,
|
|
9
7
|
ManyToOne,
|
|
10
8
|
OneToMany,
|
|
11
9
|
OneToOne,
|
|
12
|
-
JoinColumn,
|
|
13
10
|
PrimaryGeneratedColumn,
|
|
14
11
|
UpdateDateColumn
|
|
15
12
|
} from 'typeorm'
|
|
16
13
|
|
|
17
|
-
import {
|
|
14
|
+
import { User } from '@things-factory/auth-base'
|
|
15
|
+
import { Bizplace, ContactPoint } from '@things-factory/biz-base'
|
|
16
|
+
import { Domain } from '@things-factory/shell'
|
|
17
|
+
|
|
18
|
+
import { CollectionOrder, OrderInventory, OrderProduct, OrderVas, PurchaseOrder, ReleaseGood } from '../entities'
|
|
18
19
|
|
|
19
20
|
@Entity()
|
|
20
21
|
@Index('ix_arrival-notice_0', (arrivalNotice: ArrivalNotice) => [arrivalNotice.domain, arrivalNotice.name], {
|
|
@@ -67,6 +68,9 @@ export class ArrivalNotice {
|
|
|
67
68
|
@OneToMany(type => OrderProduct, orderProduct => orderProduct.arrivalNotice)
|
|
68
69
|
orderProducts: OrderProduct[]
|
|
69
70
|
|
|
71
|
+
@OneToMany(type => OrderInventory, orderInventory => orderInventory.arrivalNotice)
|
|
72
|
+
orderInventories: OrderInventory[]
|
|
73
|
+
|
|
70
74
|
@OneToMany(type => OrderVas, orderVas => orderVas.arrivalNotice)
|
|
71
75
|
orderVass: OrderVas[]
|
|
72
76
|
|
|
@@ -30,6 +30,10 @@ export const arrivalNoticeResolver = {
|
|
|
30
30
|
'purchaseOrder.bufferLocation',
|
|
31
31
|
'orderProducts',
|
|
32
32
|
'orderProducts.product',
|
|
33
|
+
'orderInventories',
|
|
34
|
+
'orderInventories.inventory',
|
|
35
|
+
'orderInventories.inventory.product',
|
|
36
|
+
'orderInventories.inventory.location',
|
|
33
37
|
'orderVass',
|
|
34
38
|
'orderVass.vas',
|
|
35
39
|
'orderVass.targetProduct',
|
|
@@ -54,6 +58,10 @@ export const arrivalNoticeResolver = {
|
|
|
54
58
|
'purchaseOrder.bufferLocation',
|
|
55
59
|
'orderProducts',
|
|
56
60
|
'orderProducts.product',
|
|
61
|
+
'orderInventories',
|
|
62
|
+
'orderInventories.inventory',
|
|
63
|
+
'orderInventories.inventory.product',
|
|
64
|
+
'orderInventories.inventory.location',
|
|
57
65
|
'orderVass',
|
|
58
66
|
'orderVass.vas',
|
|
59
67
|
'orderVass.targetProduct',
|
|
@@ -6,8 +6,7 @@ import { Product } from '@things-factory/product-base'
|
|
|
6
6
|
import { Domain } from '@things-factory/shell'
|
|
7
7
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
8
8
|
|
|
9
|
-
import { ORDER_INVENTORY_STATUS } from '../../../constants'
|
|
10
|
-
import { ATTACHMENT_TYPE } from '../../../constants/attachment-type'
|
|
9
|
+
import { ATTACHMENT_TYPE, ORDER_INVENTORY_STATUS } from '../../../constants'
|
|
11
10
|
import { OrderInventory, ReleaseGood, ShippingOrder } from '../../../entities'
|
|
12
11
|
|
|
13
12
|
export const releaseGoodDetailResolver = {
|
|
@@ -55,7 +54,10 @@ export const releaseGoodDetailResolver = {
|
|
|
55
54
|
|
|
56
55
|
let invInfos = await Promise.all(
|
|
57
56
|
releaseGood.orderInventories
|
|
58
|
-
.filter(
|
|
57
|
+
.filter(
|
|
58
|
+
itm =>
|
|
59
|
+
itm.status !== ORDER_INVENTORY_STATUS.COMPLETE_SPLIT && itm.status !== ORDER_INVENTORY_STATUS.REPLACED
|
|
60
|
+
)
|
|
59
61
|
.map(async (orderInv: OrderInventory) => {
|
|
60
62
|
if (orderInv?.inventory?.id) {
|
|
61
63
|
const inventory: Inventory = orderInv.inventory
|