@things-factory/sales-base 3.7.11 → 3.7.12
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.
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.deleteReleaseGood = exports.deleteReleaseGoodResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const attachment_base_1 = require("@things-factory/attachment-base");
|
|
5
6
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
6
|
-
const typeorm_1 = require("typeorm");
|
|
7
7
|
const attachment_type_1 = require("../../../constants/attachment-type");
|
|
8
8
|
const entities_1 = require("../../../entities");
|
|
9
9
|
const delete_arrival_notice_1 = require("../arrival-notice/delete-arrival-notice");
|
|
@@ -63,6 +63,7 @@ async function deleteReleaseGood(tx, name, user, domain) {
|
|
|
63
63
|
}
|
|
64
64
|
// 4. if there is SO, delete SO
|
|
65
65
|
if (foundSO) {
|
|
66
|
+
await tx.getRepository(entities_1.ReleaseGood).save(Object.assign(Object.assign({}, foundReleaseOrder), { shippingOrder: null }));
|
|
66
67
|
await tx.getRepository(entities_1.ShippingOrder).delete({ domain, id: foundSO.id });
|
|
67
68
|
}
|
|
68
69
|
if (foundAttachment) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/delete-release-good.ts"],"names":[],"mappings":";;;AAAA,qEAA4D;AAG5D,mEAA0D;
|
|
1
|
+
{"version":3,"file":"delete-release-good.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/release-good/delete-release-good.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/sales-base",
|
|
3
|
-
"version": "3.7.
|
|
3
|
+
"version": "3.7.12",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
"@things-factory/biz-base": "^3.7.5",
|
|
30
30
|
"@things-factory/code-base": "^3.7.5",
|
|
31
31
|
"@things-factory/notification": "^3.7.5",
|
|
32
|
-
"@things-factory/product-base": "^3.7.
|
|
32
|
+
"@things-factory/product-base": "^3.7.12",
|
|
33
33
|
"@things-factory/setting-base": "^3.7.5",
|
|
34
34
|
"@things-factory/shell": "^3.7.5",
|
|
35
35
|
"@things-factory/transport-base": "^3.7.5",
|
|
36
|
-
"@things-factory/warehouse-base": "^3.7.
|
|
36
|
+
"@things-factory/warehouse-base": "^3.7.12"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "a0cea72a9cb1b90d8b7eaf96f3c8ec0c77a540cf"
|
|
39
39
|
}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
import { EntityManager, In } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { Attachment } from '@things-factory/attachment-base'
|
|
2
4
|
import { User } from '@things-factory/auth-base'
|
|
3
5
|
import { Domain } from '@things-factory/shell'
|
|
4
6
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
5
|
-
|
|
7
|
+
|
|
6
8
|
import { ATTACHMENT_TYPE } from '../../../constants/attachment-type'
|
|
7
|
-
import { ArrivalNotice,
|
|
9
|
+
import { ArrivalNotice, OrderInventory, OrderProduct, OrderVas, ReleaseGood, ShippingOrder } from '../../../entities'
|
|
8
10
|
import { deleteArrivalNotice } from '../arrival-notice/delete-arrival-notice'
|
|
9
11
|
|
|
10
12
|
export const deleteReleaseGoodResolver = {
|
|
@@ -45,7 +47,8 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
|
|
|
45
47
|
}
|
|
46
48
|
|
|
47
49
|
// Delete order inventories by ids
|
|
48
|
-
await Promise.all(
|
|
50
|
+
await Promise.all(
|
|
51
|
+
foundOIs.map(async (oi: OrderInventory) => {
|
|
49
52
|
if (oi?.inventory?.id) {
|
|
50
53
|
oi.inventory = await tx.getRepository(Inventory).findOne(oi.inventory.id)
|
|
51
54
|
|
|
@@ -59,7 +62,7 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
|
|
|
59
62
|
|
|
60
63
|
await tx.getRepository(OrderInventory).delete({ id: oi.id })
|
|
61
64
|
|
|
62
|
-
if(oi?.orderProduct?.id){
|
|
65
|
+
if (oi?.orderProduct?.id) {
|
|
63
66
|
await tx.getRepository(OrderProduct).delete({ id: oi.orderProduct.id })
|
|
64
67
|
}
|
|
65
68
|
|
|
@@ -75,6 +78,7 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
|
|
|
75
78
|
|
|
76
79
|
// 4. if there is SO, delete SO
|
|
77
80
|
if (foundSO) {
|
|
81
|
+
await tx.getRepository(ReleaseGood).save({ ...foundReleaseOrder, shippingOrder: null })
|
|
78
82
|
await tx.getRepository(ShippingOrder).delete({ domain, id: foundSO.id })
|
|
79
83
|
}
|
|
80
84
|
|