@things-factory/sales-base 4.3.588 → 4.3.593
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/service/inventory-check-item/inventory-check-item-query.js +4 -1
- package/dist-server/service/inventory-check-item/inventory-check-item-query.js.map +1 -1
- package/dist-server/service/invoice/invoice-mutation.js +14 -0
- package/dist-server/service/invoice/invoice-mutation.js.map +1 -1
- package/package.json +16 -16
- package/server/service/inventory-check-item/inventory-check-item-query.ts +8 -3
- package/server/service/invoice/invoice-mutation.ts +18 -0
|
@@ -29,6 +29,7 @@ let InventoryCheckItemQuery = class InventoryCheckItemQuery {
|
|
|
29
29
|
const qb = (0, typeorm_1.getRepository)(inventory_check_item_1.InventoryCheckItem).createQueryBuilder('InventoryCheckItem');
|
|
30
30
|
qb.innerJoinAndSelect('InventoryCheckItem.inventoryCheck', 'InventoryCheck');
|
|
31
31
|
qb.innerJoinAndSelect('InventoryCheckItem.inventory', 'Inventory');
|
|
32
|
+
qb.innerJoinAndSelect('InventoryCheckItem.product', 'Product', 'Product.id IS NOT NULL'); // Ensure product exists
|
|
32
33
|
qb.leftJoinAndSelect('InventoryCheckItem.originLocation', 'ORG_Location');
|
|
33
34
|
qb.leftJoinAndSelect('InventoryCheckItem.inspectedLocation', 'ISP_Location');
|
|
34
35
|
qb.innerJoinAndSelect('InventoryCheckItem.bizplace', 'Bizplace');
|
|
@@ -37,7 +38,9 @@ let InventoryCheckItemQuery = class InventoryCheckItemQuery {
|
|
|
37
38
|
qb.leftJoinAndSelect('InventoryCheckItem.updater', 'Updater');
|
|
38
39
|
qb.where('Domain.id = :domainId', { domainId: domain.id });
|
|
39
40
|
if (inventoryId === null || inventoryId === void 0 ? void 0 : inventoryId.value) {
|
|
40
|
-
qb.andWhere('Inventory.id = :inventoryId', {
|
|
41
|
+
qb.andWhere('Inventory.id = :inventoryId', {
|
|
42
|
+
inventoryId: inventoryId.value
|
|
43
|
+
});
|
|
41
44
|
}
|
|
42
45
|
if (cycleCountNo === null || cycleCountNo === void 0 ? void 0 : cycleCountNo.value) {
|
|
43
46
|
qb.andWhere('InventoryCheck.name = :cycleCountNo', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventory-check-item-query.js","sourceRoot":"","sources":["../../../server/service/inventory-check-item/inventory-check-item-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAgD;AAChD,iDAA8F;AAC9F,+CAA6E;AAC7E,qCAAuC;AACvC,0BAA2C;AAC3C,iEAA2D;AAGpD,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAE5B,AAAN,KAAK,CAAC,mBAAmB,CAChB,OAAY,EACmC,OAAkB,
|
|
1
|
+
{"version":3,"file":"inventory-check-item-query.js","sourceRoot":"","sources":["../../../server/service/inventory-check-item/inventory-check-item-query.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,20 @@ let InvoiceMutation = class InvoiceMutation {
|
|
|
23
23
|
async createInvoice(invoice, context) {
|
|
24
24
|
const { tx, domain, user } = context.state;
|
|
25
25
|
let invoiceProducts = invoice.invoiceProducts;
|
|
26
|
+
let conditions = {
|
|
27
|
+
domain,
|
|
28
|
+
refNo1: invoice === null || invoice === void 0 ? void 0 : invoice.refNo1,
|
|
29
|
+
refNo2: invoice === null || invoice === void 0 ? void 0 : invoice.refNo2
|
|
30
|
+
};
|
|
31
|
+
if (invoice === null || invoice === void 0 ? void 0 : invoice.refNo3) {
|
|
32
|
+
conditions.refNo3 = invoice === null || invoice === void 0 ? void 0 : invoice.refNo3;
|
|
33
|
+
}
|
|
34
|
+
const foundInvoice = await tx.getRepository(invoice_1.Invoice).findOne({
|
|
35
|
+
where: conditions
|
|
36
|
+
});
|
|
37
|
+
if (foundInvoice) {
|
|
38
|
+
throw new Error(`Invoice already exists`);
|
|
39
|
+
}
|
|
26
40
|
let createdInvoice = await tx.getRepository(invoice_1.Invoice).save(Object.assign(Object.assign({}, invoice), { domain, name: utils_1.OrderNoGenerator.invoice(),
|
|
27
41
|
// releaseGood: await tx.getRepository(ReleaseGood).findOne(invoice?.releaseGood.id),
|
|
28
42
|
creator: user }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoice-mutation.js","sourceRoot":"","sources":["../../../server/service/invoice/invoice-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAsE;AACtE,qCAAkE;AAKlE,2BAA8C;AAC9C,uCAA8C;AAC9C,wEAAmE;AACnE,uCAAmC;AAG5B,IAAM,eAAe,GAArB,MAAM,eAAe;IAGpB,AAAN,KAAK,CAAC,aAAa,CAAqC,OAAmB,EAAS,OAAY;QAC9F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,IAAI,eAAe,GAAU,OAAO,CAAC,eAAe,CAAA;QAEpD,IAAI,cAAc,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,iBAAO,CAAC,CAAC,IAAI,iCAC7D,OAAO,KACV,MAAM,EACN,IAAI,EAAE,wBAAgB,CAAC,OAAO,EAAE;YAChC,qFAAqF;YACrF,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,MAAM,kBAAkB,CAAC,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QAE3E,cAAc,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,iBAAO,CAAC,CAAC,OAAO,CAAC;YACvD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE;YACxC,SAAS,EAAE,CAAC,iBAAiB,CAAC;SAC/B,CAAC,CAAA;QAEF,OAAO,cAAc,CAAA;IACvB,CAAC;IAIK,AAAN,KAAK,CAAC,aAAa,CACJ,IAAY,EACW,KAAmB,EAChD,OAAY;QAEnB,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,iBAAO,CAAC,CAAA;QAC5C,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACvC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACxB,CAAC,CAAA;QAEF,OAAO,MAAM,UAAU,CAAC,IAAI,+CACvB,OAAO,GACP,KAAK,KACR,OAAO,EAAE,IAAI,IACb,CAAA;IACJ,CAAC;IAIK,AAAN,KAAK,CAAC,aAAa,CAAc,IAAY,EAAS,OAAY;QAChE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,MAAM,EAAE,CAAC,aAAa,CAAC,iBAAO,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QACxD,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"invoice-mutation.js","sourceRoot":"","sources":["../../../server/service/invoice/invoice-mutation.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": "4.3.
|
|
3
|
+
"version": "4.3.593",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -23,21 +23,21 @@
|
|
|
23
23
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@things-factory/attachment-base": "^4.3.
|
|
27
|
-
"@things-factory/auth-base": "^4.3.
|
|
28
|
-
"@things-factory/biz-base": "^4.3.
|
|
29
|
-
"@things-factory/code-base": "^4.3.
|
|
30
|
-
"@things-factory/integration-accounting": "^4.3.
|
|
31
|
-
"@things-factory/integration-base": "^4.3.
|
|
32
|
-
"@things-factory/integration-powrup": "^4.3.
|
|
33
|
-
"@things-factory/integration-sftp": "^4.3.
|
|
34
|
-
"@things-factory/notification": "^4.3.
|
|
35
|
-
"@things-factory/product-base": "^4.3.
|
|
36
|
-
"@things-factory/setting-base": "^4.3.
|
|
37
|
-
"@things-factory/shell": "^4.3.
|
|
38
|
-
"@things-factory/transport-base": "^4.3.
|
|
39
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
26
|
+
"@things-factory/attachment-base": "^4.3.591",
|
|
27
|
+
"@things-factory/auth-base": "^4.3.591",
|
|
28
|
+
"@things-factory/biz-base": "^4.3.591",
|
|
29
|
+
"@things-factory/code-base": "^4.3.591",
|
|
30
|
+
"@things-factory/integration-accounting": "^4.3.593",
|
|
31
|
+
"@things-factory/integration-base": "^4.3.591",
|
|
32
|
+
"@things-factory/integration-powrup": "^4.3.591",
|
|
33
|
+
"@things-factory/integration-sftp": "^4.3.591",
|
|
34
|
+
"@things-factory/notification": "^4.3.591",
|
|
35
|
+
"@things-factory/product-base": "^4.3.591",
|
|
36
|
+
"@things-factory/setting-base": "^4.3.591",
|
|
37
|
+
"@things-factory/shell": "^4.3.591",
|
|
38
|
+
"@things-factory/transport-base": "^4.3.591",
|
|
39
|
+
"@things-factory/warehouse-base": "^4.3.593",
|
|
40
40
|
"axios": "1.7.7"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "a011e1e4a67c4cb247735538ee1204f18326eaa8"
|
|
43
43
|
}
|
|
@@ -11,8 +11,10 @@ export class InventoryCheckItemQuery {
|
|
|
11
11
|
async inventoryCheckItems(
|
|
12
12
|
@Ctx() context: any,
|
|
13
13
|
@Arg('filters', type => [Filter], { nullable: true }) filters?: Filter[],
|
|
14
|
-
@Arg('pagination', type => Pagination, { nullable: true })
|
|
15
|
-
|
|
14
|
+
@Arg('pagination', type => Pagination, { nullable: true })
|
|
15
|
+
pagination?: Pagination,
|
|
16
|
+
@Arg('sortings', type => [Sorting], { nullable: true })
|
|
17
|
+
sortings?: Sorting[]
|
|
16
18
|
): Promise<InventoryCheckItemList> {
|
|
17
19
|
const { domain }: { domain: Domain } = context.state
|
|
18
20
|
const params = { filters, pagination }
|
|
@@ -22,6 +24,7 @@ export class InventoryCheckItemQuery {
|
|
|
22
24
|
const qb = getRepository(InventoryCheckItem).createQueryBuilder('InventoryCheckItem')
|
|
23
25
|
qb.innerJoinAndSelect('InventoryCheckItem.inventoryCheck', 'InventoryCheck')
|
|
24
26
|
qb.innerJoinAndSelect('InventoryCheckItem.inventory', 'Inventory')
|
|
27
|
+
qb.innerJoinAndSelect('InventoryCheckItem.product', 'Product', 'Product.id IS NOT NULL') // Ensure product exists
|
|
25
28
|
qb.leftJoinAndSelect('InventoryCheckItem.originLocation', 'ORG_Location')
|
|
26
29
|
qb.leftJoinAndSelect('InventoryCheckItem.inspectedLocation', 'ISP_Location')
|
|
27
30
|
qb.innerJoinAndSelect('InventoryCheckItem.bizplace', 'Bizplace')
|
|
@@ -31,7 +34,9 @@ export class InventoryCheckItemQuery {
|
|
|
31
34
|
qb.where('Domain.id = :domainId', { domainId: domain.id })
|
|
32
35
|
|
|
33
36
|
if (inventoryId?.value) {
|
|
34
|
-
qb.andWhere('Inventory.id = :inventoryId', {
|
|
37
|
+
qb.andWhere('Inventory.id = :inventoryId', {
|
|
38
|
+
inventoryId: inventoryId.value
|
|
39
|
+
})
|
|
35
40
|
}
|
|
36
41
|
|
|
37
42
|
if (cycleCountNo?.value) {
|
|
@@ -17,6 +17,24 @@ export class InvoiceMutation {
|
|
|
17
17
|
const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
|
|
18
18
|
let invoiceProducts: any[] = invoice.invoiceProducts
|
|
19
19
|
|
|
20
|
+
let conditions: any = {
|
|
21
|
+
domain,
|
|
22
|
+
refNo1: invoice?.refNo1,
|
|
23
|
+
refNo2: invoice?.refNo2
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
if (invoice?.refNo3) {
|
|
27
|
+
conditions.refNo3 = invoice?.refNo3
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
const foundInvoice = await tx.getRepository(Invoice).findOne({
|
|
31
|
+
where: conditions
|
|
32
|
+
})
|
|
33
|
+
|
|
34
|
+
if (foundInvoice) {
|
|
35
|
+
throw new Error(`Invoice already exists`)
|
|
36
|
+
}
|
|
37
|
+
|
|
20
38
|
let createdInvoice: Invoice = await tx.getRepository(Invoice).save({
|
|
21
39
|
...invoice,
|
|
22
40
|
domain,
|