@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
|
@@ -5,7 +5,6 @@ const typeorm_1 = require("typeorm");
|
|
|
5
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
6
6
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
7
7
|
const entities_1 = require("../../../entities");
|
|
8
|
-
const utils_1 = require("../../../utils");
|
|
9
8
|
exports.confirmCancellationReleaseOrder = {
|
|
10
9
|
async confirmCancellationReleaseOrder(_, { name }, context) {
|
|
11
10
|
const { tx, domain, user } = context.state;
|
|
@@ -44,7 +43,7 @@ exports.confirmCancellationReleaseOrder = {
|
|
|
44
43
|
})
|
|
45
44
|
.where('id = :id', { id: inventory.id })
|
|
46
45
|
.execute();
|
|
47
|
-
await (0,
|
|
46
|
+
await (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CANCEL_ORDER, orderInventory.releaseQty, orderInventory.releaseUomValue, user, tx);
|
|
48
47
|
}
|
|
49
48
|
return orderInventory;
|
|
50
49
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirm-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAG3C,2DAQmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"confirm-cancellation-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,7 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
65
65
|
});
|
|
66
66
|
if (targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.MISSING) {
|
|
67
67
|
// create STORED, CC_ADJUSTMENT history
|
|
68
|
-
await (0,
|
|
68
|
+
await (0, warehouse_base_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT, -inventory.qty, -inventory.uomValue, user, tx);
|
|
69
69
|
inventory.qty = 0;
|
|
70
70
|
inventory.uomValue = 0;
|
|
71
71
|
inventory.lockedQty = 0;
|
|
@@ -74,7 +74,7 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
74
74
|
inventory.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
|
|
75
75
|
inventory = await tx.getRepository(warehouse_base_1.Inventory).save(inventory);
|
|
76
76
|
// create TERMINATED, TERMINATED history
|
|
77
|
-
await (0,
|
|
77
|
+
await (0, warehouse_base_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, user, tx);
|
|
78
78
|
if (sellercraft) {
|
|
79
79
|
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
80
80
|
await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory);
|
|
@@ -82,7 +82,7 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
82
82
|
}
|
|
83
83
|
else if (targetInventory.inspectedQty == 0) {
|
|
84
84
|
// create STORED, CC_ADJUSTMENT history
|
|
85
|
-
await (0,
|
|
85
|
+
await (0, warehouse_base_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT, transactQty, transactUomValue, user, tx);
|
|
86
86
|
// change inventory qty to 0 and terminate it
|
|
87
87
|
inventory.batchId = targetInventory.inspectedBatchNo;
|
|
88
88
|
inventory.qty = targetInventory.inspectedQty;
|
|
@@ -95,7 +95,7 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
95
95
|
inventory.updater = user;
|
|
96
96
|
inventory = await tx.getRepository(warehouse_base_1.Inventory).save(inventory);
|
|
97
97
|
// create TERMINATED, TERMINATED history
|
|
98
|
-
await (0,
|
|
98
|
+
await (0, warehouse_base_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, user, tx);
|
|
99
99
|
if (sellercraft) {
|
|
100
100
|
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
101
101
|
await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory);
|
|
@@ -109,7 +109,7 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
109
109
|
inventory.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
|
|
110
110
|
inventory.qty = 0;
|
|
111
111
|
inventory.uomValue = 0;
|
|
112
|
-
await (0,
|
|
112
|
+
await (0, warehouse_base_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT, -qty, -uomValue, user, tx);
|
|
113
113
|
transactQty = targetInventory.inspectedQty;
|
|
114
114
|
transactUomValue = targetInventory.inspectedUomValue;
|
|
115
115
|
}
|
|
@@ -127,7 +127,7 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
|
|
|
127
127
|
const prevLocation = await tx.getRepository(warehouse_base_1.Location).findOne(prevLocationId);
|
|
128
128
|
await (0, utils_1.switchLocationStatus)(domain, prevLocation, user, tx);
|
|
129
129
|
}
|
|
130
|
-
await (0,
|
|
130
|
+
await (0, warehouse_base_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT, transactQty, transactUomValue, user, tx);
|
|
131
131
|
}
|
|
132
132
|
if (sellercraft) {
|
|
133
133
|
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cycle-count-adjustment.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-adjustment.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAG3C,qFAAwF;AACxF,2DAAiH;AAEjH,
|
|
1
|
+
{"version":3,"file":"cycle-count-adjustment.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-adjustment.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const transport_base_1 = require("@things-factory/transport-base");
|
|
|
7
7
|
const env_1 = require("@things-factory/env");
|
|
8
8
|
exports.deliveryOrderByWorksheetResolver = {
|
|
9
9
|
async deliveryOrderByWorksheet(_, { name }, context) {
|
|
10
|
+
var _a;
|
|
10
11
|
const { domain, tx } = context.state;
|
|
11
12
|
try {
|
|
12
13
|
const foundDO = await tx.getRepository(sales_base_1.DeliveryOrder).findOne({
|
|
@@ -18,7 +19,9 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
18
19
|
});
|
|
19
20
|
if (!foundDO)
|
|
20
21
|
throw new Error('Delivery order not found!');
|
|
21
|
-
const foundOI = await tx
|
|
22
|
+
const foundOI = await tx
|
|
23
|
+
.getRepository(sales_base_1.OrderInventory)
|
|
24
|
+
.createQueryBuilder('oi')
|
|
22
25
|
.select('p.name', 'name')
|
|
23
26
|
.addSelect('p.sku', 'sku')
|
|
24
27
|
.addSelect('p.type', 'type')
|
|
@@ -69,8 +72,8 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
69
72
|
reusablePallet: foundDO.reusablePallet || '',
|
|
70
73
|
createdDate: foundDO.createdAt.toISOString().split('T')[0],
|
|
71
74
|
isManualDo: foundDO.releaseGood ? false : true,
|
|
72
|
-
attentionTo: foundDO.attentionTo,
|
|
73
|
-
releaseGood: Object.assign(Object.assign({}, foundDO.releaseGood), { attentionTo: foundDO.attentionTo || foundDO.releaseGood.attentionTo, bizplace: partnerBiz }),
|
|
75
|
+
attentionTo: foundDO.attentionTo || '',
|
|
76
|
+
releaseGood: Object.assign(Object.assign({}, foundDO.releaseGood), { attentionTo: foundDO.attentionTo || ((_a = foundDO.releaseGood) === null || _a === void 0 ? void 0 : _a.attentionTo), bizplace: partnerBiz }),
|
|
74
77
|
productList: foundOI
|
|
75
78
|
},
|
|
76
79
|
contactPointInfo: partnerContactPoint.map(async (cp) => {
|
|
@@ -82,7 +85,7 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
82
85
|
phone: cp.phone || '',
|
|
83
86
|
contactName: cp.name || ''
|
|
84
87
|
};
|
|
85
|
-
})
|
|
88
|
+
})
|
|
86
89
|
};
|
|
87
90
|
}
|
|
88
91
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts"],"names":[],"mappings":";;;AAAA,uDAAiE;AACjE,2DAA0E;AAG1E,mEAAgE;AAChE,6CAA4C;AAE/B,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY
|
|
1
|
+
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,7 @@ exports.inventoriesByPalletResolver = {
|
|
|
36
36
|
qb.leftJoinAndSelect('iv.domain', 'domain')
|
|
37
37
|
.leftJoinAndSelect('iv.bizplace', 'bizplace')
|
|
38
38
|
.leftJoinAndSelect('iv.product', 'product')
|
|
39
|
+
.leftJoinAndSelect('iv.productDetail', 'productDetail')
|
|
39
40
|
.leftJoinAndSelect('iv.warehouse', 'warehouse')
|
|
40
41
|
.leftJoinAndSelect('iv.location', 'location')
|
|
41
42
|
.leftJoinAndSelect('iv.creator', 'creator')
|
|
@@ -92,7 +93,7 @@ exports.inventoriesByPalletResolver = {
|
|
|
92
93
|
return Object.assign(Object.assign({}, item), { remainQty,
|
|
93
94
|
remainUomValue, remainUomValueWithUom: remainUomValue + ' ' + item.uom,
|
|
94
95
|
// product: item.product,
|
|
95
|
-
productName: item.product.name, productSKU: item.product.sku, productBrand: item.product.brand, productId: item.product.id });
|
|
96
|
+
productName: item.product.name, productSKU: item.product.sku, productBrand: item.product.brand, productId: item.product.id, productDetailId: item.productDetail.id });
|
|
96
97
|
}));
|
|
97
98
|
return { items, total };
|
|
98
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":";;;AAAA,qCAAqE;AAGrE,uDAAkE;AAClE,2DAAmE;AACnE,iDAA0E;AAC1E,mEAAyE;AAE5D,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,oBAAoB,EAAE,EAAE,OAAY;QACrG,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QACtE,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,CAAA;QACtC,IAAI,oBAAoB,GAAa,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAChF,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,aAAa,CAAC,CAAA;QAC1E,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;QACnE,MAAM,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAA;QACjF,IAAI,aAAa,GACf,oBAAoB,KAAI,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,KAAK,CAAA,CAAC,CAAC,CAAC,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAA;QAC3F,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;QAC5F,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,aAAa,CAAC,CAAA;QAEpE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE;YACrE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;gBAClB,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,IAAI;gBACd,KAAK,EAAE,oBAAoB;gBAC3B,QAAQ,EAAE,IAAI;aACf,CAAC,CAAA;SACH;aAAM;YACL,oBAAoB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,CAAA;YACtF,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAA;SAC1E;QAED,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,cAAc,CAAC,CAAA;QAC1E,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,cAAc,CAAC,CAAA;QAErE,MAAM,EAAE,GAAkC,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QAC3F,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAE/B,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,QAAQ,CAAC;aACxC,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC;aAC5C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;aAC1C,iBAAiB,CAAC,cAAc,EAAE,WAAW,CAAC;aAC9C,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC;aAC5C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;aAC1C,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC;aAC1C,QAAQ,CAAC,YAAY,CAAC;aACtB,QAAQ,CACP,iBAAiB,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,MAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,SAAS,8BAAa,CAAC,UAAU,OAC1F,8BAAa,CAAC,OAChB,IAAI,CACL;aACA,QAAQ,CACP;;;;;;;;;;yBAUiB,mCAAsB,CAAC,aAAa;;;QAGrD,EACA,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAC9C,CAAA;QAEH,IAAI,CAAC,aAAa,EAAE;YAClB,EAAE,CAAC,QAAQ,CAAC,kEAAkE,CAAC,CAAA;YAC/E,EAAE,CAAC,QAAQ,CAAC,0EAA0E,CAAC,CAAA;SACxF;QAED,IAAI,eAAe,EAAE;YACnB,EAAE,CAAC,QAAQ,CAAC,wBAAwB,eAAe,CAAC,KAAK,GAAG,CAAC,CAAA;SAC9D;QAED,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,MAAK,CAAC,EAAE;YAC1B,MAAM,gBAAgB,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;YAEtD,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;YAC1C,MAAM,IAAI,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAClC,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,iCACf,GAAG,KACN,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,EACxG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IAC5B,EACF,EAAE,CACH,CAAA;YACD,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;SACjB;QAED,IAAI,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,IAAG,CAAC,EAAE;YACpC,oBAAoB,CAAC,OAAO,CAAC,CAAC,IAAqC,EAAE,EAAE;gBACrE,EAAE,CAAC,UAAU,CAAC,YAAY,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;YACpE,CAAC,CAAC,CAAA;SACH;aAAM;YACL,EAAE,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;SACvC;QAED,IAAI,cAAc,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/C,IAAI,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;YACnC,EAAE,CAAC,QAAQ,CACT,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACjB,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;oBACpC,MAAM,SAAS,GAAG,IAAA,sBAAc,EAC9B,SAAS,EACT,MAAM,EACN,QAAQ,EACR,WAAW,CAAC,KAAK,EACjB,KAAK,EACL,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC,MAAM,CACvC,CAAA;oBAED,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,CAAA;gBACrD,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC,CACH,CAAA;SACF;QACD,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;QAE/C,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CACvB,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAe,EAAE,EAAE;YAClC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAA;YAEjE,uCACK,IAAI,KACP,SAAS;gBACT,cAAc,EACd,qBAAqB,EAAE,cAAc,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG;gBACtD,yBAAyB;gBACzB,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAC9B,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAC5B,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAChC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.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.createReturnWorksheet = exports.completeLoading = exports.completeLoadingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
6
|
const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
|
|
6
7
|
const integration_sftp_1 = require("@things-factory/integration-sftp");
|
|
@@ -39,37 +40,75 @@ async function completeLoading(tx, domain, user, releaseGoodNo) {
|
|
|
39
40
|
.find({ where: { company: warehouseCompany }, relations: ['domain'] });
|
|
40
41
|
const warehouseCompanyBizplaces = warehouseBizplaces.filter(biz => biz.domain.extType == 'company');
|
|
41
42
|
const warehouseCompanyDomain = warehouseCompanyBizplaces[0].domain;
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
.
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
let inventoryItems = await tx.getRepository(warehouse_base_1.InventoryItem).find({
|
|
53
|
-
where: { domain, outboundOrderId: releaseGood.id }
|
|
54
|
-
});
|
|
55
|
-
// if (responseFileTypes.enableShipment) {
|
|
56
|
-
// let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
|
|
57
|
-
// releaseGood,
|
|
58
|
-
// orderInventories: targetInventories,
|
|
59
|
-
// sftp: customerAvailableSftp
|
|
60
|
-
// })
|
|
61
|
-
// customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
|
|
62
|
-
// }
|
|
63
|
-
if (responseFileTypes.enableSerialNumber) {
|
|
64
|
-
let snResult = await integration_sftp_1.SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
65
|
-
releaseGood,
|
|
66
|
-
inventoryItems,
|
|
67
|
-
sftp: customerAvailableSftp
|
|
43
|
+
const orderSource = releaseGood.source;
|
|
44
|
+
switch (orderSource) {
|
|
45
|
+
case auth_base_1.ApplicationType.SFTP:
|
|
46
|
+
const customerDomain = releaseGood.bizplace.domain;
|
|
47
|
+
const fulfillmentCenter = await tx
|
|
48
|
+
.getRepository(integration_fulfillment_1.FulfillmentCenter)
|
|
49
|
+
.findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' });
|
|
50
|
+
if (fulfillmentCenter) {
|
|
51
|
+
let customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).findOne({
|
|
52
|
+
where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
|
|
68
53
|
});
|
|
69
|
-
|
|
54
|
+
if (customerAvailableSftp) {
|
|
55
|
+
const responseFileTypes = JSON.parse(customerAvailableSftp.responseFileTypes);
|
|
56
|
+
let inventoryItems = await tx.getRepository(warehouse_base_1.InventoryItem).find({
|
|
57
|
+
where: { domain, outboundOrderId: releaseGood.id }
|
|
58
|
+
});
|
|
59
|
+
// if (responseFileTypes.enableShipment) {
|
|
60
|
+
// let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
|
|
61
|
+
// releaseGood,
|
|
62
|
+
// orderInventories: targetInventories,
|
|
63
|
+
// sftp: customerAvailableSftp
|
|
64
|
+
// })
|
|
65
|
+
// customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
|
|
66
|
+
// }
|
|
67
|
+
if (responseFileTypes.enableSerialNumber) {
|
|
68
|
+
let snResult = await integration_sftp_1.SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
69
|
+
releaseGood,
|
|
70
|
+
inventoryItems,
|
|
71
|
+
sftp: customerAvailableSftp
|
|
72
|
+
});
|
|
73
|
+
customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).save(snResult);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
70
76
|
}
|
|
71
|
-
|
|
77
|
+
break;
|
|
78
|
+
default:
|
|
79
|
+
break;
|
|
72
80
|
}
|
|
81
|
+
// const customerDomain: Domain = releaseGood.bizplace.domain
|
|
82
|
+
// const fulfillmentCenter: FulfillmentCenter = await tx
|
|
83
|
+
// .getRepository(FulfillmentCenter)
|
|
84
|
+
// .findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' })
|
|
85
|
+
// if (fulfillmentCenter) {
|
|
86
|
+
// let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
|
|
87
|
+
// where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
|
|
88
|
+
// })
|
|
89
|
+
// if (customerAvailableSftp) {
|
|
90
|
+
// const responseFileTypes: any = JSON.parse(customerAvailableSftp.responseFileTypes)
|
|
91
|
+
// let inventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
|
|
92
|
+
// where: { domain, outboundOrderId: releaseGood.id }
|
|
93
|
+
// })
|
|
94
|
+
// // if (responseFileTypes.enableShipment) {
|
|
95
|
+
// // let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
|
|
96
|
+
// // releaseGood,
|
|
97
|
+
// // orderInventories: targetInventories,
|
|
98
|
+
// // sftp: customerAvailableSftp
|
|
99
|
+
// // })
|
|
100
|
+
// // customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
|
|
101
|
+
// // }
|
|
102
|
+
// if (responseFileTypes.enableSerialNumber) {
|
|
103
|
+
// let snResult: Sftp = await SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
104
|
+
// releaseGood,
|
|
105
|
+
// inventoryItems,
|
|
106
|
+
// sftp: customerAvailableSftp
|
|
107
|
+
// })
|
|
108
|
+
// customerAvailableSftp = await tx.getRepository(Sftp).save(snResult)
|
|
109
|
+
// }
|
|
110
|
+
// }
|
|
111
|
+
// }
|
|
73
112
|
await worksheetController.completeLoading(releaseGoodNo);
|
|
74
113
|
if (remainInventories.length) {
|
|
75
114
|
await createReturnWorksheet(tx, domain, user, releaseGoodNo, remainInventories);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.activatePacking = exports.activatePackingResolver = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
5
6
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
6
7
|
const controllers_1 = require("../../../../controllers");
|
|
7
8
|
exports.activatePackingResolver = {
|
|
@@ -24,15 +25,29 @@ async function activatePacking(tx, domain, user, worksheetNo) {
|
|
|
24
25
|
const worksheetController = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
25
26
|
const worksheet = await worksheetController.activatePacking(worksheetNo);
|
|
26
27
|
let releaseGood = worksheet.releaseGood;
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
const orderSource = releaseGood.source;
|
|
29
|
+
switch (orderSource) {
|
|
30
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
31
|
+
const sellercraft = await tx
|
|
32
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
33
|
+
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
34
|
+
if (sellercraft) {
|
|
35
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
36
|
+
sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
|
|
37
|
+
}
|
|
38
|
+
break;
|
|
39
|
+
default:
|
|
40
|
+
break;
|
|
35
41
|
}
|
|
42
|
+
// if (releaseGood.type == 'b2c') {
|
|
43
|
+
// const sellercraft: Sellercraft = await tx
|
|
44
|
+
// .getRepository(Sellercraft)
|
|
45
|
+
// .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
46
|
+
// if (sellercraft) {
|
|
47
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
48
|
+
// sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
|
|
49
|
+
// }
|
|
50
|
+
// }
|
|
36
51
|
return worksheet;
|
|
37
52
|
}
|
|
38
53
|
exports.activatePacking = activatePacking;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activate-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/activate-packing.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;
|
|
1
|
+
{"version":3,"file":"activate-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/activate-packing.ts"],"names":[],"mappings":";;;AAAA,qCAAmD;AAEnD,yDAAiE;AACjE,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,WAAW,EAAE,EAAE,OAAY;QACzD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,IAAI,kBAAkB,GAAG,EAAE,CAAA;QAE3B,MAAM,OAAO,CAAC,GAAG,CACf,WAAW,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YAC3B,IAAI;gBACF,MAAM,IAAA,oBAAU,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;oBAC3C,IAAI,MAAM,GAAG,MAAM,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;oBAC7D,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBACjC,CAAC,CAAC,CAAA;aACH;YAAC,OAAO,KAAK,EAAE,GAAE;QACpB,CAAC,CAAC,CACH,CAAA;QACD,OAAO,kBAAkB,CAAA;IAC3B,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,WAAmB;IAEnB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;IACxE,IAAI,WAAW,GAAgB,SAAS,CAAC,WAAW,CAAA;IAEpD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;IAC9C,QAAQ,WAAW,EAAE;QACnB,KAAK,2BAAe,CAAC,WAAW;YAC9B,MAAM,WAAW,GAAgB,MAAM,EAAE;iBACtC,aAAa,CAAC,qCAAW,CAAC;iBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;YAErF,IAAI,WAAW,EAAE;gBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBAC1F,eAAe,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;aAChE;YACD,MAAK;QAEP;YACE,MAAK;KACR;IAED,mCAAmC;IACnC,8CAA8C;IAC9C,kCAAkC;IAClC,0FAA0F;IAE1F,uBAAuB;IACvB,iGAAiG;IACjG,sEAAsE;IACtE,MAAM;IACN,IAAI;IACJ,OAAO,SAAS,CAAA;AAClB,CAAC;AAtCD,0CAsCC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.completePacking = exports.completePackingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
5
|
-
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
6
6
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
7
7
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
8
8
|
const controllers_1 = require("../../../../controllers/");
|
|
@@ -23,11 +23,9 @@ exports.completePackingResolver = {
|
|
|
23
23
|
'orderInventories.product'
|
|
24
24
|
]
|
|
25
25
|
});
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
30
|
-
if (!sellercraft) {
|
|
26
|
+
const orderSource = releaseGood.source;
|
|
27
|
+
switch (orderSource) {
|
|
28
|
+
case auth_base_1.ApplicationType.MMS:
|
|
31
29
|
const companyDomain = releaseGood.bizplace.company.domain;
|
|
32
30
|
const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
33
31
|
where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
@@ -44,8 +42,33 @@ exports.completePackingResolver = {
|
|
|
44
42
|
const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
|
|
45
43
|
await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain);
|
|
46
44
|
}
|
|
47
|
-
|
|
45
|
+
break;
|
|
46
|
+
default:
|
|
47
|
+
break;
|
|
48
48
|
}
|
|
49
|
+
// if (releaseGood.type === 'b2c') {
|
|
50
|
+
// const sellercraft: Sellercraft = await tx
|
|
51
|
+
// .getRepository(Sellercraft)
|
|
52
|
+
// .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
53
|
+
// if (!sellercraft) {
|
|
54
|
+
// const companyDomain: Domain = releaseGood.bizplace.company.domain
|
|
55
|
+
// const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
|
|
56
|
+
// where: { orderNo: releaseGood.refNo, domain: companyDomain },
|
|
57
|
+
// relations: [
|
|
58
|
+
// 'marketplaceOrderItems',
|
|
59
|
+
// 'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
60
|
+
// 'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
|
|
61
|
+
// 'marketplaceStore',
|
|
62
|
+
// 'marketplaceStore.marketplaceDistributors'
|
|
63
|
+
// ]
|
|
64
|
+
// })
|
|
65
|
+
// const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
|
|
66
|
+
// if (marketplaceStore.isAutoUpdateShipment) {
|
|
67
|
+
// const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
|
|
68
|
+
// await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
|
|
69
|
+
// }
|
|
70
|
+
// }
|
|
71
|
+
// }
|
|
49
72
|
const bizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
|
|
50
73
|
const worksheetController = new worksheet_controller_1.WorksheetController(tx, domain, user);
|
|
51
74
|
await worksheetController.notifyToCustomer(bizplace, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/complete-packing.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"complete-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/complete-packing.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.packing = exports.packingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
5
6
|
const controllers_1 = require("../../../../controllers");
|
|
6
7
|
exports.packingResolver = {
|
|
@@ -14,15 +15,29 @@ async function packing(tx, domain, user, worksheetDetailName, releaseQty, serial
|
|
|
14
15
|
const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty, serialNumber);
|
|
15
16
|
let releaseGood = worksheetDetail.targetInventory.releaseGood;
|
|
16
17
|
const worksheet = worksheetDetail.worksheet;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
const orderSource = releaseGood.source;
|
|
19
|
+
switch (orderSource) {
|
|
20
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
21
|
+
const sellercraft = await tx
|
|
22
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
23
|
+
.findOne({ domain: worksheet.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
24
|
+
if (sellercraft) {
|
|
25
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
26
|
+
await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
|
|
27
|
+
}
|
|
28
|
+
break;
|
|
29
|
+
default:
|
|
30
|
+
break;
|
|
25
31
|
}
|
|
32
|
+
// if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
|
|
33
|
+
// const sellercraft: Sellercraft = await tx
|
|
34
|
+
// .getRepository(Sellercraft)
|
|
35
|
+
// .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
36
|
+
// if (sellercraft) {
|
|
37
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
38
|
+
// await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
|
|
39
|
+
// }
|
|
40
|
+
// }
|
|
26
41
|
}
|
|
27
42
|
exports.packing = packing;
|
|
28
43
|
//# sourceMappingURL=packing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/packing.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/packing.ts"],"names":[],"mappings":";;;AAEA,yDAAiE;AACjE,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,OAAY;QACnF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAChF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,UAAkB,EAClB,YAAoB;IAEpB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,mBAAmB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAExG,IAAI,WAAW,GAAgB,eAAe,CAAC,eAAe,CAAC,WAAW,CAAA;IAC1E,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;IAEtD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;IAC9C,QAAQ,WAAW,EAAE;QACnB,KAAK,2BAAe,CAAC,WAAW;YAC9B,MAAM,WAAW,GAAgB,MAAM,EAAE;iBACtC,aAAa,CAAC,qCAAW,CAAC;iBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;YAEnF,IAAI,WAAW,EAAE;gBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBAC1F,MAAM,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;aACnE;YACD,MAAK;QAEP;YACE,MAAK;KACR;IAED,gEAAgE;IAChE,8CAA8C;IAC9C,kCAAkC;IAClC,wFAAwF;IAExF,uBAAuB;IACvB,iGAAiG;IACjG,yEAAyE;IACzE,MAAM;IACN,IAAI;AACN,CAAC;AAzCD,0BAyCC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.scanProductPacking = exports.scanProductPackingResolver = void 0;
|
|
4
|
+
const auth_base_1 = require("@things-factory/auth-base");
|
|
4
5
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
5
6
|
const controllers_1 = require("../../../../controllers");
|
|
6
7
|
exports.scanProductPackingResolver = {
|
|
@@ -15,15 +16,31 @@ async function scanProductPacking(tx, domain, user, worksheetDetailName, product
|
|
|
15
16
|
const worksheetDetail = await worksheetController.scanProductPacking(worksheetDetailName, productBarcode, serialNumber);
|
|
16
17
|
let releaseGood = worksheetDetail.targetInventory.releaseGood;
|
|
17
18
|
const worksheet = worksheetDetail.worksheet;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
19
|
+
const orderSource = releaseGood.source;
|
|
20
|
+
switch (orderSource) {
|
|
21
|
+
case auth_base_1.ApplicationType.SELLERCRAFT:
|
|
22
|
+
if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
|
|
23
|
+
const sellercraft = await tx
|
|
24
|
+
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
25
|
+
.findOne({ domain: worksheet.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
26
|
+
if (sellercraft) {
|
|
27
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
28
|
+
sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
break;
|
|
32
|
+
default:
|
|
33
|
+
break;
|
|
26
34
|
}
|
|
35
|
+
// if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
|
|
36
|
+
// const sellercraft: Sellercraft = await tx
|
|
37
|
+
// .getRepository(Sellercraft)
|
|
38
|
+
// .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
39
|
+
// if (sellercraft) {
|
|
40
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
41
|
+
// sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
|
|
42
|
+
// }
|
|
43
|
+
// }
|
|
27
44
|
}
|
|
28
45
|
catch (error) {
|
|
29
46
|
throw error;
|