@things-factory/sales-base 3.6.29 → 3.6.33
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,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.dispatchDeliveryOrder = void 0;
|
|
4
|
-
const constants_1 = require("../../../constants");
|
|
5
|
-
const entities_1 = require("../../../entities");
|
|
6
4
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
7
5
|
const transport_base_1 = require("@things-factory/transport-base");
|
|
6
|
+
const constants_1 = require("../../../constants");
|
|
7
|
+
const entities_1 = require("../../../entities");
|
|
8
8
|
exports.dispatchDeliveryOrder = {
|
|
9
9
|
async dispatchDeliveryOrder(_, { orderInfo, orderItems }, context) {
|
|
10
10
|
try {
|
|
@@ -28,8 +28,10 @@ exports.dispatchDeliveryOrder = {
|
|
|
28
28
|
const product = inventory.product;
|
|
29
29
|
const foundItem = inventory.reusablePallet
|
|
30
30
|
? orderItems.filter((item) => item.productName === `${product.name} (${product.description})` &&
|
|
31
|
+
item.batchId === orderInventory.batchId &&
|
|
31
32
|
item.pallet === inventory.reusablePallet.name)
|
|
32
|
-
: orderItems.filter((item) => item.productName === `${product.name} (${product.description})`
|
|
33
|
+
: orderItems.filter((item) => item.productName === `${product.name} (${product.description})` &&
|
|
34
|
+
item.batchId === orderInventory.batchId);
|
|
33
35
|
if (foundItem[0].remark !== '')
|
|
34
36
|
orderInventory.remark = foundItem[0].remark;
|
|
35
37
|
return orderInventory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch-delivery-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/dispatch-delivery-order.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"dispatch-delivery-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/dispatch-delivery-order.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.6.
|
|
3
|
+
"version": "3.6.33",
|
|
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.33",
|
|
28
|
+
"@things-factory/auth-base": "^3.6.33",
|
|
29
|
+
"@things-factory/biz-base": "^3.6.33",
|
|
30
|
+
"@things-factory/code-base": "^3.6.33",
|
|
31
|
+
"@things-factory/notification": "^3.6.33",
|
|
32
|
+
"@things-factory/product-base": "^3.6.33",
|
|
33
|
+
"@things-factory/setting-base": "^3.6.33",
|
|
34
|
+
"@things-factory/shell": "^3.6.33",
|
|
35
|
+
"@things-factory/transport-base": "^3.6.33",
|
|
36
|
+
"@things-factory/warehouse-base": "^3.6.33"
|
|
37
37
|
},
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "965ef2f6fdc604b4f800e4d01337a3814b3b0d21"
|
|
39
39
|
}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { EntityManager } from 'typeorm'
|
|
2
|
-
|
|
3
|
-
import { DeliveryOrder, OrderInventory } from '../../../entities'
|
|
4
|
-
import { Domain } from '@things-factory/shell'
|
|
2
|
+
|
|
5
3
|
import { User } from '@things-factory/auth-base'
|
|
6
4
|
import { ContactPoint } from '@things-factory/biz-base'
|
|
5
|
+
import { Product } from '@things-factory/product-base'
|
|
6
|
+
import { Domain } from '@things-factory/shell'
|
|
7
7
|
import { TransportDriver, TransportVehicle, TRUCK_STATUS } from '@things-factory/transport-base'
|
|
8
8
|
import { Inventory } from '@things-factory/warehouse-base'
|
|
9
|
-
|
|
9
|
+
|
|
10
|
+
import { ORDER_STATUS } from '../../../constants'
|
|
11
|
+
import { DeliveryOrder, OrderInventory } from '../../../entities'
|
|
10
12
|
|
|
11
13
|
export const dispatchDeliveryOrder = {
|
|
12
14
|
async dispatchDeliveryOrder(_: any, { orderInfo, orderItems }, context: any) {
|
|
@@ -35,9 +37,14 @@ export const dispatchDeliveryOrder = {
|
|
|
35
37
|
? orderItems.filter(
|
|
36
38
|
(item: any) =>
|
|
37
39
|
item.productName === `${product.name} (${product.description})` &&
|
|
40
|
+
item.batchId === orderInventory.batchId &&
|
|
38
41
|
item.pallet === inventory.reusablePallet.name
|
|
39
42
|
)
|
|
40
|
-
: orderItems.filter(
|
|
43
|
+
: orderItems.filter(
|
|
44
|
+
(item: any) =>
|
|
45
|
+
item.productName === `${product.name} (${product.description})` &&
|
|
46
|
+
item.batchId === orderInventory.batchId
|
|
47
|
+
)
|
|
41
48
|
|
|
42
49
|
if (foundItem[0].remark !== '') orderInventory.remark = foundItem[0].remark
|
|
43
50
|
return orderInventory
|