@things-factory/worksheet-base 4.3.775 → 4.3.777

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.proceedExtraProductsResolver = void 0;
4
+ const typeorm_1 = require("typeorm");
4
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_base_1 = require("@things-factory/integration-base");
@@ -42,6 +43,83 @@ exports.proceedExtraProductsResolver = {
42
43
  type: constants_1.WORKSHEET_TYPE.UNLOADING
43
44
  }
44
45
  });
46
+ const targetProdCnt = arrivalNotice.orderProducts.filter((op) => op.status === sales_base_1.ORDER_PRODUCT_STATUS.ADDED || op.status === sales_base_1.ORDER_PRODUCT_STATUS.EDITED).length;
47
+ const storedOrderProducts = arrivalNotice.orderProducts.filter((op) => op.status !== sales_base_1.ORDER_PRODUCT_STATUS.TERMINATED);
48
+ if (approvedProducts.length + rejectedProducts.length != targetProdCnt)
49
+ throw new Error(`Invalid numbers of extra products`);
50
+ // Validation: Prevent deleting all orders
51
+ let potentialDeleteCount = 0;
52
+ if (approvedProducts === null || approvedProducts === void 0 ? void 0 : approvedProducts.length) {
53
+ approvedProducts.forEach((approvedProd) => {
54
+ var _a, _b;
55
+ const selectedOrderProduct = storedOrderProducts.find((op) => op.id === approvedProd.id);
56
+ if (selectedOrderProduct) {
57
+ const packQty = (_a = selectedOrderProduct.adjustedPackQty) !== null && _a !== void 0 ? _a : selectedOrderProduct.packQty;
58
+ const palletQty = (_b = selectedOrderProduct.adjustedPalletQty) !== null && _b !== void 0 ? _b : selectedOrderProduct.palletQty;
59
+ // Condition: BOTH packQty AND palletQty must be 0 (or null/undefined)
60
+ if ((packQty === 0 || packQty === null || packQty === undefined) &&
61
+ (palletQty === 0 || palletQty === null || palletQty === undefined)) {
62
+ potentialDeleteCount++;
63
+ }
64
+ }
65
+ });
66
+ }
67
+ if (rejectedProducts === null || rejectedProducts === void 0 ? void 0 : rejectedProducts.length) {
68
+ rejectedProducts.forEach((rejectedProd) => {
69
+ if (rejectedProd.status === sales_base_1.ORDER_PRODUCT_STATUS.ADDED) {
70
+ potentialDeleteCount++;
71
+ }
72
+ });
73
+ }
74
+ if (potentialDeleteCount === storedOrderProducts.length) {
75
+ // 1. Cancel Arrival Notice
76
+ arrivalNotice.status = sales_base_1.ORDER_STATUS.CANCELLED;
77
+ arrivalNotice.updater = user;
78
+ await tx.getRepository(sales_base_1.ArrivalNotice).save(arrivalNotice);
79
+ // 2. Cancel Worksheet
80
+ if (worksheet) {
81
+ worksheet.status = constants_1.WORKSHEET_STATUS.CANCELLED;
82
+ worksheet.updater = user;
83
+ await tx.getRepository(entities_1.Worksheet).save(worksheet);
84
+ // 3. Cancel Worksheet Details
85
+ const worksheetDetails = await tx.getRepository(entities_1.WorksheetDetail).find({
86
+ where: {
87
+ worksheet: worksheet,
88
+ type: constants_1.WORKSHEET_TYPE.UNLOADING
89
+ }
90
+ });
91
+ if (worksheetDetails === null || worksheetDetails === void 0 ? void 0 : worksheetDetails.length) {
92
+ await tx.getRepository(entities_1.WorksheetDetail).save(worksheetDetails.map(wsd => {
93
+ wsd.status = constants_1.WORKSHEET_STATUS.CANCELLED;
94
+ wsd.updater = user;
95
+ return wsd;
96
+ }));
97
+ }
98
+ }
99
+ // 4. Terminate Order Products
100
+ if (storedOrderProducts === null || storedOrderProducts === void 0 ? void 0 : storedOrderProducts.length) {
101
+ await tx.getRepository(sales_base_1.OrderProduct).save(storedOrderProducts.map(op => {
102
+ op.status = sales_base_1.ORDER_PRODUCT_STATUS.CANCELLED;
103
+ op.adjustedBatchId = null;
104
+ op.adjustedBatchIdRef = null;
105
+ op.adjustedPackingType = null;
106
+ op.adjustedPackQty = null;
107
+ op.adjustedPalletQty = null;
108
+ op.adjustedUom = null;
109
+ op.adjustedUomValue = null;
110
+ op.adjustedTotalUomValue = null;
111
+ op.adjustedUnitPrice = null;
112
+ op.adjustedLocation = null;
113
+ op.adjustedLocationId = null;
114
+ op.adjustedWarehouse = null;
115
+ op.adjustedWarehouseId = null;
116
+ op.adjustedExpDate = null;
117
+ op.updater = user;
118
+ return op;
119
+ }));
120
+ }
121
+ return;
122
+ }
45
123
  if (isDirectInboundEnabled) {
46
124
  arrivalNotice.status = sales_base_1.ORDER_STATUS.PENDING;
47
125
  arrivalNotice.updater = user;
@@ -53,60 +131,93 @@ exports.proceedExtraProductsResolver = {
53
131
  arrivalNotice.updater = user;
54
132
  await tx.getRepository(sales_base_1.ArrivalNotice).save(arrivalNotice);
55
133
  }
56
- const targetProdCnt = arrivalNotice.orderProducts.filter((op) => op.status === sales_base_1.ORDER_PRODUCT_STATUS.ADDED || op.status === sales_base_1.ORDER_PRODUCT_STATUS.EDITED).length;
57
- const storedOrderProducts = arrivalNotice.orderProducts;
58
- if (approvedProducts.length + rejectedProducts.length != targetProdCnt)
59
- throw new Error(`Invalid numbers of extra products`);
134
+ let deleteOrderProducts = [];
60
135
  if (approvedProducts === null || approvedProducts === void 0 ? void 0 : approvedProducts.length) {
61
136
  let updatedOrderProducts = [];
62
137
  const editedApprovedProducts = approvedProducts.filter((approvedProd) => approvedProd.status === sales_base_1.ORDER_PRODUCT_STATUS.EDITED);
63
138
  const addedApprovedProducts = approvedProducts.filter((approvedProd) => approvedProd.status === sales_base_1.ORDER_PRODUCT_STATUS.ADDED);
64
139
  if ((editedApprovedProducts === null || editedApprovedProducts === void 0 ? void 0 : editedApprovedProducts.length) > 0) {
65
140
  await Promise.all(editedApprovedProducts.map(async (editedApprovedProd) => {
141
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
66
142
  const selectedOrderProduct = storedOrderProducts.find((op) => op.id === editedApprovedProd.id);
67
- updatedOrderProducts.push(Object.assign(Object.assign({}, selectedOrderProduct), { batchId: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedBatchId)
68
- ? selectedOrderProduct.adjustedBatchId
69
- : selectedOrderProduct.batchId, batchIdRef: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedBatchIdRef)
70
- ? selectedOrderProduct.adjustedBatchIdRef
71
- : selectedOrderProduct.batchIdRef, packingType: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedPackingType)
72
- ? selectedOrderProduct.adjustedPackingType
73
- : selectedOrderProduct.packingType, packQty: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedPackQty)
74
- ? selectedOrderProduct.adjustedPackQty
75
- : selectedOrderProduct.packQty, uom: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedUom) ? selectedOrderProduct.adjustedUom : selectedOrderProduct.uom, uomValue: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedUomValue)
76
- ? selectedOrderProduct.adjustedUomValue
77
- : selectedOrderProduct.uomValue, totalUomValue: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedTotalUomValue) || (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedTotalUomValue) === ''
78
- ? selectedOrderProduct.adjustedTotalUomValue
79
- : selectedOrderProduct.totalUomValue, palletQty: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedPalletQty)
80
- ? selectedOrderProduct.adjustedPalletQty
81
- : selectedOrderProduct.palletQty, unitPrice: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedUnitPrice)
82
- ? selectedOrderProduct.adjustedUnitPrice
83
- : selectedOrderProduct.unitPrice, location: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedLocationId)
84
- ? selectedOrderProduct.adjustedLocationId
85
- : selectedOrderProduct.location, warehouse: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedWarehouseId)
86
- ? selectedOrderProduct.adjustedWarehouseId
87
- : selectedOrderProduct.warehouse, expDate: (selectedOrderProduct === null || selectedOrderProduct === void 0 ? void 0 : selectedOrderProduct.adjustedExpDate)
88
- ? selectedOrderProduct.adjustedExpDate
89
- : selectedOrderProduct.expDate, status: isDirectInboundEnabled
90
- ? sales_base_1.ORDER_PRODUCT_STATUS.PENDING
91
- : worksheet.status === constants_1.WORKSHEET_STATUS.DEACTIVATED
92
- ? sales_base_1.ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
93
- : sales_base_1.ORDER_PRODUCT_STATUS.UNLOADING, updater: user }));
143
+ if (!selectedOrderProduct) {
144
+ throw new Error(`Order product not found: ${editedApprovedProd.id}`);
145
+ }
146
+ const batchId = (_a = selectedOrderProduct.adjustedBatchId) !== null && _a !== void 0 ? _a : selectedOrderProduct.batchId;
147
+ const batchIdRef = (_b = selectedOrderProduct.adjustedBatchIdRef) !== null && _b !== void 0 ? _b : selectedOrderProduct.batchIdRef;
148
+ const packingType = (_c = selectedOrderProduct.adjustedPackingType) !== null && _c !== void 0 ? _c : selectedOrderProduct.packingType;
149
+ const packQty = (_d = selectedOrderProduct.adjustedPackQty) !== null && _d !== void 0 ? _d : selectedOrderProduct.packQty;
150
+ const uom = (_e = selectedOrderProduct.adjustedUom) !== null && _e !== void 0 ? _e : selectedOrderProduct.uom;
151
+ const uomValue = (_f = selectedOrderProduct.adjustedUomValue) !== null && _f !== void 0 ? _f : selectedOrderProduct.uomValue;
152
+ const totalUomValue = (_g = selectedOrderProduct.adjustedTotalUomValue) !== null && _g !== void 0 ? _g : selectedOrderProduct.totalUomValue;
153
+ const palletQty = (_h = selectedOrderProduct.adjustedPalletQty) !== null && _h !== void 0 ? _h : selectedOrderProduct.palletQty;
154
+ const unitPrice = (_j = selectedOrderProduct.adjustedUnitPrice) !== null && _j !== void 0 ? _j : selectedOrderProduct.unitPrice;
155
+ const location = (_k = selectedOrderProduct.adjustedLocationId) !== null && _k !== void 0 ? _k : selectedOrderProduct.location;
156
+ const warehouse = (_l = selectedOrderProduct.adjustedWarehouseId) !== null && _l !== void 0 ? _l : selectedOrderProduct.warehouse;
157
+ const expDate = (_m = selectedOrderProduct.adjustedExpDate) !== null && _m !== void 0 ? _m : selectedOrderProduct.expDate;
158
+ if ((packQty === 0 || packQty === null || packQty === undefined) &&
159
+ (palletQty === 0 || palletQty === null || palletQty === undefined)) {
160
+ deleteOrderProducts.push(selectedOrderProduct);
161
+ }
162
+ else {
163
+ updatedOrderProducts.push(Object.assign(Object.assign({}, selectedOrderProduct), { batchId,
164
+ batchIdRef,
165
+ packingType,
166
+ packQty,
167
+ uom,
168
+ uomValue,
169
+ totalUomValue,
170
+ palletQty,
171
+ unitPrice,
172
+ location,
173
+ warehouse,
174
+ expDate, status: isDirectInboundEnabled
175
+ ? sales_base_1.ORDER_PRODUCT_STATUS.PENDING
176
+ : worksheet.status === constants_1.WORKSHEET_STATUS.DEACTIVATED
177
+ ? sales_base_1.ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
178
+ : sales_base_1.ORDER_PRODUCT_STATUS.UNLOADING, updater: user }));
179
+ }
94
180
  }));
95
181
  }
96
182
  if ((addedApprovedProducts === null || addedApprovedProducts === void 0 ? void 0 : addedApprovedProducts.length) > 0) {
97
183
  await Promise.all(addedApprovedProducts.map(async (addedApprovedProd) => {
98
184
  const selectedOrderProduct = storedOrderProducts.find((op) => op.id === addedApprovedProd.id);
99
- 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, location: selectedOrderProduct.locationId, warehouse: selectedOrderProduct.warehouseId, expDate: selectedOrderProduct.expDate, status: isDirectInboundEnabled
100
- ? sales_base_1.ORDER_PRODUCT_STATUS.PENDING
101
- : worksheet.status === constants_1.WORKSHEET_STATUS.DEACTIVATED
102
- ? sales_base_1.ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
103
- : sales_base_1.ORDER_PRODUCT_STATUS.UNLOADING, updater: user }));
185
+ if (!selectedOrderProduct) {
186
+ throw new Error(`Order product not found: ${addedApprovedProd.id}`);
187
+ }
188
+ const adjustedPackQty = selectedOrderProduct.adjustedPackQty;
189
+ const adjustedPalletQty = selectedOrderProduct.adjustedPalletQty;
190
+ if ((adjustedPackQty === 0 || adjustedPackQty === null || adjustedPackQty === undefined) &&
191
+ (adjustedPalletQty === 0 || adjustedPalletQty === null || adjustedPalletQty === undefined)) {
192
+ deleteOrderProducts.push(selectedOrderProduct);
193
+ }
194
+ else {
195
+ 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, location: selectedOrderProduct.locationId, warehouse: selectedOrderProduct.warehouseId, expDate: selectedOrderProduct.expDate, status: isDirectInboundEnabled
196
+ ? sales_base_1.ORDER_PRODUCT_STATUS.PENDING
197
+ : worksheet.status === constants_1.WORKSHEET_STATUS.DEACTIVATED
198
+ ? sales_base_1.ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
199
+ : sales_base_1.ORDER_PRODUCT_STATUS.UNLOADING, updater: user }));
200
+ }
104
201
  }));
105
202
  }
106
203
  debug('approved and updated order product', updatedOrderProducts);
107
- await tx.getRepository(sales_base_1.OrderProduct).save(updatedOrderProducts);
204
+ if (updatedOrderProducts.length) {
205
+ await tx.getRepository(sales_base_1.OrderProduct).save(updatedOrderProducts);
206
+ }
207
+ if (deleteOrderProducts.length) {
208
+ const relatedWorksheetDetails = await tx.getRepository(entities_1.WorksheetDetail).find({
209
+ where: {
210
+ targetProduct: (0, typeorm_1.In)(deleteOrderProducts.map(op => op.id))
211
+ }
212
+ });
213
+ if (relatedWorksheetDetails.length) {
214
+ await tx.getRepository(entities_1.WorksheetDetail).delete(relatedWorksheetDetails.map(wsd => wsd.id));
215
+ }
216
+ await tx.getRepository(sales_base_1.OrderProduct).delete(deleteOrderProducts.map(op => op.id));
217
+ }
108
218
  if (!isDirectInboundEnabled) {
109
- const unloadingWSDs = await Promise.all(addedApprovedProducts.map(async (targetProduct) => {
219
+ const survivingAddedProducts = addedApprovedProducts.filter(added => !deleteOrderProducts.some(deleted => deleted.id === added.id));
220
+ const unloadingWSDs = await Promise.all(survivingAddedProducts.map(async (targetProduct) => {
110
221
  return {
111
222
  domain,
112
223
  bizplace: customerBizplace,
@@ -131,6 +242,9 @@ exports.proceedExtraProductsResolver = {
131
242
  if ((editedRejectedProducts === null || editedRejectedProducts === void 0 ? void 0 : editedRejectedProducts.length) > 0) {
132
243
  editedRejectedProducts = editedRejectedProducts.map((editedRejectProduct) => {
133
244
  const selectedOrderProduct = storedOrderProducts.find((op) => op.id === editedRejectProduct.id);
245
+ if (!selectedOrderProduct) {
246
+ throw new Error(`Order product not found: ${editedRejectProduct.id}`);
247
+ }
134
248
  return Object.assign(Object.assign({}, selectedOrderProduct), { status: isDirectInboundEnabled
135
249
  ? sales_base_1.ORDER_PRODUCT_STATUS.PENDING
136
250
  : worksheet.status === constants_1.WORKSHEET_STATUS.DEACTIVATED
@@ -142,12 +256,24 @@ exports.proceedExtraProductsResolver = {
142
256
  }
143
257
  debug('rejected added order product', addedRejectedProducts);
144
258
  if ((addedRejectedProducts === null || addedRejectedProducts === void 0 ? void 0 : addedRejectedProducts.length) > 0) {
145
- let deleteOrderProducts = [];
259
+ let rejectedDeleteOrderProducts = [];
146
260
  addedRejectedProducts.map(rejectedOp => {
147
261
  const selectedOrderProduct = storedOrderProducts.find((op) => op.id === rejectedOp.id);
148
- deleteOrderProducts.push(selectedOrderProduct);
262
+ if (selectedOrderProduct) {
263
+ rejectedDeleteOrderProducts.push(selectedOrderProduct);
264
+ }
149
265
  });
150
- await tx.getRepository(sales_base_1.OrderProduct).delete(deleteOrderProducts);
266
+ if (rejectedDeleteOrderProducts.length) {
267
+ const relatedWorksheetDetails = await tx.getRepository(entities_1.WorksheetDetail).find({
268
+ where: {
269
+ targetProduct: (0, typeorm_1.In)(rejectedDeleteOrderProducts.map(op => op.id))
270
+ }
271
+ });
272
+ if (relatedWorksheetDetails.length) {
273
+ await tx.getRepository(entities_1.WorksheetDetail).delete(relatedWorksheetDetails.map(wsd => wsd.id));
274
+ }
275
+ await tx.getRepository(sales_base_1.OrderProduct).delete(rejectedDeleteOrderProducts.map(op => op.id));
276
+ }
151
277
  }
152
278
  }
153
279
  (0, integration_base_1.webhookHandler)(arrivalNotice, arrivalNotice.bizplace, integration_base_1.WebhookEventsEnum.ArrivalNoticeUpdated);
@@ -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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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/worksheet-base",
3
- "version": "4.3.775",
3
+ "version": "4.3.777",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -27,24 +27,24 @@
27
27
  "@things-factory/biz-base": "^4.3.767",
28
28
  "@things-factory/document-template-base": "^4.3.767",
29
29
  "@things-factory/id-rule-base": "^4.3.770",
30
- "@things-factory/integration-accounting": "^4.3.770",
31
- "@things-factory/integration-base": "^4.3.770",
32
- "@things-factory/integration-lmd": "^4.3.770",
33
- "@things-factory/integration-marketplace": "^4.3.770",
34
- "@things-factory/integration-powrup": "^4.3.770",
35
- "@things-factory/integration-sellercraft": "^4.3.770",
36
- "@things-factory/integration-sftp": "^4.3.770",
37
- "@things-factory/marketplace-base": "^4.3.770",
30
+ "@things-factory/integration-accounting": "^4.3.776",
31
+ "@things-factory/integration-base": "^4.3.776",
32
+ "@things-factory/integration-lmd": "^4.3.776",
33
+ "@things-factory/integration-marketplace": "^4.3.776",
34
+ "@things-factory/integration-powrup": "^4.3.776",
35
+ "@things-factory/integration-sellercraft": "^4.3.776",
36
+ "@things-factory/integration-sftp": "^4.3.776",
37
+ "@things-factory/marketplace-base": "^4.3.776",
38
38
  "@things-factory/notification": "^4.3.767",
39
- "@things-factory/sales-base": "^4.3.774",
39
+ "@things-factory/sales-base": "^4.3.777",
40
40
  "@things-factory/setting-base": "^4.3.767",
41
41
  "@things-factory/shell": "^4.3.767",
42
42
  "@things-factory/transport-base": "^4.3.767",
43
- "@things-factory/warehouse-base": "^4.3.772",
43
+ "@things-factory/warehouse-base": "^4.3.776",
44
44
  "@things-factory/worksheet-ui": "^4.3.767",
45
45
  "jspdf": "2.5.1",
46
46
  "puppeteer": "21.0.3",
47
47
  "uuid": "^9.0.0"
48
48
  },
49
- "gitHead": "347c45086ac59af6dd2250de3e7370ae26c98a00"
49
+ "gitHead": "7f574cc7c94e99f728d7d0e732dffddf231ea0b5"
50
50
  }
@@ -1,4 +1,4 @@
1
- import { EntityManager } from 'typeorm'
1
+ import { EntityManager, In } from 'typeorm'
2
2
 
3
3
  import { Role, User } from '@things-factory/auth-base'
4
4
  import { Bizplace } from '@things-factory/biz-base'
@@ -55,6 +55,108 @@ export const proceedExtraProductsResolver = {
55
55
  }
56
56
  })
57
57
 
58
+ const targetProdCnt: number = arrivalNotice.orderProducts.filter(
59
+ (op: OrderProduct) => op.status === ORDER_PRODUCT_STATUS.ADDED || op.status === ORDER_PRODUCT_STATUS.EDITED
60
+ ).length
61
+
62
+ const storedOrderProducts: OrderProduct[] = arrivalNotice.orderProducts.filter(
63
+ (op: OrderProduct) => op.status !== ORDER_PRODUCT_STATUS.TERMINATED
64
+ )
65
+
66
+ if (approvedProducts.length + rejectedProducts.length != targetProdCnt)
67
+ throw new Error(`Invalid numbers of extra products`)
68
+
69
+ // Validation: Prevent deleting all orders
70
+ let potentialDeleteCount = 0
71
+
72
+ if (approvedProducts?.length) {
73
+ approvedProducts.forEach((approvedProd: OrderProduct) => {
74
+ const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
75
+ (op: OrderProduct) => op.id === approvedProd.id
76
+ )
77
+
78
+ if (selectedOrderProduct) {
79
+ const packQty = selectedOrderProduct.adjustedPackQty ?? selectedOrderProduct.packQty
80
+ const palletQty = selectedOrderProduct.adjustedPalletQty ?? selectedOrderProduct.palletQty
81
+
82
+ // Condition: BOTH packQty AND palletQty must be 0 (or null/undefined)
83
+ if (
84
+ (packQty === 0 || packQty === null || packQty === undefined) &&
85
+ (palletQty === 0 || palletQty === null || palletQty === undefined)
86
+ ) {
87
+ potentialDeleteCount++
88
+ }
89
+ }
90
+ })
91
+ }
92
+
93
+ if (rejectedProducts?.length) {
94
+ rejectedProducts.forEach((rejectedProd: OrderProduct) => {
95
+ if (rejectedProd.status === ORDER_PRODUCT_STATUS.ADDED) {
96
+ potentialDeleteCount++
97
+ }
98
+ })
99
+ }
100
+
101
+ if (potentialDeleteCount === storedOrderProducts.length) {
102
+ // 1. Cancel Arrival Notice
103
+ arrivalNotice.status = ORDER_STATUS.CANCELLED
104
+ arrivalNotice.updater = user
105
+ await tx.getRepository(ArrivalNotice).save(arrivalNotice)
106
+
107
+ // 2. Cancel Worksheet
108
+ if (worksheet) {
109
+ worksheet.status = WORKSHEET_STATUS.CANCELLED
110
+ worksheet.updater = user
111
+ await tx.getRepository(Worksheet).save(worksheet)
112
+
113
+ // 3. Cancel Worksheet Details
114
+ const worksheetDetails = await tx.getRepository(WorksheetDetail).find({
115
+ where: {
116
+ worksheet: worksheet,
117
+ type: WORKSHEET_TYPE.UNLOADING
118
+ }
119
+ })
120
+
121
+ if (worksheetDetails?.length) {
122
+ await tx.getRepository(WorksheetDetail).save(
123
+ worksheetDetails.map(wsd => {
124
+ wsd.status = WORKSHEET_STATUS.CANCELLED
125
+ wsd.updater = user
126
+ return wsd
127
+ })
128
+ )
129
+ }
130
+ }
131
+
132
+ // 4. Terminate Order Products
133
+ if (storedOrderProducts?.length) {
134
+ await tx.getRepository(OrderProduct).save(
135
+ storedOrderProducts.map(op => {
136
+ op.status = ORDER_PRODUCT_STATUS.CANCELLED
137
+ op.adjustedBatchId = null
138
+ op.adjustedBatchIdRef = null
139
+ op.adjustedPackingType = null
140
+ op.adjustedPackQty = null
141
+ op.adjustedPalletQty = null
142
+ op.adjustedUom = null
143
+ op.adjustedUomValue = null
144
+ op.adjustedTotalUomValue = null
145
+ op.adjustedUnitPrice = null
146
+ op.adjustedLocation = null
147
+ op.adjustedLocationId = null
148
+ op.adjustedWarehouse = null
149
+ op.adjustedWarehouseId = null
150
+ op.adjustedExpDate = null
151
+ op.updater = user
152
+ return op
153
+ })
154
+ )
155
+ }
156
+
157
+ return
158
+ }
159
+
58
160
  if (isDirectInboundEnabled) {
59
161
  arrivalNotice.status = ORDER_STATUS.PENDING
60
162
  arrivalNotice.updater = user
@@ -66,14 +168,7 @@ export const proceedExtraProductsResolver = {
66
168
  await tx.getRepository(ArrivalNotice).save(arrivalNotice)
67
169
  }
68
170
 
69
- const targetProdCnt: number = arrivalNotice.orderProducts.filter(
70
- (op: OrderProduct) => op.status === ORDER_PRODUCT_STATUS.ADDED || op.status === ORDER_PRODUCT_STATUS.EDITED
71
- ).length
72
-
73
- const storedOrderProducts: OrderProduct[] = arrivalNotice.orderProducts
74
-
75
- if (approvedProducts.length + rejectedProducts.length != targetProdCnt)
76
- throw new Error(`Invalid numbers of extra products`)
171
+ let deleteOrderProducts: OrderProduct[] = []
77
172
 
78
173
  if (approvedProducts?.length) {
79
174
  let updatedOrderProducts: OrderProduct[] = []
@@ -91,50 +186,51 @@ export const proceedExtraProductsResolver = {
91
186
  (op: OrderProduct) => op.id === editedApprovedProd.id
92
187
  )
93
188
 
94
- updatedOrderProducts.push({
95
- ...selectedOrderProduct,
96
- batchId: selectedOrderProduct?.adjustedBatchId
97
- ? selectedOrderProduct.adjustedBatchId
98
- : selectedOrderProduct.batchId,
99
- batchIdRef: selectedOrderProduct?.adjustedBatchIdRef
100
- ? selectedOrderProduct.adjustedBatchIdRef
101
- : selectedOrderProduct.batchIdRef,
102
- packingType: selectedOrderProduct?.adjustedPackingType
103
- ? selectedOrderProduct.adjustedPackingType
104
- : selectedOrderProduct.packingType,
105
- packQty: selectedOrderProduct?.adjustedPackQty
106
- ? selectedOrderProduct.adjustedPackQty
107
- : selectedOrderProduct.packQty,
108
- uom: selectedOrderProduct?.adjustedUom ? selectedOrderProduct.adjustedUom : selectedOrderProduct.uom,
109
- uomValue: selectedOrderProduct?.adjustedUomValue
110
- ? selectedOrderProduct.adjustedUomValue
111
- : selectedOrderProduct.uomValue,
112
- totalUomValue:
113
- selectedOrderProduct?.adjustedTotalUomValue || selectedOrderProduct?.adjustedTotalUomValue === ''
114
- ? selectedOrderProduct.adjustedTotalUomValue
115
- : selectedOrderProduct.totalUomValue,
116
- palletQty: selectedOrderProduct?.adjustedPalletQty
117
- ? selectedOrderProduct.adjustedPalletQty
118
- : selectedOrderProduct.palletQty,
119
- unitPrice: selectedOrderProduct?.adjustedUnitPrice
120
- ? selectedOrderProduct.adjustedUnitPrice
121
- : selectedOrderProduct.unitPrice,
122
- location: selectedOrderProduct?.adjustedLocationId
123
- ? selectedOrderProduct.adjustedLocationId
124
- : selectedOrderProduct.location,
125
- warehouse: selectedOrderProduct?.adjustedWarehouseId
126
- ? selectedOrderProduct.adjustedWarehouseId
127
- : selectedOrderProduct.warehouse,
128
- expDate: selectedOrderProduct?.adjustedExpDate
129
- ? selectedOrderProduct.adjustedExpDate
130
- : selectedOrderProduct.expDate,
131
- status: isDirectInboundEnabled
132
- ? ORDER_PRODUCT_STATUS.PENDING
133
- : worksheet.status === WORKSHEET_STATUS.DEACTIVATED
134
- ? ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
135
- : ORDER_PRODUCT_STATUS.UNLOADING,
136
- updater: user
137
- })
189
+ if (!selectedOrderProduct) {
190
+ throw new Error(`Order product not found: ${editedApprovedProd.id}`)
191
+ }
192
+
193
+ const batchId = selectedOrderProduct.adjustedBatchId ?? selectedOrderProduct.batchId
194
+ const batchIdRef = selectedOrderProduct.adjustedBatchIdRef ?? selectedOrderProduct.batchIdRef
195
+ const packingType = selectedOrderProduct.adjustedPackingType ?? selectedOrderProduct.packingType
196
+ const packQty = selectedOrderProduct.adjustedPackQty ?? selectedOrderProduct.packQty
197
+ const uom = selectedOrderProduct.adjustedUom ?? selectedOrderProduct.uom
198
+ const uomValue = selectedOrderProduct.adjustedUomValue ?? selectedOrderProduct.uomValue
199
+ const totalUomValue = selectedOrderProduct.adjustedTotalUomValue ?? selectedOrderProduct.totalUomValue
200
+ const palletQty = selectedOrderProduct.adjustedPalletQty ?? selectedOrderProduct.palletQty
201
+ const unitPrice = selectedOrderProduct.adjustedUnitPrice ?? selectedOrderProduct.unitPrice
202
+ const location = selectedOrderProduct.adjustedLocationId ?? selectedOrderProduct.location
203
+ const warehouse = selectedOrderProduct.adjustedWarehouseId ?? selectedOrderProduct.warehouse
204
+ const expDate = selectedOrderProduct.adjustedExpDate ?? selectedOrderProduct.expDate
205
+
206
+ if (
207
+ (packQty === 0 || packQty === null || packQty === undefined) &&
208
+ (palletQty === 0 || palletQty === null || palletQty === undefined)
209
+ ) {
210
+ deleteOrderProducts.push(selectedOrderProduct)
211
+ } else {
212
+ updatedOrderProducts.push({
213
+ ...selectedOrderProduct,
214
+ batchId,
215
+ batchIdRef,
216
+ packingType,
217
+ packQty,
218
+ uom,
219
+ uomValue,
220
+ totalUomValue,
221
+ palletQty,
222
+ unitPrice,
223
+ location,
224
+ warehouse,
225
+ expDate,
226
+ status: isDirectInboundEnabled
227
+ ? ORDER_PRODUCT_STATUS.PENDING
228
+ : worksheet.status === WORKSHEET_STATUS.DEACTIVATED
229
+ ? ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
230
+ : ORDER_PRODUCT_STATUS.UNLOADING,
231
+ updater: user
232
+ })
233
+ }
138
234
  })
139
235
  )
140
236
  }
@@ -146,37 +242,71 @@ export const proceedExtraProductsResolver = {
146
242
  (op: OrderProduct) => op.id === addedApprovedProd.id
147
243
  )
148
244
 
149
- updatedOrderProducts.push({
150
- ...selectedOrderProduct,
151
- batchId: selectedOrderProduct.adjustedBatchId,
152
- batchIdRef: selectedOrderProduct.adjustedBatchIdRef,
153
- packingType: selectedOrderProduct.adjustedPackingType,
154
- packQty: selectedOrderProduct.adjustedPackQty,
155
- uom: selectedOrderProduct.adjustedUom,
156
- uomValue: selectedOrderProduct.adjustedUomValue,
157
- totalUomValue: selectedOrderProduct.adjustedTotalUomValue,
158
- palletQty: selectedOrderProduct.adjustedPalletQty,
159
- unitPrice: selectedOrderProduct.adjustedUnitPrice,
160
- location: selectedOrderProduct.locationId,
161
- warehouse: selectedOrderProduct.warehouseId,
162
- expDate: selectedOrderProduct.expDate,
163
- status: isDirectInboundEnabled
164
- ? ORDER_PRODUCT_STATUS.PENDING
165
- : worksheet.status === WORKSHEET_STATUS.DEACTIVATED
166
- ? ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
167
- : ORDER_PRODUCT_STATUS.UNLOADING,
168
- updater: user
169
- })
245
+ if (!selectedOrderProduct) {
246
+ throw new Error(`Order product not found: ${addedApprovedProd.id}`)
247
+ }
248
+
249
+ const adjustedPackQty = selectedOrderProduct.adjustedPackQty
250
+ const adjustedPalletQty = selectedOrderProduct.adjustedPalletQty
251
+
252
+ if (
253
+ (adjustedPackQty === 0 || adjustedPackQty === null || adjustedPackQty === undefined) &&
254
+ (adjustedPalletQty === 0 || adjustedPalletQty === null || adjustedPalletQty === undefined)
255
+ ) {
256
+ deleteOrderProducts.push(selectedOrderProduct)
257
+ } else {
258
+ updatedOrderProducts.push({
259
+ ...selectedOrderProduct,
260
+ batchId: selectedOrderProduct.adjustedBatchId,
261
+ batchIdRef: selectedOrderProduct.adjustedBatchIdRef,
262
+ packingType: selectedOrderProduct.adjustedPackingType,
263
+ packQty: selectedOrderProduct.adjustedPackQty,
264
+ uom: selectedOrderProduct.adjustedUom,
265
+ uomValue: selectedOrderProduct.adjustedUomValue,
266
+ totalUomValue: selectedOrderProduct.adjustedTotalUomValue,
267
+ palletQty: selectedOrderProduct.adjustedPalletQty,
268
+ unitPrice: selectedOrderProduct.adjustedUnitPrice,
269
+ location: selectedOrderProduct.locationId,
270
+ warehouse: selectedOrderProduct.warehouseId,
271
+ expDate: selectedOrderProduct.expDate,
272
+ status: isDirectInboundEnabled
273
+ ? ORDER_PRODUCT_STATUS.PENDING
274
+ : worksheet.status === WORKSHEET_STATUS.DEACTIVATED
275
+ ? ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
276
+ : ORDER_PRODUCT_STATUS.UNLOADING,
277
+ updater: user
278
+ })
279
+ }
170
280
  })
171
281
  )
172
282
  }
173
283
 
174
284
  debug('approved and updated order product', updatedOrderProducts)
175
- await tx.getRepository(OrderProduct).save(updatedOrderProducts)
285
+ if (updatedOrderProducts.length) {
286
+ await tx.getRepository(OrderProduct).save(updatedOrderProducts)
287
+ }
288
+
289
+ if (deleteOrderProducts.length) {
290
+ const relatedWorksheetDetails = await tx.getRepository(WorksheetDetail).find({
291
+ where: {
292
+ targetProduct: In(deleteOrderProducts.map(op => op.id))
293
+ }
294
+ })
295
+
296
+ if (relatedWorksheetDetails.length) {
297
+ await tx.getRepository(WorksheetDetail).delete(relatedWorksheetDetails.map(wsd => wsd.id))
298
+ }
299
+
300
+ await tx.getRepository(OrderProduct).delete(deleteOrderProducts.map(op => op.id))
301
+ }
176
302
 
177
303
  if (!isDirectInboundEnabled) {
304
+ const survivingAddedProducts = addedApprovedProducts.filter(
305
+ added => !deleteOrderProducts.some(deleted => deleted.id === added.id)
306
+ )
307
+
178
308
  const unloadingWSDs: any[] = await Promise.all(
179
- addedApprovedProducts.map(async (targetProduct: OrderProduct) => {
309
+ survivingAddedProducts.map(async (targetProduct: OrderProduct) => {
180
310
  return {
181
311
  domain,
182
312
  bizplace: customerBizplace,
@@ -212,13 +342,17 @@ export const proceedExtraProductsResolver = {
212
342
  (op: OrderProduct) => op.id === editedRejectProduct.id
213
343
  )
214
344
 
345
+ if (!selectedOrderProduct) {
346
+ throw new Error(`Order product not found: ${editedRejectProduct.id}`)
347
+ }
348
+
215
349
  return {
216
350
  ...selectedOrderProduct,
217
351
  status: isDirectInboundEnabled
218
352
  ? ORDER_PRODUCT_STATUS.PENDING
219
353
  : worksheet.status === WORKSHEET_STATUS.DEACTIVATED
220
- ? ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
221
- : ORDER_PRODUCT_STATUS.UNLOADING,
354
+ ? ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
355
+ : ORDER_PRODUCT_STATUS.UNLOADING,
222
356
  updater: user
223
357
  }
224
358
  })
@@ -228,15 +362,30 @@ export const proceedExtraProductsResolver = {
228
362
 
229
363
  debug('rejected added order product', addedRejectedProducts)
230
364
  if (addedRejectedProducts?.length > 0) {
231
- let deleteOrderProducts: OrderProduct[] = []
365
+ let rejectedDeleteOrderProducts: OrderProduct[] = []
232
366
  addedRejectedProducts.map(rejectedOp => {
233
- const selectedOrderProduct: OrderProduct[] = storedOrderProducts.find(
367
+ const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
234
368
  (op: OrderProduct) => op.id === rejectedOp.id
235
369
  )
236
- deleteOrderProducts.push(selectedOrderProduct)
370
+
371
+ if (selectedOrderProduct) {
372
+ rejectedDeleteOrderProducts.push(selectedOrderProduct)
373
+ }
237
374
  })
238
375
 
239
- await tx.getRepository(OrderProduct).delete(deleteOrderProducts)
376
+ if (rejectedDeleteOrderProducts.length) {
377
+ const relatedWorksheetDetails = await tx.getRepository(WorksheetDetail).find({
378
+ where: {
379
+ targetProduct: In(rejectedDeleteOrderProducts.map(op => op.id))
380
+ }
381
+ })
382
+
383
+ if (relatedWorksheetDetails.length) {
384
+ await tx.getRepository(WorksheetDetail).delete(relatedWorksheetDetails.map(wsd => wsd.id))
385
+ }
386
+
387
+ await tx.getRepository(OrderProduct).delete(rejectedDeleteOrderProducts.map(op => op.id))
388
+ }
240
389
  }
241
390
  }
242
391