@things-factory/operato-wms 4.3.761 → 4.3.764

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.
@@ -4,34 +4,23 @@ module.exports = {
4
4
  useVirtualHostBasedDomain: false,
5
5
  fallbackRoute: '/',
6
6
  subdomainOffset: 2,
7
- port: 4000,
7
+ port: 4011,
8
8
  inspect: '9330',
9
-
10
- storage: {
11
- type: 's3',
12
- accessKeyId: 'AKIAUQEOPWEJHCE4MTH4',
13
- secretAccessKey: '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',
14
- bucketName: 'opa-one',
15
- region: 'ap-southeast-1'
16
- },
17
- // arif
18
9
  // ormconfig: {
19
10
  // name: 'default',
20
11
  // type: 'postgres',
21
- // database: 'arif',
12
+ // database: 'EMS',
22
13
  // username: 'postgres',
23
14
  // password: 'hatio',
24
- // host: '10.254.29.189',
15
+ // host: '192.168.0.161',
25
16
  // port: 15432,
26
17
  // synchronize: false,
27
18
  // logging: true
28
19
  // },
29
-
30
- // STAGING DATABASE
31
20
  ormconfig: {
32
21
  name: 'default',
33
22
  type: 'postgres',
34
- database: 'staging',
23
+ database: 'postgres',
35
24
  username: 'postgres',
36
25
  password: 't62dgT#Ns*GerhuZ9wnzm^',
37
26
  host: 'my-operato-pg.cjcso4qmeuq0.ap-southeast-5.rds.amazonaws.com',
@@ -39,98 +28,62 @@ module.exports = {
39
28
  synchronize: false,
40
29
  logging: true
41
30
  },
42
-
43
- // ormconfig: {
44
- // name: 'default',
45
- // type: 'postgres',
46
- // host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
47
- // port: 55432,
48
- // database: 'postgres',
49
- // username: 'postgres',
50
- // password: 'abcd1234',
51
- // synchronize: false,
52
- // logging: true,
53
- // connectTimeoutMS: 30000,
54
- // extra: { poolSize: 30 }
55
- // },
56
-
57
- //db izzah
58
31
  // ormconfig: {
59
32
  // name: 'default',
60
33
  // type: 'postgres',
61
- // database: '06072023',
34
+ // database: 'operato',
62
35
  // username: 'postgres',
63
36
  // password: 'hatio',
64
37
  // host: '192.168.0.153',
65
- // port: 15432,f
66
- // synchronize: true,
38
+ // port: 15432,
39
+ // synchronize: false,
67
40
  // logging: true
68
41
  // },
69
42
  // ormconfig: {
70
43
  // name: 'default',
71
44
  // type: 'postgres',
72
- // database: 'postgres',
73
- // username: 'postgres',
74
- // password: 'hatio',
75
- // host: '192.168.0.151',
76
- // port: 15432,
45
+ // database: 'operato',
46
+ // username: 'operato',
47
+ // password: 'abcd1234',
48
+ // host: 'localhost',
49
+ // port: 25432,
77
50
  // synchronize: false,
78
51
  // logging: true
79
52
  // },
80
-
81
- // //ERIC
82
53
  // ormconfig: {
83
54
  // name: 'default',
84
55
  // type: 'postgres',
85
- // database: 'eric',
56
+ // database: 'operato',
86
57
  // username: 'postgres',
87
58
  // password: 'hatio',
88
- // host: '192.168.0.153',
59
+ // host: '192.168.0.151',
89
60
  // port: 15432,
90
61
  // synchronize: false,
91
62
  // logging: true
92
63
  // },
93
-
94
- //eric 2
64
+ //arif
95
65
  // ormconfig: {
96
66
  // name: 'default',
97
67
  // type: 'postgres',
98
- // database: 'eric2',
68
+ // database: 'arif',
99
69
  // username: 'postgres',
100
70
  // password: 'hatio',
101
- // host: '192.168.0.153',
71
+ // host: '10.254.29.189',
102
72
  // port: 15432,
103
73
  // synchronize: false,
104
74
  // logging: true
105
75
  // },
106
-
107
76
  // ormconfig: {
108
77
  // name: 'default',
109
78
  // type: 'postgres',
110
- // host: 'operatov3.cluster-cijhm4n1hbst.ap-southeast-1.rds.amazonaws.com',
111
- // port: 55432,
112
- // database: 'postgres',
79
+ // database: 'operato-eric',
113
80
  // username: 'postgres',
114
- // password: 'abcd1234',
81
+ // password: 'hatio',
82
+ // host: '192.168.0.249',
83
+ // port: 5432,
115
84
  // synchronize: false,
116
- // logging: true,
117
- // connectTimeoutMS: 30000,
118
- // extra: { poolSize: 30 }
85
+ // logging: true
119
86
  // },
120
- //ormconfig: {
121
- // name: 'default',
122
- // type: 'postgres',
123
- // database: 'dev2',
124
- // username: 'postgres',
125
- // password: 'hatio',
126
- // host: 'localhost',
127
- // port: 15432,
128
- // synchronize: false,
129
- // logging: true,
130
- // connectTimeoutMS: 30000,
131
- // extra: { poolSize: 30 }
132
- //},
133
- SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
134
87
  password: {
135
88
  lowerCase: true,
136
89
  upperCase: false,
@@ -143,8 +96,22 @@ module.exports = {
143
96
  looseCharacterLength: 4,
144
97
  history: 2
145
98
  },
99
+ sftpFileStorage: {
100
+ type: 's3',
101
+ accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
102
+ secretAccessKey: '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',
103
+ bucketName: 'operato-sftp'
104
+ },
105
+ // storage: {
106
+ // type: 's3',
107
+ // accessKeyId: 'AKIAUQEOPWEJCDH6AR5H',
108
+ // secretAccessKey: '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',
109
+ // bucketName: 'opa-one',
110
+ // region: 'ap-southeast-1'
111
+ // },
146
112
  uploads: 'uploads',
147
113
  attachmentsPath: 'attachments',
114
+ SECRET: '0xD58F835B69D207A76CC5F84a70a1D0d4C79dfC95',
148
115
  logger: {
149
116
  file: {
150
117
  filename: 'logs/application-%DATE%.log',
@@ -160,7 +127,7 @@ module.exports = {
160
127
  port: 587,
161
128
  secure: false, // true for 465, false for other ports
162
129
  auth: {
163
- user: 'no-reply@hatiolab.com', // generated ethereal user
130
+ user: 'noreply@hatiolab.com', // generated ethereal user
164
131
  pass: 'h@ti0LAB1008' // generated ethereal password
165
132
  },
166
133
  secureConnection: false,
@@ -168,7 +135,7 @@ module.exports = {
168
135
  ciphers: 'SSLv3'
169
136
  }
170
137
  },
171
- sender: 'no-reply@hatiolab.com',
138
+ sender: 'noreply@hatiolab.com',
172
139
  notification: {
173
140
  // fcm: {
174
141
  // serviceAccount: {
@@ -192,30 +159,80 @@ module.exports = {
192
159
  // privateKey: '4pmlt3Wk019u7nqU3Q_oGZE6LbUDjjf8DpmAcn9-iss'
193
160
  // }
194
161
  },
195
- // reportApiUrl:
196
- // 'http://k8s-default-operator-8eeba2e246-3e3a5ee7979bcd57.elb.ap-southeast-1.amazonaws.com/rest/report/show_html',
197
- // reportApiUrl: 'http://192.168.0.153:8888/rest/report/show_html',
198
- // reportApiUrl: 'http://192.168.0.153:8888/rest/report/show_html',
199
- // reportApiUrl: 'http://10.100.109.66:8090/rest/report/show_html',
162
+ fulfillmentIntegrationOperato: {
163
+ host: '192.168.0.161:3000',
164
+ protocol: 'http',
165
+ platform: 'operato',
166
+ application: 'Operato MMS',
167
+ appKey: 'a9bf751e622bf146662b240d58971051',
168
+ appSecret: '1c385935dc131c4b902b9bbf6a4798af',
169
+ callback: 'http://192.168.0.161:5000/callback-operato'
170
+ },
171
+ marketplaceIntegrationShopee: {
172
+ platform: 'shopee',
173
+ isUAT: false,
174
+ application: 'Operato MMS',
175
+ partnerId: 846025,
176
+ partnerKey: 'd34cfd85a603f196a0d74ebe08043280c1a27788bb36bdffd61e7e0bb1c90b64',
177
+ v2: true
178
+ },
179
+ marketplaceIntegrationLazada: {
180
+ platform: 'lazada',
181
+ application: 'operato-mms',
182
+ appKey: '120961',
183
+ appSecret: 'HB3RTNEXHlVSlBr9SmWF8AjbSUT7a825',
184
+ callback: 'https://maybank.operato-m.com/lazada-callback'
185
+ },
186
+
187
+ //testinglazada
188
+ // marketplaceIntegrationLazada: {
189
+ // platform: 'lazada',
190
+ // application: 'powrup_bi',
191
+ // appKey: '117890',
192
+ // appSecret: 'tQVllnUa7irAHoNxAwXEVxoP1we1bUjE',
193
+ // callback: 'https://73c5-175-141-30-142.ngrok-free.app/lazada-callback'
194
+ // },
195
+
196
+ accountingIntegrationXero: {
197
+ platform: 'xero',
198
+ application: 'Operato WMS',
199
+ apiKey: '6B12D1AAC05347DC92159C2AEC812859',
200
+ apiSecret: 'T139_ItMjObC82mmy7iwnNflhd2iV0kUvDBj0P_201EmA7Sj',
201
+ callback: 'http://operato-h.com:3000/callback-xero',
202
+ hostname: 'http://operato-h.com:3000/'
203
+ },
204
+ lmdIntegrationNinjavan: {
205
+ clientId: 'P8WCEwMo0FHNlPECwTLetwN3diAmt5KF',
206
+ secretKey: '1D0yNZGseOjhxnwri29xmuZiiuRp131L',
207
+ refreshThreshold: 43200
208
+ },
209
+
210
+ lmdIntegrationEms: { refreshThreshold: 43200 },
211
+
212
+ lmdIntegrationCitylink: { refreshThreshold: 172800000 },
200
213
  awbFileStorage: {
201
214
  type: 's3',
202
- accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
203
- secretAccessKey: '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',
215
+ accessKeyId: 'AKIAUQEOPWEJPXIVER74',
216
+ secretAccessKey: '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',
204
217
  bucketName: 'operato-awb',
205
218
  region: 'ap-southeast-1'
206
219
  },
207
- invoiceFileStorage: {
208
- type: 's3',
209
- accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
210
- secretAccessKey: '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',
211
- invoiceBucket: 'operato-invoice',
212
- region: 'ap-southeast-1'
213
- },
214
220
  lambda: {
215
221
  region: 'ap-southeast-1',
216
- accessKeyId: 'AKIAUQEOPWEJKL43OMZA',
217
- secretAccessKey: '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'
222
+ accessKeyId: 'AKIAUQEOPWEJPXIVER74',
223
+ secretAccessKey: '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'
224
+ },
225
+ lmdIntegrationConfig: {
226
+ version: {
227
+ v1: 'lmdMiddleware',
228
+ v2: 'lmdMiddlewareV2'
229
+ }
230
+ },
231
+ awsSesEmail: {
232
+ accessKeyId: 'AKIAUQEOPWEJPXIVER74',
233
+ secretAccessKey: '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',
234
+ email: 'support@hatio.asia'
218
235
  },
219
236
  reportApiUrl:
220
- 'http://k8s-default-operator-8eeba2e246-3e3a5ee7979bcd57.elb.ap-southeast-1.amazonaws.com/rest/report/show_html'
237
+ 'http://k8s-default-operator-2fd6178d98-66c66a0f76c09575.elb.ap-southeast-1.amazonaws.com/rest/report/show_html'
221
238
  }
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Mutation = exports.Query = void 0;
4
4
  const get_loading_task_1 = require("./get-loading-task");
5
5
  const sort_item_1 = require("./sort-item");
6
+ const unsort_item_1 = require("./unsort-item");
6
7
  const find_loadable_release_good_1 = require("./find-loadable-release-good");
7
8
  const find_loadable_release_good_by_bin_1 = require("./find-loadable-release-good-by-bin");
8
9
  const loading_worksheet_v2_1 = require("./loading-worksheet-v2");
@@ -13,5 +14,5 @@ const undo_load_1 = require("./undo-load");
13
14
  const warehouse_return_1 = require("./warehouse-return");
14
15
  const complete_load_1 = require("./complete-load");
15
16
  exports.Query = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, find_loadable_release_good_1.findLoadableReleaseGood), find_loadable_release_good_by_bin_1.findLoadableReleaseGoodByBin), loading_worksheet_v2_1.loadingWorksheetv2), my_loading_assignment_status_1.myLoadingAssignmentStatus), get_delivery_orders_1.getDeliveryOrders);
16
- exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, get_loading_task_1.getLoadingTask), sort_item_1.sortItem), load_by_qty_1.loadByQty), undo_load_1.undoLoad), warehouse_return_1.warehouseReturn), complete_load_1.completeLoad);
17
+ exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, get_loading_task_1.getLoadingTask), sort_item_1.sortItem), unsort_item_1.unsortItem), load_by_qty_1.loadByQty), undo_load_1.undoLoad), warehouse_return_1.warehouseReturn), complete_load_1.completeLoad);
17
18
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/index.ts"],"names":[],"mappings":";;;AAAA,yDAAmD;AACnD,2CAAsC;AACtC,6EAAsE;AACtE,2FAAkF;AAClF,iEAA2D;AAC3D,+CAAyC;AACzC,iFAA0E;AAC1E,+DAAyD;AACzD,2CAAsC;AACtC,yDAAoD;AACpD,mDAA8C;AAEjC,QAAA,KAAK,6EACb,oDAAuB,GACvB,gEAA4B,GAC5B,yCAAkB,GAClB,wDAAyB,GACzB,uCAAiB,EACrB;AAEY,QAAA,QAAQ,2FAChB,iCAAc,GACd,oBAAQ,GACR,uBAAS,GACT,oBAAQ,GACR,kCAAe,GACf,4BAAY,EAChB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/index.ts"],"names":[],"mappings":";;;AAAA,yDAAmD;AACnD,2CAAsC;AACtC,+CAA0C;AAC1C,6EAAsE;AACtE,2FAAkF;AAClF,iEAA2D;AAC3D,+CAAyC;AACzC,iFAA0E;AAC1E,+DAAyD;AACzD,2CAAsC;AACtC,yDAAoD;AACpD,mDAA8C;AAEjC,QAAA,KAAK,6EACb,oDAAuB,GACvB,gEAA4B,GAC5B,yCAAkB,GAClB,wDAAyB,GACzB,uCAAiB,EACrB;AAEY,QAAA,QAAQ,yGAChB,iCAAc,GACd,oBAAQ,GACR,wBAAU,GACV,uBAAS,GACT,oBAAQ,GACR,kCAAe,GACf,4BAAY,EAChB"}
@@ -0,0 +1,65 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.unsortItem = void 0;
4
+ const typeorm_1 = require("typeorm");
5
+ const sales_base_1 = require("@things-factory/sales-base");
6
+ exports.unsortItem = {
7
+ async unsortItem(_, { orderToteItemId, reason }, context) {
8
+ var _a, _b;
9
+ const { domain, user, tx } = context.state;
10
+ // Find the order tote item with relations
11
+ const orderToteItem = (await tx.getRepository(sales_base_1.OrderToteItem).findOne({
12
+ where: { domain, id: orderToteItemId },
13
+ relations: ['orderTote', 'orderInventory']
14
+ }));
15
+ if (!orderToteItem) {
16
+ throw new Error('Order tote item not found');
17
+ }
18
+ // Check if tote is sealed - cannot undo if sealed
19
+ if ((_a = orderToteItem.orderTote) === null || _a === void 0 ? void 0 : _a.closedDate) {
20
+ throw new Error('Cannot remove item from sealed tote.');
21
+ }
22
+ const orderInventory = orderToteItem.orderInventory;
23
+ const qtyToRemove = orderToteItem.qty;
24
+ if (!orderInventory) {
25
+ throw new Error('Associated order inventory not found');
26
+ }
27
+ // Validate that we can reduce the sorted quantity
28
+ if (orderInventory.sortedQty < qtyToRemove) {
29
+ throw new Error(`Cannot remove ${qtyToRemove} items. Current sorted quantity is ${orderInventory.sortedQty}`);
30
+ }
31
+ // Calculate new sorted quantity
32
+ const newSortedQty = orderInventory.sortedQty - qtyToRemove;
33
+ // Determine new status - revert to PICKED if no more sorted items
34
+ let newStatus = orderInventory.status;
35
+ if (newSortedQty === 0 && orderInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.LOADING) {
36
+ // Check if there are other order tote items for this order inventory
37
+ const otherToteItems = await tx.getRepository(sales_base_1.OrderToteItem).count({
38
+ where: {
39
+ domain,
40
+ orderInventory: { id: orderInventory.id },
41
+ id: (0, typeorm_1.Not)(orderToteItemId)
42
+ }
43
+ });
44
+ // Only revert to PICKED if this is the last tote item (no more sorted items)
45
+ if (otherToteItems === 0) {
46
+ newStatus = sales_base_1.ORDER_INVENTORY_STATUS.SORTING;
47
+ }
48
+ }
49
+ // Update the order inventory
50
+ await tx.getRepository(sales_base_1.OrderInventory).update(orderInventory.id, {
51
+ sortedQty: newSortedQty,
52
+ status: newStatus,
53
+ updatedAt: new Date(),
54
+ updater: user
55
+ });
56
+ // Delete the order tote item
57
+ await tx.getRepository(sales_base_1.OrderToteItem).delete(orderToteItem.id);
58
+ // Log the undo action if reason provided
59
+ if (reason) {
60
+ console.log(`[UNSORT] User ${user.name} removed ${qtyToRemove} items from tote ${(_b = orderToteItem.orderTote) === null || _b === void 0 ? void 0 : _b.name}. Reason: ${reason}`);
61
+ }
62
+ return true;
63
+ }
64
+ };
65
+ //# sourceMappingURL=unsort-item.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"unsort-item.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/outbound/unsort-item.ts"],"names":[],"mappings":";;;AAAA,qCAA4C;AAG5C,2DAAkG;AAErF,QAAA,UAAU,GAAG;IACxB,KAAK,CAAC,UAAU,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,OAAY;;QAChE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,0CAA0C;QAC1C,MAAM,aAAa,GAAG,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAa,CAAC,CAAC,OAAO,CAAC;YACnE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,eAAe,EAAE;YACtC,SAAS,EAAE,CAAC,WAAW,EAAE,gBAAgB,CAAC;SAC3C,CAAC,CAAyB,CAAA;QAE3B,IAAI,CAAC,aAAa,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;SAC7C;QAED,kDAAkD;QAClD,IAAI,MAAA,aAAa,CAAC,SAAS,0CAAE,UAAU,EAAE;YACvC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;QAED,MAAM,cAAc,GAAmB,aAAa,CAAC,cAAc,CAAA;QACnE,MAAM,WAAW,GAAG,aAAa,CAAC,GAAG,CAAA;QAErC,IAAI,CAAC,cAAc,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;SACxD;QAED,kDAAkD;QAClD,IAAI,cAAc,CAAC,SAAS,GAAG,WAAW,EAAE;YAC1C,MAAM,IAAI,KAAK,CAAC,iBAAiB,WAAW,sCAAsC,cAAc,CAAC,SAAS,EAAE,CAAC,CAAA;SAC9G;QAED,gCAAgC;QAChC,MAAM,YAAY,GAAG,cAAc,CAAC,SAAS,GAAG,WAAW,CAAA;QAE3D,kEAAkE;QAClE,IAAI,SAAS,GAAG,cAAc,CAAC,MAAM,CAAA;QACrC,IAAI,YAAY,KAAK,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,mCAAsB,CAAC,OAAO,EAAE;YAClF,qEAAqE;YACrE,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAa,CAAC,CAAC,KAAK,CAAC;gBACjE,KAAK,EAAE;oBACL,MAAM;oBACN,cAAc,EAAE,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE;oBACzC,EAAE,EAAE,IAAA,aAAG,EAAC,eAAe,CAAC;iBACzB;aACF,CAAC,CAAA;YAEF,6EAA6E;YAC7E,IAAI,cAAc,KAAK,CAAC,EAAE;gBACxB,SAAS,GAAG,mCAAsB,CAAC,OAAO,CAAA;aAC3C;SACF;QAED,6BAA6B;QAC7B,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,EAAE;YAC/D,SAAS,EAAE,YAAY;YACvB,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QAEF,6BAA6B;QAC7B,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAa,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QAE9D,yCAAyC;QACzC,IAAI,MAAM,EAAE;YACV,OAAO,CAAC,GAAG,CACT,iBAAiB,IAAI,CAAC,IAAI,YAAY,WAAW,oBAAoB,MAAA,aAAa,CAAC,SAAS,0CAAE,IAAI,aAAa,MAAM,EAAE,CACxH,CAAA;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
@@ -63,14 +63,17 @@ exports.loadingQcReport = {
63
63
  .leftJoin('order_totes', 'ot', 'ot.id = oti.order_tote_id')
64
64
  .leftJoin('order_tote_seals', 'ots', 'ots.order_tote_id = ot.id')
65
65
  .innerJoin('product_details', 'pd', 'oi.product_detail_id = pd.id')
66
- .where('rg.status = :status', { status: 'LOADING' })
67
- .andWhere('bizplace.id = :bizplaceId', { bizplaceId: bizplaceFilter.value })
66
+ .where('bizplace.id = :bizplaceId', { bizplaceId: bizplaceFilter.value })
68
67
  .andWhere('rg.release_date <= :toDate', { toDate: toDateFilter.value })
69
68
  .andWhere('rg.release_date >= :fromDate', { fromDate: fromDateFilter.value })
70
69
  .andWhere('w.type = :type', { type: 'LOADING' })
71
70
  .andWhere('rg.domain_id = :domainId', { domainId: domain.id })
71
+ .andWhere('rg.name IS NOT NULL')
72
+ .andWhere('rg.status NOT IN (:...excludedStatuses)', {
73
+ excludedStatuses: ['PENDING_CANCEL', 'CANCELLED', 'PENDING_WORKSHEET', 'READY_TO_PICK']
74
+ })
72
75
  .groupBy('bizplace.name')
73
- .addGroupBy('rg.name ')
76
+ .addGroupBy('rg.name')
74
77
  .addGroupBy('rg.route_id')
75
78
  .addGroupBy('rg.stop_id')
76
79
  .addGroupBy('rg.release_date')
@@ -99,15 +102,20 @@ exports.loadingQcReport = {
99
102
  console.timeEnd('loadingQcReport');
100
103
  items = items.reduce((prev, curr, idx) => {
101
104
  if (curr.tote) {
102
- let reducedItemIndex = prev.findIndex(itm => itm.releaseGoodNo == curr.releaseGoodNo && itm.tote == curr.tote);
105
+ // Find duplicate by releaseGoodNo, tote, and additional fields to ensure proper grouping
106
+ let reducedItemIndex = prev.findIndex(itm => itm.releaseGoodNo === curr.releaseGoodNo &&
107
+ itm.tote === curr.tote &&
108
+ itm.bizplaceName === curr.bizplaceName);
103
109
  if (reducedItemIndex == -1) {
104
- prev.push(curr);
105
- prev[prev.length - 1].totalSeal = 1;
110
+ // Ensure numeric fields are properly typed when adding new item
111
+ prev.push(Object.assign(Object.assign({}, curr), { orderQuantity: Number(curr.orderQuantity) || 0, totalCarton: Number(curr.totalCarton) || 0, totalSeal: curr.sealId ? 1 : 0 }));
106
112
  }
107
113
  else {
108
- prev[reducedItemIndex].orderQuantity += curr.orderQuantity;
109
- prev[reducedItemIndex].totalCarton += curr.totalCarton;
110
- if (!prev[reducedItemIndex].sealId.includes(curr.sealId)) {
114
+ // Aggregate quantities with explicit numeric conversion
115
+ prev[reducedItemIndex].orderQuantity += Number(curr.orderQuantity) || 0;
116
+ prev[reducedItemIndex].totalCarton += Number(curr.totalCarton) || 0;
117
+ // Concatenate seal IDs only if they're unique and not null
118
+ if (curr.sealId && !prev[reducedItemIndex].sealId.includes(curr.sealId)) {
111
119
  prev[reducedItemIndex].sealId = prev[reducedItemIndex].sealId.concat(', ', curr.sealId);
112
120
  prev[reducedItemIndex].totalSeal++;
113
121
  }
@@ -115,7 +123,8 @@ exports.loadingQcReport = {
115
123
  return prev;
116
124
  }
117
125
  else {
118
- prev.push(curr);
126
+ // Ensure numeric fields are properly typed for items without totes
127
+ prev.push(Object.assign(Object.assign({}, curr), { orderQuantity: Number(curr.orderQuantity) || 0, totalCarton: Number(curr.totalCarton) || 0, totalSeal: 0 }));
119
128
  return prev;
120
129
  }
121
130
  }, []);
@@ -1 +1 @@
1
- {"version":3,"file":"tote-loading-qc-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/tote-loading-qc-report.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tote-loading-qc-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/tote-loading-qc-report.ts"],"names":[],"mappings":"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"}
@@ -20,6 +20,10 @@ exports.Mutation = `
20
20
  worksheetDetails: [Object!]
21
21
  toteNo: String
22
22
  ): Boolean @transaction
23
+ unsortItem(
24
+ orderToteItemId: String!
25
+ reason: String
26
+ ): Boolean @transaction
23
27
  loadByQty(worksheetDetailPatch: LoadingWorksheetDetails): Boolean @transaction
24
28
  undoLoad(doId: String!): Boolean @transaction
25
29
  warehouseReturn (releaseGoodNo: String!, worksheetDetails: [Object!]): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/outbound/index.ts"],"names":[],"mappings":";;;AAAA,qEAAoF;AACpF,yEAAkE;AAClE,6DAA8D;AAEjD,QAAA,KAAK,GAAG;;;;;;CAMpB,CAAA;AAEY,QAAA,QAAQ,GAAG;;;;;;;;;;;;;;CAcvB,CAAA;AAEY,QAAA,KAAK,GAAG,CAAC,yCAAgB,EAAE,gDAAuB,EAAE,gDAAqB,EAAE,4CAAuB,CAAC,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/outbound/index.ts"],"names":[],"mappings":";;;AAAA,qEAAoF;AACpF,yEAAkE;AAClE,6DAA8D;AAEjD,QAAA,KAAK,GAAG;;;;;;CAMpB,CAAA;AAEY,QAAA,QAAQ,GAAG;;;;;;;;;;;;;;;;;;CAkBvB,CAAA;AAEY,QAAA,KAAK,GAAG,CAAC,yCAAgB,EAAE,gDAAuB,EAAE,gDAAqB,EAAE,4CAAuB,CAAC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-wms",
3
- "version": "4.3.761",
3
+ "version": "4.3.764",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -62,60 +62,60 @@
62
62
  "@operato/scene-tab": "^0.1.8",
63
63
  "@operato/scene-table": "^0.1.8",
64
64
  "@operato/scene-wheel-sorter": "^0.1.8",
65
- "@things-factory/apptool-ui": "^4.3.755",
66
- "@things-factory/attachment-ui": "^4.3.755",
67
- "@things-factory/auth-ui": "^4.3.755",
68
- "@things-factory/barcode-ui": "^4.3.755",
69
- "@things-factory/biz-ui": "^4.3.755",
70
- "@things-factory/board-service": "^4.3.755",
71
- "@things-factory/board-ui": "^4.3.755",
72
- "@things-factory/code-ui": "^4.3.755",
73
- "@things-factory/context-ui": "^4.3.755",
74
- "@things-factory/export-ui": "^4.3.755",
75
- "@things-factory/export-ui-csv": "^4.3.755",
76
- "@things-factory/export-ui-excel": "^4.3.755",
77
- "@things-factory/fav-base": "^4.3.755",
78
- "@things-factory/form-ui": "^4.3.755",
79
- "@things-factory/geography": "^4.3.755",
80
- "@things-factory/grist-ui": "^4.3.755",
81
- "@things-factory/help": "^4.3.755",
82
- "@things-factory/i18n-base": "^4.3.755",
83
- "@things-factory/id-rule-base": "^4.3.755",
84
- "@things-factory/import-ui": "^4.3.755",
85
- "@things-factory/import-ui-excel": "^4.3.755",
86
- "@things-factory/menu-ui": "^4.3.755",
87
- "@things-factory/more-ui": "^4.3.755",
88
- "@things-factory/notification": "^4.3.755",
89
- "@things-factory/pdf": "^4.3.755",
90
- "@things-factory/print-proxy-service": "^4.3.755",
91
- "@things-factory/print-ui": "^4.3.755",
92
- "@things-factory/product-base": "^4.3.755",
93
- "@things-factory/resource-ui": "^4.3.755",
94
- "@things-factory/sales-ui": "^4.3.759",
95
- "@things-factory/scene-data-transform": "^4.3.755",
96
- "@things-factory/scene-excel": "^4.3.755",
97
- "@things-factory/scene-firebase": "^4.3.755",
98
- "@things-factory/scene-form": "^4.3.755",
99
- "@things-factory/scene-google-map": "^4.3.755",
100
- "@things-factory/scene-graphql": "^4.3.755",
101
- "@things-factory/scene-label": "^4.3.755",
102
- "@things-factory/scene-marker": "^4.3.755",
103
- "@things-factory/scene-mqtt": "^4.3.755",
104
- "@things-factory/scene-restful": "^4.3.755",
105
- "@things-factory/scene-visualizer": "^4.3.755",
106
- "@things-factory/setting-ui": "^4.3.755",
107
- "@things-factory/system-ui": "^4.3.755",
108
- "@things-factory/transport-base": "^4.3.755",
109
- "@things-factory/tutorial-ui": "^4.3.755",
110
- "@things-factory/warehouse-base": "^4.3.755",
111
- "@things-factory/worksheet-base": "^4.3.761"
65
+ "@things-factory/apptool-ui": "^4.3.764",
66
+ "@things-factory/attachment-ui": "^4.3.764",
67
+ "@things-factory/auth-ui": "^4.3.764",
68
+ "@things-factory/barcode-ui": "^4.3.764",
69
+ "@things-factory/biz-ui": "^4.3.764",
70
+ "@things-factory/board-service": "^4.3.764",
71
+ "@things-factory/board-ui": "^4.3.764",
72
+ "@things-factory/code-ui": "^4.3.764",
73
+ "@things-factory/context-ui": "^4.3.764",
74
+ "@things-factory/export-ui": "^4.3.764",
75
+ "@things-factory/export-ui-csv": "^4.3.764",
76
+ "@things-factory/export-ui-excel": "^4.3.764",
77
+ "@things-factory/fav-base": "^4.3.764",
78
+ "@things-factory/form-ui": "^4.3.764",
79
+ "@things-factory/geography": "^4.3.764",
80
+ "@things-factory/grist-ui": "^4.3.764",
81
+ "@things-factory/help": "^4.3.764",
82
+ "@things-factory/i18n-base": "^4.3.764",
83
+ "@things-factory/id-rule-base": "^4.3.764",
84
+ "@things-factory/import-ui": "^4.3.764",
85
+ "@things-factory/import-ui-excel": "^4.3.764",
86
+ "@things-factory/menu-ui": "^4.3.764",
87
+ "@things-factory/more-ui": "^4.3.764",
88
+ "@things-factory/notification": "^4.3.764",
89
+ "@things-factory/pdf": "^4.3.764",
90
+ "@things-factory/print-proxy-service": "^4.3.764",
91
+ "@things-factory/print-ui": "^4.3.764",
92
+ "@things-factory/product-base": "^4.3.764",
93
+ "@things-factory/resource-ui": "^4.3.764",
94
+ "@things-factory/sales-ui": "^4.3.764",
95
+ "@things-factory/scene-data-transform": "^4.3.764",
96
+ "@things-factory/scene-excel": "^4.3.764",
97
+ "@things-factory/scene-firebase": "^4.3.764",
98
+ "@things-factory/scene-form": "^4.3.764",
99
+ "@things-factory/scene-google-map": "^4.3.764",
100
+ "@things-factory/scene-graphql": "^4.3.764",
101
+ "@things-factory/scene-label": "^4.3.764",
102
+ "@things-factory/scene-marker": "^4.3.764",
103
+ "@things-factory/scene-mqtt": "^4.3.764",
104
+ "@things-factory/scene-restful": "^4.3.764",
105
+ "@things-factory/scene-visualizer": "^4.3.764",
106
+ "@things-factory/setting-ui": "^4.3.764",
107
+ "@things-factory/system-ui": "^4.3.764",
108
+ "@things-factory/transport-base": "^4.3.764",
109
+ "@things-factory/tutorial-ui": "^4.3.764",
110
+ "@things-factory/warehouse-base": "^4.3.764",
111
+ "@things-factory/worksheet-base": "^4.3.764"
112
112
  },
113
113
  "devDependencies": {
114
- "@things-factory/builder": "^4.3.755",
114
+ "@things-factory/builder": "^4.3.764",
115
115
  "cypress": "^9.4.1",
116
116
  "cypress-file-upload": "^5.0.8",
117
117
  "cypress-localstorage-commands": "^1.6.1",
118
118
  "eslint-plugin-cypress": "^2.12.1"
119
119
  },
120
- "gitHead": "ed2c237b4da43cdb1f9902ab9bfc6fbadb1cc53a"
120
+ "gitHead": "4dd8055a25e773814603c4be21fc70930d0cfb13"
121
121
  }
@@ -1,5 +1,6 @@
1
1
  import { getLoadingTask } from './get-loading-task'
2
2
  import { sortItem } from './sort-item'
3
+ import { unsortItem } from './unsort-item'
3
4
  import { findLoadableReleaseGood } from './find-loadable-release-good'
4
5
  import { findLoadableReleaseGoodByBin } from './find-loadable-release-good-by-bin'
5
6
  import { loadingWorksheetv2 } from './loading-worksheet-v2'
@@ -21,6 +22,7 @@ export const Query = {
21
22
  export const Mutation = {
22
23
  ...getLoadingTask,
23
24
  ...sortItem,
25
+ ...unsortItem,
24
26
  ...loadByQty,
25
27
  ...undoLoad,
26
28
  ...warehouseReturn,