@things-factory/worksheet-base 4.3.88 → 4.3.94-alpha.1
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/controllers/ecommerce/ecommerce-controller.js +1 -1
- package/dist-server/controllers/ecommerce/ecommerce-controller.js.map +1 -1
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js +87 -71
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/inspect/cycle-count-worksheet-controller.js +2 -4
- package/dist-server/controllers/inspect/cycle-count-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/loading-worksheet-controller.js +10 -4
- package/dist-server/controllers/outbound/loading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/packing-worksheet-controller.js +47 -33
- package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +78 -48
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/sorting-worksheet-controller.js +12 -14
- package/dist-server/controllers/outbound/sorting-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/vas/vas-worksheet-controller.js +1 -2
- package/dist-server/controllers/vas/vas-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +3 -8
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/entities/index.js +3 -2
- package/dist-server/entities/index.js.map +1 -1
- package/dist-server/entities/warehouse-bizplace-onhand-inventory.js +29 -62
- package/dist-server/entities/warehouse-bizplace-onhand-inventory.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/batch-picking-worksheet.js +6 -0
- package/dist-server/graphql/resolvers/worksheet/batch-picking-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js +1 -2
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/cycle-count-adjustment.js +6 -6
- package/dist-server/graphql/resolvers/worksheet/cycle-count-adjustment.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/delivery-order-by-worksheet.js +7 -4
- package/dist-server/graphql/resolvers/worksheet/delivery-order-by-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js +67 -28
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/activate-packing.js +23 -8
- package/dist-server/graphql/resolvers/worksheet/packing/activate-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js +30 -7
- package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js +23 -8
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js +25 -8
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +60 -12
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js +51 -25
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js +37 -29
- package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +132 -118
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js +3 -2
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/proceed-extra-products.js +6 -4
- package/dist-server/graphql/resolvers/worksheet/proceed-extra-products.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js +39 -14
- package/dist-server/graphql/resolvers/worksheet/putaway/complete-putaway.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/transfer.js +9 -9
- package/dist-server/graphql/resolvers/worksheet/transfer.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/common-utils.js +17 -17
- package/dist-server/graphql/resolvers/worksheet/vas-transactions/common-utils.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.js +4 -4
- package/dist-server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.js.map +1 -1
- package/dist-server/graphql/types/worksheet/delivery-order-info.js +1 -0
- package/dist-server/graphql/types/worksheet/delivery-order-info.js.map +1 -1
- package/dist-server/graphql/types/worksheet-detail/index.js +1 -0
- package/dist-server/graphql/types/worksheet-detail/index.js.map +1 -1
- package/dist-server/utils/inventory-util.js +1 -98
- package/dist-server/utils/inventory-util.js.map +1 -1
- package/package.json +17 -17
- package/server/controllers/ecommerce/ecommerce-controller.ts +1 -1
- package/server/controllers/inbound/unloading-worksheet-controller.ts +102 -84
- package/server/controllers/inspect/cycle-count-worksheet-controller.ts +2 -4
- package/server/controllers/outbound/loading-worksheet-controller.ts +9 -3
- package/server/controllers/outbound/packing-worksheet-controller.ts +56 -45
- package/server/controllers/outbound/picking-worksheet-controller.ts +98 -66
- package/server/controllers/outbound/sorting-worksheet-controller.ts +12 -12
- package/server/controllers/vas/vas-worksheet-controller.ts +2 -2
- package/server/controllers/worksheet-controller.ts +18 -23
- package/server/entities/index.ts +2 -2
- package/server/entities/warehouse-bizplace-onhand-inventory.ts +29 -63
- package/server/graphql/resolvers/worksheet/batch-picking-worksheet.ts +6 -0
- package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts +1 -2
- package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts +2 -2
- package/server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts +7 -6
- package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +3 -1
- package/server/graphql/resolvers/worksheet/loading/complete-loading.ts +77 -33
- package/server/graphql/resolvers/worksheet/packing/activate-packing.ts +26 -9
- package/server/graphql/resolvers/worksheet/packing/complete-packing.ts +34 -9
- package/server/graphql/resolvers/worksheet/packing/packing.ts +26 -9
- package/server/graphql/resolvers/worksheet/packing/scan-product-packing.ts +28 -9
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +69 -13
- package/server/graphql/resolvers/worksheet/picking/activate-picking.ts +60 -30
- package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts +46 -40
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +142 -131
- package/server/graphql/resolvers/worksheet/picking-worksheet.ts +3 -2
- package/server/graphql/resolvers/worksheet/proceed-extra-products.ts +5 -4
- package/server/graphql/resolvers/worksheet/putaway/complete-putaway.ts +45 -15
- package/server/graphql/resolvers/worksheet/transfer.ts +18 -16
- package/server/graphql/resolvers/worksheet/vas-transactions/common-utils.ts +3 -2
- package/server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.ts +4 -1
- package/server/graphql/types/worksheet/delivery-order-info.ts +1 -0
- package/server/graphql/types/worksheet-detail/index.ts +1 -0
- package/server/utils/inventory-util.ts +1 -126
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.completePicking = exports.completePickingResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
6
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
6
7
|
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
7
8
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
@@ -48,130 +49,143 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
48
49
|
const targetInventories = worksheetDetails.map((wsd) => wsd.targetInventory);
|
|
49
50
|
const pickedTargetInventories = targetInventories.filter(targetInventory => targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.PICKED);
|
|
50
51
|
await pickingWSCtrl.completePicking(releaseGoodNo);
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
52
|
+
const orderSource = releaseGood.source;
|
|
53
|
+
switch (orderSource) {
|
|
54
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
55
|
+
const sellercraft = await tx
|
|
56
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
57
|
+
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
58
|
+
const initSCOrderShipment = async (sellercraft) => {
|
|
59
|
+
if (sellercraft) {
|
|
60
|
+
await (0, typeorm_1.getManager)().transaction(async (txMgr) => {
|
|
61
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(txMgr, domain, user);
|
|
62
|
+
if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId)) {
|
|
63
|
+
const orderProducts = await tx.getRepository(sales_base_1.OrderProduct).find({
|
|
64
|
+
where: { releaseGood },
|
|
65
|
+
relations: ['product', 'product.productDetails']
|
|
66
|
+
});
|
|
67
|
+
releaseGood = await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, releaseGood), { orderProducts }));
|
|
68
|
+
if (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId) {
|
|
69
|
+
await txMgr
|
|
70
|
+
.getRepository(sales_base_1.ReleaseGood)
|
|
71
|
+
.update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater });
|
|
72
|
+
}
|
|
65
73
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
});
|
|
107
|
-
//Get which transporter to use
|
|
108
|
-
const marketplaceTransporter = await tx.getRepository(integration_marketplace_1.MarketplaceTransporter).findOne({
|
|
109
|
-
where: { marketplaceStore: marketplaceOrder.marketplaceStore },
|
|
110
|
-
relations: ['pickupTransporter', 'deliveryTransporter']
|
|
111
|
-
});
|
|
112
|
-
const resp = await integration_lmd_1.LastMileAPI.createShipmentRequest(lmd, {
|
|
113
|
-
orderNo: marketplaceOrder.orderNo,
|
|
114
|
-
clientId: lmd.clientId,
|
|
115
|
-
clientType: lmd.clientType,
|
|
116
|
-
clientName: lmd.clientName,
|
|
117
|
-
transporterId: marketplaceTransporter.pickupTransporter.transporterId,
|
|
118
|
-
pickupName: warehouseContactPoint.name,
|
|
119
|
-
pickupAddress1: warehouseContactPoint.address,
|
|
120
|
-
pickupAddress2: warehouseContactPoint.address2,
|
|
121
|
-
pickupPostcode: warehouseContactPoint.postCode,
|
|
122
|
-
pickupState: warehouseContactPoint.state,
|
|
123
|
-
pickupCity: warehouseContactPoint.city,
|
|
124
|
-
pickupPhone: warehouseContactPoint.phone,
|
|
125
|
-
pickupEmail: warehouseContactPoint.email,
|
|
126
|
-
name: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.attentionTo) ? marketplaceOrderShipping.attentionTo.trim() : '',
|
|
127
|
-
address1: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1.trim() : '-',
|
|
128
|
-
address2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2.trim() : '-',
|
|
129
|
-
postCode: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode.trim() : '',
|
|
130
|
-
city: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city.trim() : '',
|
|
131
|
-
state: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state.trim() : '',
|
|
132
|
-
phone: marketplaceOrderShipping.phone1 || '',
|
|
133
|
-
email: marketplaceOrderShipping.email || '',
|
|
134
|
-
attentionTo: marketplaceOrderShipping.attentionTo,
|
|
135
|
-
quantity: marketplaceOrderItems.length
|
|
136
|
-
});
|
|
137
|
-
const delay = (ms) => {
|
|
138
|
-
return new Promise(resolve => setTimeout(resolve, ms));
|
|
139
|
-
};
|
|
140
|
-
if (resp.Status === 'SUCCESS') {
|
|
141
|
-
//Success
|
|
142
|
-
let awbObtained = false;
|
|
143
|
-
let retry = 0;
|
|
144
|
-
while (!awbObtained) {
|
|
145
|
-
const marketplaceOrder2 = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
146
|
-
where: { releaseOrderId: releaseGood.id },
|
|
147
|
-
relations: [
|
|
148
|
-
'marketplaceStore',
|
|
149
|
-
'marketplaceOrderItems',
|
|
150
|
-
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
151
|
-
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
|
|
152
|
-
]
|
|
153
|
-
});
|
|
154
|
-
const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping;
|
|
155
|
-
if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.airwayBill) {
|
|
156
|
-
awbObtained = true;
|
|
74
|
+
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
};
|
|
78
|
+
// asynchronouly call to initiate sellercraft order shipment/ RTS
|
|
79
|
+
initSCOrderShipment(sellercraft);
|
|
80
|
+
break;
|
|
81
|
+
case auth_base_1.ApplicationType.MMS:
|
|
82
|
+
const companyDomain = releaseGood.bizplace.company.domain;
|
|
83
|
+
let marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
84
|
+
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
85
|
+
relations: [
|
|
86
|
+
'marketplaceStore',
|
|
87
|
+
'marketplaceOrderItems',
|
|
88
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
89
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
|
|
90
|
+
]
|
|
91
|
+
});
|
|
92
|
+
if (marketplaceOrder) {
|
|
93
|
+
const marketplaceStore = marketplaceOrder.marketplaceStore;
|
|
94
|
+
let eTraxOption;
|
|
95
|
+
if (marketplaceStore.isAutoUpdateShipment) {
|
|
96
|
+
const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
|
|
97
|
+
await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PACKING);
|
|
98
|
+
}
|
|
99
|
+
if (!marketplaceOrder)
|
|
100
|
+
throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue');
|
|
101
|
+
eTraxOption = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore.eTrax;
|
|
102
|
+
// if eTrax option is true
|
|
103
|
+
if (eTraxOption) {
|
|
104
|
+
const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
|
|
105
|
+
// access every marketplaceOrderItems for shipping information you need
|
|
106
|
+
// trigger the controller from integration-lmd that trigger the API, build the parameters needed
|
|
107
|
+
// for etrax didn't support multi awb per order
|
|
108
|
+
const marketplaceOrderShippingItems = marketplaceOrderItems[0].marketplaceOrderShippingItems;
|
|
109
|
+
const marketplaceOrderShipping = marketplaceOrderShippingItems[0].marketplaceOrderShipping;
|
|
110
|
+
const lmd = await tx.getRepository(integration_lmd_1.LastMileDelivery).findOne({
|
|
111
|
+
where: {
|
|
112
|
+
domain,
|
|
113
|
+
platform: 'eTrax'
|
|
157
114
|
}
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
115
|
+
});
|
|
116
|
+
//Get which transporter to use
|
|
117
|
+
const marketplaceTransporter = await tx
|
|
118
|
+
.getRepository(integration_marketplace_1.MarketplaceTransporter)
|
|
119
|
+
.findOne({
|
|
120
|
+
where: { marketplaceStore: marketplaceOrder.marketplaceStore },
|
|
121
|
+
relations: ['pickupTransporter', 'deliveryTransporter']
|
|
122
|
+
});
|
|
123
|
+
const resp = await integration_lmd_1.LastMileAPI.createShipmentRequest(lmd, {
|
|
124
|
+
orderNo: marketplaceOrder.orderNo,
|
|
125
|
+
clientId: lmd.clientId,
|
|
126
|
+
clientType: lmd.clientType,
|
|
127
|
+
clientName: lmd.clientName,
|
|
128
|
+
transporterId: marketplaceTransporter.pickupTransporter.transporterId,
|
|
129
|
+
pickupName: warehouseContactPoint.name,
|
|
130
|
+
pickupAddress1: warehouseContactPoint.address,
|
|
131
|
+
pickupAddress2: warehouseContactPoint.address2,
|
|
132
|
+
pickupPostcode: warehouseContactPoint.postCode,
|
|
133
|
+
pickupState: warehouseContactPoint.state,
|
|
134
|
+
pickupCity: warehouseContactPoint.city,
|
|
135
|
+
pickupPhone: warehouseContactPoint.phone,
|
|
136
|
+
pickupEmail: warehouseContactPoint.email,
|
|
137
|
+
name: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.attentionTo) ? marketplaceOrderShipping.attentionTo.trim() : '',
|
|
138
|
+
address1: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1.trim() : '-',
|
|
139
|
+
address2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2.trim() : '-',
|
|
140
|
+
postCode: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode.trim() : '',
|
|
141
|
+
city: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city.trim() : '',
|
|
142
|
+
state: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state.trim() : '',
|
|
143
|
+
phone: marketplaceOrderShipping.phone1 || '',
|
|
144
|
+
email: marketplaceOrderShipping.email || '',
|
|
145
|
+
attentionTo: marketplaceOrderShipping.attentionTo,
|
|
146
|
+
quantity: marketplaceOrderItems.length
|
|
147
|
+
});
|
|
148
|
+
const delay = (ms) => {
|
|
149
|
+
return new Promise(resolve => setTimeout(resolve, ms));
|
|
150
|
+
};
|
|
151
|
+
if (resp.Status === 'SUCCESS') {
|
|
152
|
+
//Success
|
|
153
|
+
let awbObtained = false;
|
|
154
|
+
let retry = 0;
|
|
155
|
+
while (!awbObtained) {
|
|
156
|
+
const marketplaceOrder2 = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
157
|
+
where: { releaseOrderId: releaseGood.id },
|
|
158
|
+
relations: [
|
|
159
|
+
'marketplaceStore',
|
|
160
|
+
'marketplaceOrderItems',
|
|
161
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
162
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
|
|
163
|
+
]
|
|
164
|
+
});
|
|
165
|
+
const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping;
|
|
166
|
+
if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.airwayBill) {
|
|
167
|
+
awbObtained = true;
|
|
168
|
+
}
|
|
169
|
+
await delay(5000);
|
|
170
|
+
//Timeout after 15sec
|
|
171
|
+
if (++retry > 3) {
|
|
172
|
+
break;
|
|
173
|
+
}
|
|
162
174
|
}
|
|
163
175
|
}
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
176
|
+
else {
|
|
177
|
+
if ((resp === null || resp === void 0 ? void 0 : resp.AWBurl) && (resp === null || resp === void 0 ? void 0 : resp.TrackingNo))
|
|
178
|
+
await tx
|
|
179
|
+
.getRepository(marketplace_base_1.MarketplaceOrderShipping)
|
|
180
|
+
.update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo });
|
|
181
|
+
else
|
|
182
|
+
throw resp;
|
|
183
|
+
}
|
|
172
184
|
}
|
|
173
185
|
}
|
|
174
|
-
|
|
186
|
+
break;
|
|
187
|
+
default:
|
|
188
|
+
break;
|
|
175
189
|
}
|
|
176
190
|
if (releaseGood.packingOption) {
|
|
177
191
|
const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,7 @@ async function pickingWorksheet(domain, releaseGoodNo, locationSortingRules, tx)
|
|
|
55
55
|
.leftJoinAndSelect('T_INV.binLocation', 'BIN_LOC')
|
|
56
56
|
.leftJoinAndSelect('T_INV.inventory', 'INV')
|
|
57
57
|
.leftJoinAndSelect('T_INV.product', 'PROD')
|
|
58
|
+
.leftJoinAndSelect('T_INV.productDetail', 'PROD_DET')
|
|
58
59
|
.leftJoinAndSelect('INV.location', 'LOC');
|
|
59
60
|
if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
|
|
60
61
|
locationSortingRules.forEach((rule) => {
|
|
@@ -88,8 +89,8 @@ async function pickingWorksheet(domain, releaseGoodNo, locationSortingRules, tx)
|
|
|
88
89
|
const inventoryChangesCount = await tx.getRepository(warehouse_base_1.InventoryChange).count({
|
|
89
90
|
where: {
|
|
90
91
|
inventory: inventory.id,
|
|
91
|
-
status:
|
|
92
|
-
transactionType:
|
|
92
|
+
status: 'PENDING',
|
|
93
|
+
transactionType: 'MISSING'
|
|
93
94
|
},
|
|
94
95
|
relations: ['inventory', 'product']
|
|
95
96
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,7 +50,7 @@ exports.proceedExtraProductsResolver = {
|
|
|
50
50
|
const addedApprovedProducts = approvedProducts.filter((approvedProd) => approvedProd.status === sales_base_1.ORDER_PRODUCT_STATUS.ADDED);
|
|
51
51
|
if ((editedApprovedProducts === null || editedApprovedProducts === void 0 ? void 0 : editedApprovedProducts.length) > 0) {
|
|
52
52
|
editedApprovedProducts.map((editedApprovedProd) => {
|
|
53
|
-
const selectedOrderProduct = storedOrderProducts.find((op) => op.id === editedApprovedProd.
|
|
53
|
+
const selectedOrderProduct = storedOrderProducts.find((op) => op.productDetail.id === editedApprovedProd.productDetailId);
|
|
54
54
|
updatedOrderProducts.push(Object.assign(Object.assign({}, selectedOrderProduct), { batchId: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedBatchId)
|
|
55
55
|
? selectedOrderProduct.adjustedBatchId
|
|
56
56
|
: selectedOrderProduct.batchId, batchIdRef: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedBatchIdRef)
|
|
@@ -74,7 +74,7 @@ exports.proceedExtraProductsResolver = {
|
|
|
74
74
|
}
|
|
75
75
|
if ((addedApprovedProducts === null || addedApprovedProducts === void 0 ? void 0 : addedApprovedProducts.length) > 0) {
|
|
76
76
|
addedApprovedProducts.map((addedApprovedProd) => {
|
|
77
|
-
const selectedOrderProduct = storedOrderProducts.find((op) => op.
|
|
77
|
+
const selectedOrderProduct = storedOrderProducts.find((op) => op.productDetailId === addedApprovedProd.productDetailId);
|
|
78
78
|
updatedOrderProducts.push(Object.assign(Object.assign({}, selectedOrderProduct), { batchId: selectedOrderProduct.adjustedBatchId, batchIdRef: selectedOrderProduct.adjustedBatchIdRef, packingType: selectedOrderProduct.adjustedPackingType, packQty: selectedOrderProduct.adjustedPackQty, uom: selectedOrderProduct.adjustedUom, uomValue: selectedOrderProduct.adjustedUomValue, totalUomValue: selectedOrderProduct.adjustedTotalUomValue, palletQty: selectedOrderProduct.adjustedPalletQty, unitPrice: selectedOrderProduct.adjustedUnitPrice, status: worksheet.status === constants_1.WORKSHEET_STATUS.DEACTIVATED
|
|
79
79
|
? sales_base_1.ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
|
|
80
80
|
: sales_base_1.ORDER_PRODUCT_STATUS.UNLOADING, updater: user }));
|
|
@@ -105,7 +105,7 @@ exports.proceedExtraProductsResolver = {
|
|
|
105
105
|
let editedRejectedProducts = rejectedProducts.filter((editedRejectedProduct) => editedRejectedProduct.status === sales_base_1.ORDER_PRODUCT_STATUS.EDITED);
|
|
106
106
|
if ((editedRejectedProducts === null || editedRejectedProducts === void 0 ? void 0 : editedRejectedProducts.length) > 0) {
|
|
107
107
|
editedRejectedProducts = editedRejectedProducts.map((editedRejectProduct) => {
|
|
108
|
-
const selectedOrderProduct = storedOrderProducts.find((op) => op.id === editedRejectProduct.
|
|
108
|
+
const selectedOrderProduct = storedOrderProducts.find((op) => op.productDetail.id === editedRejectProduct.productDetailId);
|
|
109
109
|
return Object.assign(Object.assign({}, selectedOrderProduct), { status: worksheet.status === constants_1.WORKSHEET_STATUS.DEACTIVATED
|
|
110
110
|
? sales_base_1.ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
|
|
111
111
|
: sales_base_1.ORDER_PRODUCT_STATUS.UNLOADING, updater: user });
|
|
@@ -117,7 +117,9 @@ exports.proceedExtraProductsResolver = {
|
|
|
117
117
|
if ((addedRejectedProducts === null || addedRejectedProducts === void 0 ? void 0 : addedRejectedProducts.length) > 0) {
|
|
118
118
|
let deleteOrderProducts = [];
|
|
119
119
|
addedRejectedProducts.map(rejectedOp => {
|
|
120
|
-
const selectedOrderProduct = storedOrderProducts.find(
|
|
120
|
+
const selectedOrderProduct = storedOrderProducts.find(
|
|
121
|
+
//(op: OrderProduct) => op.id === rejectedOp.id
|
|
122
|
+
(op) => op.productDetailId === rejectedOp.productDetailId);
|
|
121
123
|
deleteOrderProducts.push(selectedOrderProduct);
|
|
122
124
|
});
|
|
123
125
|
await tx.getRepository(sales_base_1.OrderProduct).delete(deleteOrderProducts);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proceed-extra-products.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/proceed-extra-products.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"proceed-extra-products.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/proceed-extra-products.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.completePutaway = exports.completePutawayResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
5
6
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
6
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
@@ -28,21 +29,45 @@ exports.completePutawayResolver = {
|
|
|
28
29
|
// search for any active marketplace connection
|
|
29
30
|
const companyDomain = arrivalNotice.bizplace.company.domain;
|
|
30
31
|
const customerDomain = arrivalNotice.bizplace.domain;
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
32
|
+
const orderSource = arrivalNotice.source;
|
|
33
|
+
switch (orderSource) {
|
|
34
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
35
|
+
const sellercraft = await tx
|
|
36
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
37
|
+
.findOne({ domain: customerDomain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
38
|
+
if (sellercraft) {
|
|
39
|
+
const sellercraftCtrl = new ecommerce_1.SellercraftController(tx, domain, user);
|
|
40
|
+
await sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice);
|
|
41
|
+
}
|
|
42
|
+
break;
|
|
43
|
+
case auth_base_1.ApplicationType.MMS:
|
|
44
|
+
const marketplaceStores = await tx.getRepository(integration_marketplace_1.MarketplaceStore).find({
|
|
45
|
+
where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
|
|
46
|
+
relations: ['marketplaceDistributors']
|
|
47
|
+
});
|
|
48
|
+
if ((marketplaceStores === null || marketplaceStores === void 0 ? void 0 : marketplaceStores.length) && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
|
|
49
|
+
const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
|
|
50
|
+
await ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain);
|
|
51
|
+
}
|
|
52
|
+
break;
|
|
53
|
+
default:
|
|
54
|
+
break;
|
|
45
55
|
}
|
|
56
|
+
// const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
|
|
57
|
+
// where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
|
|
58
|
+
// relations: ['marketplaceDistributors']
|
|
59
|
+
// })
|
|
60
|
+
// const sellercraft: Sellercraft = await tx
|
|
61
|
+
// .getRepository(Sellercraft)
|
|
62
|
+
// .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
|
|
63
|
+
// if (sellercraft) {
|
|
64
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
65
|
+
// await sellercraftCtrl.registerProductInbound(sellercraft, arrivalNotice)
|
|
66
|
+
// }
|
|
67
|
+
// if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
|
|
68
|
+
// const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
|
|
69
|
+
// await ecommerceCtrl.updateProductVariationStock(marketplaceStores, arrivalNotice.orderProducts, companyDomain)
|
|
70
|
+
// }
|
|
46
71
|
}
|
|
47
72
|
};
|
|
48
73
|
async function completePutaway(tx, domain, user, arrivalNoticeNo) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-putaway.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/putaway/complete-putaway.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"complete-putaway.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/putaway/complete-putaway.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,14 +11,14 @@ exports.transfer = {
|
|
|
11
11
|
// 1. get to inventory
|
|
12
12
|
let toInventory = await tx.getRepository(warehouse_base_1.Inventory).findOne({
|
|
13
13
|
where: { domain: domain, palletId: toPalletId },
|
|
14
|
-
relations: ['bizplace', 'product', 'warehouse', 'location']
|
|
14
|
+
relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
|
|
15
15
|
});
|
|
16
16
|
if (!toInventory)
|
|
17
17
|
throw new Error(`to pallet doesn't exists`);
|
|
18
18
|
// 2. get from inventory
|
|
19
19
|
let fromInventory = await tx.getRepository(warehouse_base_1.Inventory).findOne({
|
|
20
20
|
where: { domain: domain, palletId },
|
|
21
|
-
relations: ['bizplace', 'product', 'warehouse', 'location']
|
|
21
|
+
relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
|
|
22
22
|
});
|
|
23
23
|
if (!fromInventory)
|
|
24
24
|
throw new Error(`from pallet doesn't exists`);
|
|
@@ -52,16 +52,16 @@ exports.transfer = {
|
|
|
52
52
|
await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, toInventory), { qty: toInventory.qty + qty, lastSeq: toInventory.lastSeq + 1, updater: user }));
|
|
53
53
|
// - add inventory history
|
|
54
54
|
delete toInventory.id;
|
|
55
|
-
await tx.getRepository(warehouse_base_1.InventoryHistory).save(Object.assign(Object.assign({}, toInventory), { domain: domain, name: warehouse_base_1.InventoryNoGenerator.inventoryHistoryName(), product: toInventory.product, warehouse: toInventory.warehouse, location: toInventory.location, seq: toInventory.lastSeq, transactionType: warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TRANSFERED_IN, creator: user, updater: user }));
|
|
55
|
+
await tx.getRepository(warehouse_base_1.InventoryHistory).save(Object.assign(Object.assign({}, toInventory), { domain: domain, name: warehouse_base_1.InventoryNoGenerator.inventoryHistoryName(), product: toInventory.product, productDetail: toInventory.productDetail, warehouse: toInventory.warehouse, location: toInventory.location, seq: toInventory.lastSeq, transactionType: warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TRANSFERED_IN, creator: user, updater: user }));
|
|
56
56
|
// - update (fromInventory)
|
|
57
57
|
await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, fromInventory), { qty: leftQty, status: warehouse_base_1.INVENTORY_STATUS.TERMINATED, lastSeq: fromInventory.lastSeq + 1, updater: user }));
|
|
58
58
|
await tx.getRepository(sales_base_1.OrderInventory).save(Object.assign(Object.assign({}, targetInventory), { status: sales_base_1.ORDER_PRODUCT_STATUS.TERMINATED }));
|
|
59
59
|
fromInventory = await tx.getRepository(warehouse_base_1.Inventory).findOne({
|
|
60
60
|
where: { id: fromInventory.id },
|
|
61
|
-
relations: ['bizplace', 'product', 'warehouse', 'location']
|
|
61
|
+
relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
|
|
62
62
|
});
|
|
63
63
|
// - add inventory history
|
|
64
|
-
await tx.getRepository(warehouse_base_1.InventoryHistory).save(Object.assign(Object.assign({}, fromInventory), { name: warehouse_base_1.InventoryNoGenerator.inventoryHistoryName(), product: fromInventory.product, warehouse: fromInventory.warehouse, location: fromInventory.location, seq: fromInventory.lastSeq, transactionType: warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TRANSFERED_OUT, creator: user, updater: user }));
|
|
64
|
+
await tx.getRepository(warehouse_base_1.InventoryHistory).save(Object.assign(Object.assign({}, fromInventory), { name: warehouse_base_1.InventoryNoGenerator.inventoryHistoryName(), product: fromInventory.product, productDetail: fromInventory.productDetail, warehouse: fromInventory.warehouse, location: fromInventory.location, seq: fromInventory.lastSeq, transactionType: warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TRANSFERED_OUT, creator: user, updater: user }));
|
|
65
65
|
// - update worksheetDetail (EXECUTING => DONE)
|
|
66
66
|
await tx.getRepository(entities_1.WorksheetDetail).save(Object.assign(Object.assign({}, worksheetDetail), { status: constants_1.WORKSHEET_STATUS.DONE, updater: user }));
|
|
67
67
|
}
|
|
@@ -70,18 +70,18 @@ exports.transfer = {
|
|
|
70
70
|
await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, toInventory), { qty: toInventory.qty + qty, lastSeq: toInventory.lastSeq + 1, updater: user }));
|
|
71
71
|
toInventory = await tx.getRepository(warehouse_base_1.Inventory).findOne({
|
|
72
72
|
where: { id: toInventory.id },
|
|
73
|
-
relations: ['bizplace', 'product', 'warehouse', 'location']
|
|
73
|
+
relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
|
|
74
74
|
});
|
|
75
75
|
// - add inventory history
|
|
76
76
|
delete toInventory.id;
|
|
77
|
-
await tx.getRepository(warehouse_base_1.InventoryHistory).save(Object.assign(Object.assign({}, toInventory), { domain, name: warehouse_base_1.InventoryNoGenerator.inventoryHistoryName(), product: toInventory.product, warehouse: toInventory.warehouse, location: toInventory.location, seq: toInventory.lastSeq, transactionType: warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TRANSFERED_IN, creator: user, updater: user }));
|
|
77
|
+
await tx.getRepository(warehouse_base_1.InventoryHistory).save(Object.assign(Object.assign({}, toInventory), { domain, name: warehouse_base_1.InventoryNoGenerator.inventoryHistoryName(), product: toInventory.product, productDetail: toInventory.productDetail, warehouse: toInventory.warehouse, location: toInventory.location, seq: toInventory.lastSeq, transactionType: warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TRANSFERED_IN, creator: user, updater: user }));
|
|
78
78
|
await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, fromInventory), { qty: leftQty, lastSeq: fromInventory.lastSeq + 1, updater: user }));
|
|
79
79
|
fromInventory = await tx.getRepository(warehouse_base_1.Inventory).findOne({
|
|
80
80
|
where: { id: fromInventory.id },
|
|
81
|
-
relations: ['bizplace', 'product', 'warehouse', 'location']
|
|
81
|
+
relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
|
|
82
82
|
});
|
|
83
83
|
// - add inventory history
|
|
84
|
-
await tx.getRepository(warehouse_base_1.InventoryHistory).save(Object.assign(Object.assign({}, fromInventory), { name: warehouse_base_1.InventoryNoGenerator.inventoryHistoryName(), product: fromInventory.product, warehouse: fromInventory.warehouse, location: fromInventory.location, seq: fromInventory.lastSeq, transactionType: warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TRANSFERED_OUT, creator: user, updater: user }));
|
|
84
|
+
await tx.getRepository(warehouse_base_1.InventoryHistory).save(Object.assign(Object.assign({}, fromInventory), { name: warehouse_base_1.InventoryNoGenerator.inventoryHistoryName(), product: fromInventory.product, productDetail: fromInventory.productDetail, warehouse: fromInventory.warehouse, location: fromInventory.location, seq: fromInventory.lastSeq, transactionType: warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TRANSFERED_OUT, creator: user, updater: user }));
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
};
|