@things-factory/worksheet-base 4.3.94-alpha.1 → 4.3.96
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/inbound/unloading-worksheet-controller.js +71 -87
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/inspect/cycle-count-worksheet-controller.js +4 -2
- package/dist-server/controllers/inspect/cycle-count-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/loading-worksheet-controller.js +4 -10
- package/dist-server/controllers/outbound/loading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/packing-worksheet-controller.js +33 -47
- package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +48 -78
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/sorting-worksheet-controller.js +14 -12
- package/dist-server/controllers/outbound/sorting-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/vas/vas-worksheet-controller.js +2 -1
- package/dist-server/controllers/vas/vas-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +8 -3
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/entities/index.js +2 -3
- package/dist-server/entities/index.js.map +1 -1
- package/dist-server/entities/warehouse-bizplace-onhand-inventory.js +62 -29
- package/dist-server/entities/warehouse-bizplace-onhand-inventory.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/batch-picking-worksheet.js +0 -6
- package/dist-server/graphql/resolvers/worksheet/batch-picking-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/confirm-cancellation-release-order.js +2 -1
- 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/inventories-by-pallet.js +1 -2
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js +2 -3
- package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/proceed-extra-products.js +4 -6
- package/dist-server/graphql/resolvers/worksheet/proceed-extra-products.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-detail/index.js +0 -1
- package/dist-server/graphql/types/worksheet-detail/index.js.map +1 -1
- package/dist-server/utils/inventory-util.js +98 -1
- package/dist-server/utils/inventory-util.js.map +1 -1
- package/package.json +17 -17
- package/server/controllers/inbound/unloading-worksheet-controller.ts +84 -102
- package/server/controllers/inspect/cycle-count-worksheet-controller.ts +4 -2
- package/server/controllers/outbound/loading-worksheet-controller.ts +3 -9
- package/server/controllers/outbound/packing-worksheet-controller.ts +45 -56
- package/server/controllers/outbound/picking-worksheet-controller.ts +66 -98
- 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 +23 -18
- package/server/entities/index.ts +2 -2
- package/server/entities/warehouse-bizplace-onhand-inventory.ts +63 -29
- package/server/graphql/resolvers/worksheet/batch-picking-worksheet.ts +0 -6
- package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts +2 -1
- package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts +2 -2
- package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +1 -3
- package/server/graphql/resolvers/worksheet/picking-worksheet.ts +2 -3
- package/server/graphql/resolvers/worksheet/proceed-extra-products.ts +4 -5
- package/server/graphql/resolvers/worksheet/transfer.ts +16 -18
- package/server/graphql/resolvers/worksheet/vas-transactions/common-utils.ts +2 -3
- package/server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.ts +1 -4
- package/server/graphql/types/worksheet-detail/index.ts +0 -1
- package/server/utils/inventory-util.ts +126 -1
|
@@ -5,6 +5,7 @@ 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");
|
|
8
9
|
exports.confirmCancellationReleaseOrder = {
|
|
9
10
|
async confirmCancellationReleaseOrder(_, { name }, context) {
|
|
10
11
|
const { tx, domain, user } = context.state;
|
|
@@ -43,7 +44,7 @@ exports.confirmCancellationReleaseOrder = {
|
|
|
43
44
|
})
|
|
44
45
|
.where('id = :id', { id: inventory.id })
|
|
45
46
|
.execute();
|
|
46
|
-
await (0,
|
|
47
|
+
await (0, utils_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CANCEL_ORDER, orderInventory.releaseQty, orderInventory.releaseUomValue, user, tx);
|
|
47
48
|
}
|
|
48
49
|
return orderInventory;
|
|
49
50
|
}));
|
|
@@ -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, utils_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, utils_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, utils_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, utils_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, utils_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, utils_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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"}
|
|
@@ -36,7 +36,6 @@ 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')
|
|
40
39
|
.leftJoinAndSelect('iv.warehouse', 'warehouse')
|
|
41
40
|
.leftJoinAndSelect('iv.location', 'location')
|
|
42
41
|
.leftJoinAndSelect('iv.creator', 'creator')
|
|
@@ -93,7 +92,7 @@ exports.inventoriesByPalletResolver = {
|
|
|
93
92
|
return Object.assign(Object.assign({}, item), { remainQty,
|
|
94
93
|
remainUomValue, remainUomValueWithUom: remainUomValue + ' ' + item.uom,
|
|
95
94
|
// product: item.product,
|
|
96
|
-
productName: item.product.name, productSKU: item.product.sku, productBrand: item.product.brand, productId: item.product.id
|
|
95
|
+
productName: item.product.name, productSKU: item.product.sku, productBrand: item.product.brand, productId: item.product.id });
|
|
97
96
|
}));
|
|
98
97
|
return { items, total };
|
|
99
98
|
}
|
|
@@ -1 +1 @@
|
|
|
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
|
+
{"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,IAC3B;QACH,CAAC,CAAC,CACH,CAAA;QAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA;AAED,KAAK,UAAU,eAAe,CAAC,SAAoB;IACjD,OAAO;QACL,SAAS,EAAE,SAAS,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,IAAI,CAAC,CAAC;QACrD,cAAc,EAAE,SAAS,CAAC,QAAQ,GAAG,CAAC,SAAS,CAAC,cAAc,IAAI,CAAC,CAAC;KACrE,CAAA;AACH,CAAC"}
|
|
@@ -55,7 +55,6 @@ 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')
|
|
59
58
|
.leftJoinAndSelect('INV.location', 'LOC');
|
|
60
59
|
if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
|
|
61
60
|
locationSortingRules.forEach((rule) => {
|
|
@@ -89,8 +88,8 @@ async function pickingWorksheet(domain, releaseGoodNo, locationSortingRules, tx)
|
|
|
89
88
|
const inventoryChangesCount = await tx.getRepository(warehouse_base_1.InventoryChange).count({
|
|
90
89
|
where: {
|
|
91
90
|
inventory: inventory.id,
|
|
92
|
-
status:
|
|
93
|
-
transactionType:
|
|
91
|
+
status: "PENDING",
|
|
92
|
+
transactionType: "MISSING"
|
|
94
93
|
},
|
|
95
94
|
relations: ['inventory', 'product']
|
|
96
95
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAA+D;AAE/D,2DAA+G;AAE/G,mEAAqF;AAErF,kDAAqE;AACrE,gDAAmD;AACnD,0CAAwD;AAG3C,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,gBAAgB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,oBAAoB,EAAE,EAAE,OAAY;QAClF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAE3E,OAAO,MAAM,gBAAgB,CAAC,MAAM,EAAE,aAAa,EAAE,oBAAoB,EAAE,EAAE,CAAC,CAAA;IAChF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,gBAAgB,CACpC,MAAc,EACd,aAAqB,EACrB,oBAAyB,EACzB,EAAiB;;IAEjB,IAAI,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;QACzE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,gCAAgC,EAAE;QACvE,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC;KAC3C,CAAC,CAAA;IAEF,kCAAkC;IAClC,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,WAAW,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,yBAAQ,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;SACvC,CAAC,CAAA;QAEF,MAAM,mBAAmB,GAAmB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,OAAO,CAAC;YACzF,KAAK,EAAE;gBACL,MAAM;gBACN,WAAW;gBACX,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,mCAAsB,CAAC,OAAO,EAAE,mCAAsB,CAAC,MAAM,CAAC,CAAC;aAC5E;YACD,KAAK,EAAE;gBACL,SAAS,EAAE,KAAK;aACjB;YACD,SAAS,EAAE,CAAC,aAAa,EAAE,sBAAsB,EAAE,6BAA6B,CAAC;SAClF,CAAC,CAAA;QAEF,IAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,WAAW,EAAE;YACpC,aAAa,GAAG,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAA;YACpD,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAA;SAC9C;KACF;IAED,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,aAAa,GAAG,CAAC,CAAA;IAEnG,IAAI,WAAW,CAAC,YAAY,EAAE;QAC5B,IAAI,aAAa,GAAkB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAa,CAAC,CAAC,OAAO,CAAC;YAC/E,KAAK,EAAE;gBACL,EAAE,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,eAAe;aACjC;SACF,CAAC,CAAA;KACH;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAuB,EAC7C,MAAM,EACN,WAAW,CAAC,QAAQ,EACpB,CAAC,UAAU,CAAC,EACZ,0BAAc,CAAC,OAAO,EACtB,WAAW,EACX,EAAE,CACH,CAAA;IAED,MAAM,EAAE,GAAwC,EAAE,CAAC,kBAAkB,CAAC,0BAAe,EAAE,KAAK,CAAC,CAAA;IAC7F,EAAE,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,OAAO,CAAC;SACjD,iBAAiB,CAAC,mBAAmB,EAAE,SAAS,CAAC;SACjD,iBAAiB,CAAC,iBAAiB,EAAE,KAAK,CAAC;SAC3C,iBAAiB,CAAC,eAAe,EAAE,MAAM,CAAC;SAC1C,iBAAiB,CAAC,
|
|
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.
|
|
53
|
+
const selectedOrderProduct = storedOrderProducts.find((op) => op.id === editedApprovedProd.id);
|
|
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.id === addedApprovedProd.id);
|
|
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.
|
|
108
|
+
const selectedOrderProduct = storedOrderProducts.find((op) => op.id === editedRejectProduct.id);
|
|
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,9 +117,7 @@ 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(
|
|
121
|
-
//(op: OrderProduct) => op.id === rejectedOp.id
|
|
122
|
-
(op) => op.productDetailId === rejectedOp.productDetailId);
|
|
120
|
+
const selectedOrderProduct = storedOrderProducts.find((op) => op.id === rejectedOp.id);
|
|
123
121
|
deleteOrderProducts.push(selectedOrderProduct);
|
|
124
122
|
});
|
|
125
123
|
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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"}
|
|
@@ -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', '
|
|
14
|
+
relations: ['bizplace', 'product', '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', '
|
|
21
|
+
relations: ['bizplace', 'product', '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,
|
|
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 }));
|
|
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', '
|
|
61
|
+
relations: ['bizplace', 'product', '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,
|
|
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 }));
|
|
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', '
|
|
73
|
+
relations: ['bizplace', 'product', '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,
|
|
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 }));
|
|
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', '
|
|
81
|
+
relations: ['bizplace', 'product', '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,
|
|
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 }));
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transfer.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/transfer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"transfer.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/transfer.ts"],"names":[],"mappings":";;;AAGA,2DAAiF;AACjF,mEAMuC;AAEvC,kDAAqE;AACrE,gDAA8D;AAEjD,QAAA,QAAQ,GAAG;IACtB,KAAK,CAAC,QAAQ,CAAC,CAAM,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,OAAY;QAChE,MAAM,EACJ,EAAE,EACF,MAAM,EACN,QAAQ,EACR,IAAI,EACL,GAA0E,OAAO,CAAC,KAAK,CAAA;QAExF,sBAAsB;QACtB,IAAI,WAAW,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,OAAO,CAAC;YACrE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE;YAC/C,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC;SAC5D,CAAC,CAAA;QACF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAE7D,wBAAwB;QACxB,IAAI,aAAa,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,OAAO,CAAC;YACvE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE;YACnC,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC;SAC5D,CAAC,CAAA;QACF,IAAI,CAAC,aAAa;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;QACjE,IAAI,WAAW,CAAC,OAAO,KAAK,aAAa,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAA;QAEvG,sCAAsC;QACtC,MAAM,eAAe,GAAoB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,OAAO,CAAC;YACvF,KAAK,EAAE;gBACL,MAAM,EAAE,MAAM;gBACd,eAAe,EAAE,aAAa;gBAC9B,MAAM,EAAE,4BAAgB,CAAC,SAAS;gBAClC,IAAI,EAAE,0BAAc,CAAC,OAAO;aAC7B;YACD,SAAS,EAAE,CAAC,WAAW,EAAE,iBAAiB,CAAC;SAC5C,CAAC,CAAA;QACF,IAAI,CAAC,eAAe;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAA;QACxE,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;QACtD,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAC3D,IAAI,eAAe,GAAmB,eAAe,CAAC,eAAe,CAAA;QAErE,kBAAkB;QAClB,sBAAsB;QACtB,mBAAmB;QACnB,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,GAAG,GAAG,CAAA;QACvC,IAAI,OAAO,GAAG,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;QAExE,uBAAuB;QACvB,IAAI,OAAO,IAAI,CAAC,EAAE;YAChB,iCAAiC;YACjC,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,IAAI,iCACjC,WAAW,KACd,GAAG,EAAE,WAAW,CAAC,GAAG,GAAG,GAAG,EAC1B,OAAO,EAAE,WAAW,CAAC,OAAO,GAAG,CAAC,EAChC,OAAO,EAAE,IAAI,IACb,CAAA;YACF,6BAA6B;YAC7B,OAAO,WAAW,CAAC,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,aAAa,CAAC,iCAAgB,CAAC,CAAC,IAAI,iCACxC,WAAW,KACd,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,qCAAoB,CAAC,oBAAoB,EAAE,EACjD,OAAO,EAAE,WAAW,CAAC,OAAO,EAC5B,SAAS,EAAE,WAAW,CAAC,SAAS,EAChC,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAC9B,GAAG,EAAE,WAAW,CAAC,OAAO,EACxB,eAAe,EAAE,2CAA0B,CAAC,aAAa,EACzD,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;YACF,8BAA8B;YAC9B,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,IAAI,iCACjC,aAAa,KAChB,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,iCAAgB,CAAC,UAAU,EACnC,OAAO,EAAE,aAAa,CAAC,OAAO,GAAG,CAAC,EAClC,OAAO,EAAE,IAAI,IACb,CAAA;YAEF,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,IAAI,iCACtC,eAAe,KAClB,MAAM,EAAE,iCAAoB,CAAC,UAAU,IACvC,CAAA;YAEF,aAAa,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,OAAO,CAAC;gBACxD,KAAK,EAAE,EAAE,EAAE,EAAE,aAAa,CAAC,EAAE,EAAE;gBAC/B,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC;aAC5D,CAAC,CAAA;YAEF,6BAA6B;YAC7B,MAAM,EAAE,CAAC,aAAa,CAAC,iCAAgB,CAAC,CAAC,IAAI,iCACxC,aAAa,KAChB,IAAI,EAAE,qCAAoB,CAAC,oBAAoB,EAAE,EACjD,OAAO,EAAE,aAAa,CAAC,OAAO,EAC9B,SAAS,EAAE,aAAa,CAAC,SAAS,EAClC,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAChC,GAAG,EAAE,aAAa,CAAC,OAAO,EAC1B,eAAe,EAAE,2CAA0B,CAAC,cAAc,EAC1D,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;YAEF,kDAAkD;YAClD,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,iCACvC,eAAe,KAClB,MAAM,EAAE,4BAAgB,CAAC,IAAI,EAC7B,OAAO,EAAE,IAAI,IACb,CAAA;SACH;QACD,sBAAsB;aACjB,IAAI,OAAO,GAAG,CAAC,EAAE;YACpB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,IAAI,iCACjC,WAAW,KACd,GAAG,EAAE,WAAW,CAAC,GAAG,GAAG,GAAG,EAC1B,OAAO,EAAE,WAAW,CAAC,OAAO,GAAG,CAAC,EAChC,OAAO,EAAE,IAAI,IACb,CAAA;YAEF,WAAW,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,OAAO,CAAC;gBACtD,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE;gBAC7B,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC;aAC5D,CAAC,CAAA;YACF,6BAA6B;YAC7B,OAAO,WAAW,CAAC,EAAE,CAAA;YACrB,MAAM,EAAE,CAAC,aAAa,CAAC,iCAAgB,CAAC,CAAC,IAAI,iCACxC,WAAW,KACd,MAAM,EACN,IAAI,EAAE,qCAAoB,CAAC,oBAAoB,EAAE,EACjD,OAAO,EAAE,WAAW,CAAC,OAAO,EAC5B,SAAS,EAAE,WAAW,CAAC,SAAS,EAChC,QAAQ,EAAE,WAAW,CAAC,QAAQ,EAC9B,GAAG,EAAE,WAAW,CAAC,OAAO,EACxB,eAAe,EAAE,2CAA0B,CAAC,aAAa,EACzD,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;YAEF,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,IAAI,iCACjC,aAAa,KAChB,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,aAAa,CAAC,OAAO,GAAG,CAAC,EAClC,OAAO,EAAE,IAAI,IACb,CAAA;YAEF,aAAa,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,OAAO,CAAC;gBACxD,KAAK,EAAE,EAAE,EAAE,EAAE,aAAa,CAAC,EAAE,EAAE;gBAC/B,SAAS,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC;aAC5D,CAAC,CAAA;YAEF,6BAA6B;YAC7B,MAAM,EAAE,CAAC,aAAa,CAAC,iCAAgB,CAAC,CAAC,IAAI,iCACxC,aAAa,KAChB,IAAI,EAAE,qCAAoB,CAAC,oBAAoB,EAAE,EACjD,OAAO,EAAE,aAAa,CAAC,OAAO,EAC9B,SAAS,EAAE,aAAa,CAAC,SAAS,EAClC,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAChC,GAAG,EAAE,aAAa,CAAC,OAAO,EAC1B,eAAe,EAAE,2CAA0B,CAAC,cAAc,EAC1D,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;SACH;IACH,CAAC;CACF,CAAA"}
|
|
@@ -219,7 +219,7 @@ async function updateOriginInventories(trxMgr, domain, bizplace, user, refOrder,
|
|
|
219
219
|
break;
|
|
220
220
|
}
|
|
221
221
|
foundInventory = await trxMgr.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, foundInventory), { qty: repackedPkgQty, uomValue: repackedPkgUomValue, creator: user, updater: user }));
|
|
222
|
-
await (0,
|
|
222
|
+
await (0, utils_1.generateInventoryHistory)(foundInventory, refOrder, transactionType, repackedPkgQty, repackedPkgUomValue, user, trxMgr);
|
|
223
223
|
inventories.push(foundInventory);
|
|
224
224
|
}
|
|
225
225
|
else {
|
|
@@ -286,7 +286,7 @@ async function temporaryUpsertInventory(trxMgr, domain, bizplace, user, originIn
|
|
|
286
286
|
inv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(inv);
|
|
287
287
|
}
|
|
288
288
|
// Create inventory history
|
|
289
|
-
await (0,
|
|
289
|
+
await (0, utils_1.generateInventoryHistory)(inv, refOrder, transactionType, addedQty, addedUomValue, user, trxMgr);
|
|
290
290
|
return inv;
|
|
291
291
|
}
|
|
292
292
|
exports.temporaryUpsertInventory = temporaryUpsertInventory;
|
|
@@ -322,14 +322,14 @@ async function temporaryDeductProductAmount(trxMgr, domain, bizplace, user, refO
|
|
|
322
322
|
originInv.lockedUomValue -= originalUomValue;
|
|
323
323
|
originInv.updater = user;
|
|
324
324
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
325
|
-
await (0,
|
|
325
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, transactionType, -reducedQty, -reducedUomValue, user, trxMgr);
|
|
326
326
|
// minus 1 because remain unit qty only exist if the unitQty < 1
|
|
327
327
|
if (originInv.qty - 1 == 0) {
|
|
328
328
|
originInv.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
|
|
329
329
|
originInv.qty = 0;
|
|
330
330
|
originInv.uomValue = 0;
|
|
331
331
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
332
|
-
await (0,
|
|
332
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, transactionType, -1, -unitUomValue, user, trxMgr);
|
|
333
333
|
const newQty = currentUnitQty;
|
|
334
334
|
const newUomValue = (unitUomValue / originInv.packingSize) * newQty;
|
|
335
335
|
originInv.qty = newQty;
|
|
@@ -337,7 +337,7 @@ async function temporaryDeductProductAmount(trxMgr, domain, bizplace, user, refO
|
|
|
337
337
|
originInv.packingSize = 1;
|
|
338
338
|
originInv.status = warehouse_base_1.INVENTORY_STATUS.STORED;
|
|
339
339
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
340
|
-
await (0,
|
|
340
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, transactionType, newQty, newUomValue, user, trxMgr);
|
|
341
341
|
}
|
|
342
342
|
// currentUnitUomValue > 0 only belongs to PackingUnits.QTY
|
|
343
343
|
}
|
|
@@ -349,7 +349,7 @@ async function temporaryDeductProductAmount(trxMgr, domain, bizplace, user, refO
|
|
|
349
349
|
originInv.lockedUomValue -= originalUomValue;
|
|
350
350
|
originInv.updater = user;
|
|
351
351
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
352
|
-
await (0,
|
|
352
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, transactionType, -reducedQty, -reducedUomValue, user, trxMgr);
|
|
353
353
|
}
|
|
354
354
|
else {
|
|
355
355
|
originInv.qty -= reducedQty;
|
|
@@ -359,11 +359,11 @@ async function temporaryDeductProductAmount(trxMgr, domain, bizplace, user, refO
|
|
|
359
359
|
originInv.updater = user;
|
|
360
360
|
originInv.status = originInv.qty > 0 ? warehouse_base_1.INVENTORY_STATUS.STORED : warehouse_base_1.INVENTORY_STATUS.TERMINATED;
|
|
361
361
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
362
|
-
await (0,
|
|
362
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, transactionType, -reducedQty, -reducedUomValue, user, trxMgr);
|
|
363
363
|
if (originInv.qty <= 0 || originInv.uomValue <= 0) {
|
|
364
364
|
originInv.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
|
|
365
365
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
366
|
-
await (0,
|
|
366
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, user, trxMgr);
|
|
367
367
|
}
|
|
368
368
|
}
|
|
369
369
|
}
|
|
@@ -548,7 +548,7 @@ async function upsertInventory(trxMgr, domain, bizplace, user, originInv, refOrd
|
|
|
548
548
|
inv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(inv);
|
|
549
549
|
}
|
|
550
550
|
// Create inventory history
|
|
551
|
-
await (0,
|
|
551
|
+
await (0, utils_1.generateInventoryHistory)(inv, refOrder, transactionType, addedQty, addedUomValue, user, trxMgr);
|
|
552
552
|
return inv;
|
|
553
553
|
}
|
|
554
554
|
exports.upsertInventory = upsertInventory;
|
|
@@ -583,14 +583,14 @@ async function deductProductAmount(trxMgr, domain, bizplace, user, refOrder, ori
|
|
|
583
583
|
originInv.lockedUomValue -= reducedUomValue;
|
|
584
584
|
originInv.updater = user;
|
|
585
585
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
586
|
-
await (0,
|
|
586
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, transactionType, -reducedQty, -reducedUomValue, user, trxMgr);
|
|
587
587
|
// minus 1 because remain unit qty only exist if the unitQty < 1
|
|
588
588
|
if (originInv.qty - 1 == 0) {
|
|
589
589
|
originInv.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
|
|
590
590
|
originInv.qty = 0;
|
|
591
591
|
originInv.uomValue = 0;
|
|
592
592
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
593
|
-
await (0,
|
|
593
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, transactionType, -1, -unitUomValue, user, trxMgr);
|
|
594
594
|
const newQty = currentUnitQty;
|
|
595
595
|
const newUomValue = (unitUomValue / originInv.packingSize) * newQty;
|
|
596
596
|
originInv.qty = newQty;
|
|
@@ -598,7 +598,7 @@ async function deductProductAmount(trxMgr, domain, bizplace, user, refOrder, ori
|
|
|
598
598
|
originInv.packingSize = 1;
|
|
599
599
|
originInv.status = warehouse_base_1.INVENTORY_STATUS.STORED;
|
|
600
600
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
601
|
-
await (0,
|
|
601
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, transactionType, newQty, newUomValue, user, trxMgr);
|
|
602
602
|
}
|
|
603
603
|
// currentUnitUomValue > 0 only belongs to PackingUnits.UOM
|
|
604
604
|
}
|
|
@@ -610,7 +610,7 @@ async function deductProductAmount(trxMgr, domain, bizplace, user, refOrder, ori
|
|
|
610
610
|
originInv.lockedUomValue -= reducedUomValue;
|
|
611
611
|
originInv.updater = user;
|
|
612
612
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
613
|
-
await (0,
|
|
613
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, transactionType, -reducedQty, -reducedUomValue, user, trxMgr);
|
|
614
614
|
}
|
|
615
615
|
else {
|
|
616
616
|
originInv.qty -= reducedQty;
|
|
@@ -620,11 +620,11 @@ async function deductProductAmount(trxMgr, domain, bizplace, user, refOrder, ori
|
|
|
620
620
|
originInv.updater = user;
|
|
621
621
|
originInv.status = originInv.qty > 0 ? warehouse_base_1.INVENTORY_STATUS.STORED : warehouse_base_1.INVENTORY_STATUS.TERMINATED;
|
|
622
622
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
623
|
-
await (0,
|
|
623
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, transactionType, -reducedQty, -reducedUomValue, user, trxMgr);
|
|
624
624
|
if (originInv.qty <= 0 || originInv.uomValue <= 0) {
|
|
625
625
|
originInv.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
|
|
626
626
|
originInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(originInv);
|
|
627
|
-
await (0,
|
|
627
|
+
await (0, utils_1.generateInventoryHistory)(originInv, refOrder, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, user, trxMgr);
|
|
628
628
|
}
|
|
629
629
|
}
|
|
630
630
|
}
|
|
@@ -713,9 +713,9 @@ async function createLoadingWorksheet(trxMgr, domain, bizplace, user, refOrder,
|
|
|
713
713
|
// Update inventory to PICKED inventory
|
|
714
714
|
changedInv = await trxMgr.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, changedInv), { qty: changedInv.qty - changedQty, uomValue: changedInv.uomValue - changedUomValue, updater: user }));
|
|
715
715
|
// Generate PICKING inventory history
|
|
716
|
-
await (0,
|
|
716
|
+
await (0, utils_1.generateInventoryHistory)(changedInv, refOrder, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PICKING, -changedQty, -changedUomValue, user, trxMgr);
|
|
717
717
|
// Generate TERMINATED inventory history
|
|
718
|
-
await (0,
|
|
718
|
+
await (0, utils_1.generateInventoryHistory)(changedInv, refOrder, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, user, trxMgr);
|
|
719
719
|
// Delete worksheet detail & order inventory
|
|
720
720
|
// If order inventory doesn't have release qty any more
|
|
721
721
|
if (originOrdInv.releaseQty <= 0) {
|