@things-factory/operato-wms 4.3.693 → 4.3.695

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.
@@ -65,12 +65,14 @@ class PalletLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
65
65
  { type: 'gutter', gutterName: 'sequence' },
66
66
  { type: 'gutter', gutterName: 'row-selector', multiple: true },
67
67
  ...(this._enableLotIdInput
68
- ? [{
69
- type: 'string',
70
- name: 'palletId',
71
- header: i18next.t('field.lot_id'),
72
- width: 200
73
- }]
68
+ ? [
69
+ {
70
+ type: 'string',
71
+ name: 'palletId',
72
+ header: i18next.t('field.lot_id'),
73
+ width: 200
74
+ }
75
+ ]
74
76
  : []),
75
77
  {
76
78
  type: 'string',
@@ -131,8 +133,7 @@ class PalletLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
131
133
  if (changeProps.has('pallets')) {
132
134
  if (this.pallets && this.pallets.records && this.pallets.records.length) {
133
135
  this.data = {
134
- records: this.pallets.records
135
- .map(record => ({ ...record, startSeq: 1 }))
136
+ records: this.pallets.records.map(record => ({ ...record, startSeq: 1 }))
136
137
  }
137
138
  }
138
139
  }
@@ -191,8 +192,23 @@ class PalletLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
191
192
 
192
193
  if (!response.errors) {
193
194
  const results = response.data.generatePalletId
195
+ //add date, time, count, total parameter
196
+ const now = new Date()
197
+ const timeStr = now.toLocaleString('en-US', {
198
+ hour: 'numeric',
199
+ minute: '2-digit',
200
+ hour12: true
201
+ })
202
+
203
+ const total = this.data.records.length
194
204
 
195
205
  for (let i = 0; i < results.length; i++) {
206
+ // Find which row this result belongs to in the full data list by matching batchId
207
+ const rowIndex = this.data.records.findIndex(
208
+ row => row.batchId === results[i].batchId && results[i].product.sku === row.product.sku
209
+ )
210
+ const count = rowIndex + 1
211
+
196
212
  let searchParams = new URLSearchParams()
197
213
 
198
214
  searchParams.append('pallet', results[i].palletId)
@@ -208,6 +224,9 @@ class PalletLabelPopup extends connect(store)(localize(i18next)(LitElement)) {
208
224
  searchParams.append('uomValue', results[i].uomValue)
209
225
  searchParams.append('customer', results[i].bizplace?.name)
210
226
  searchParams.append('date', dateStr)
227
+ searchParams.append('time', timeStr)
228
+ searchParams.append('total', total)
229
+ searchParams.append('count', count)
211
230
  searchParams.append('remark', results[i].remark)
212
231
  searchParams.append('batchRef', results[i].batchIdRef)
213
232
  searchParams.append('expirationDate', '')
@@ -577,8 +577,10 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
577
577
  setTimeout(() => this.actualQtyInput.focus(), 100)
578
578
  }
579
579
 
580
- async _fetchProducts(orderNo) {
581
- this._clearView()
580
+ async _fetchProducts(orderNo, preserve = false) {
581
+ if (!preserve) {
582
+ this._clearView()
583
+ }
582
584
 
583
585
  if (this.refOrderType === AVAIL_ORDER_TYPES.ARRIVAL_NOTICE.value) {
584
586
  const response = await client.query({
@@ -607,6 +609,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
607
609
  name
608
610
  description
609
611
  minInboundShelfLife
612
+ allowStackingOption
610
613
  }
611
614
  qty
612
615
  status
@@ -703,6 +706,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
703
706
  description
704
707
  sku
705
708
  minInboundShelfLife
709
+ allowStackingOption
706
710
  }
707
711
  qty
708
712
  status
@@ -875,6 +879,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
875
879
  name
876
880
  description
877
881
  minInboundShelfLife
882
+ allowStackingOption
878
883
  }
879
884
  actualPackQty
880
885
  qty
@@ -968,7 +973,6 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
968
973
  if (e.keyCode === 13) {
969
974
  if (this.refOrderType === AVAIL_ORDER_TYPES.ARRIVAL_NOTICE.value) {
970
975
  if (this._operationType === OPERATION_TYPE.PUTAWAY) {
971
- this.data = { records: [] }
972
976
  await this._arrivalNoticePutaway()
973
977
  } else if (this._operationType === OPERATION_TYPE.TRANSFER) {
974
978
  await this._transfer()
@@ -1057,6 +1061,15 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
1057
1061
 
1058
1062
  if (!response.errors) {
1059
1063
  this._massageItemList(response.data.putaway.worksheetDetailInfos)
1064
+ } else {
1065
+ // GraphQL error without throw: clear location input and notify
1066
+ if (this.locationInput) {
1067
+ this.locationInput.value = ''
1068
+ } else {
1069
+ this._selectedLocation = ''
1070
+ }
1071
+ const msg = response.errors?.[0]?.message || i18next.t('text.something_went_wrong')
1072
+ this._showToast({ message: msg })
1060
1073
  }
1061
1074
  } catch (e) {
1062
1075
  this._showToast(e)
@@ -1125,6 +1138,14 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
1125
1138
  } else {
1126
1139
  this._selectedLocation = ''
1127
1140
  }
1141
+ } else {
1142
+ if (this.locationInput) {
1143
+ this.locationInput.value = ''
1144
+ } else {
1145
+ this._selectedLocation = ''
1146
+ }
1147
+ const msg = response.errors?.[0]?.message || i18next.t('text.something_went_wrong')
1148
+ this._showToast({ message: msg })
1128
1149
  }
1129
1150
  } catch (e) {
1130
1151
  this._showToast(e)
@@ -1193,6 +1214,14 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
1193
1214
  this._selectedOrderProduct = null
1194
1215
  this.recommendLocationName = null
1195
1216
  this.locationInput.value = ''
1217
+ } else {
1218
+ if (this.locationInput) {
1219
+ this.locationInput.value = ''
1220
+ } else {
1221
+ this._selectedLocation = ''
1222
+ }
1223
+ const msg = response.errors?.[0]?.message || i18next.t('text.something_went_wrong')
1224
+ this._showToast({ message: msg })
1196
1225
  }
1197
1226
  } catch (e) {
1198
1227
  this._showToast(e)
@@ -1284,6 +1313,14 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
1284
1313
  } else {
1285
1314
  this._selectedLocation = ''
1286
1315
  }
1316
+ } else {
1317
+ if (this.locationInput) {
1318
+ this.locationInput.value = ''
1319
+ } else {
1320
+ this._selectedLocation = ''
1321
+ }
1322
+ const msg = response.errors?.[0]?.message || i18next.t('text.something_went_wrong')
1323
+ this._showToast({ message: msg })
1287
1324
  }
1288
1325
  } catch (e) {
1289
1326
  this._showToast(e)
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-wms",
3
- "version": "4.3.693",
3
+ "version": "4.3.695",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -62,53 +62,53 @@
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.689",
66
- "@things-factory/attachment-ui": "^4.3.689",
67
- "@things-factory/auth-ui": "^4.3.689",
68
- "@things-factory/barcode-ui": "^4.3.689",
69
- "@things-factory/biz-ui": "^4.3.689",
70
- "@things-factory/board-service": "^4.3.689",
71
- "@things-factory/board-ui": "^4.3.689",
72
- "@things-factory/code-ui": "^4.3.689",
73
- "@things-factory/context-ui": "^4.3.689",
74
- "@things-factory/export-ui": "^4.3.689",
75
- "@things-factory/export-ui-csv": "^4.3.689",
76
- "@things-factory/export-ui-excel": "^4.3.689",
77
- "@things-factory/fav-base": "^4.3.689",
78
- "@things-factory/form-ui": "^4.3.689",
79
- "@things-factory/geography": "^4.3.689",
80
- "@things-factory/grist-ui": "^4.3.689",
81
- "@things-factory/help": "^4.3.689",
82
- "@things-factory/i18n-base": "^4.3.689",
83
- "@things-factory/id-rule-base": "^4.3.689",
84
- "@things-factory/import-ui": "^4.3.689",
85
- "@things-factory/import-ui-excel": "^4.3.689",
86
- "@things-factory/menu-ui": "^4.3.689",
87
- "@things-factory/more-ui": "^4.3.689",
88
- "@things-factory/notification": "^4.3.689",
65
+ "@things-factory/apptool-ui": "^4.3.695",
66
+ "@things-factory/attachment-ui": "^4.3.695",
67
+ "@things-factory/auth-ui": "^4.3.695",
68
+ "@things-factory/barcode-ui": "^4.3.695",
69
+ "@things-factory/biz-ui": "^4.3.695",
70
+ "@things-factory/board-service": "^4.3.695",
71
+ "@things-factory/board-ui": "^4.3.695",
72
+ "@things-factory/code-ui": "^4.3.695",
73
+ "@things-factory/context-ui": "^4.3.695",
74
+ "@things-factory/export-ui": "^4.3.695",
75
+ "@things-factory/export-ui-csv": "^4.3.695",
76
+ "@things-factory/export-ui-excel": "^4.3.695",
77
+ "@things-factory/fav-base": "^4.3.695",
78
+ "@things-factory/form-ui": "^4.3.695",
79
+ "@things-factory/geography": "^4.3.695",
80
+ "@things-factory/grist-ui": "^4.3.695",
81
+ "@things-factory/help": "^4.3.695",
82
+ "@things-factory/i18n-base": "^4.3.695",
83
+ "@things-factory/id-rule-base": "^4.3.695",
84
+ "@things-factory/import-ui": "^4.3.695",
85
+ "@things-factory/import-ui-excel": "^4.3.695",
86
+ "@things-factory/menu-ui": "^4.3.695",
87
+ "@things-factory/more-ui": "^4.3.695",
88
+ "@things-factory/notification": "^4.3.695",
89
89
  "@things-factory/pdf": "^4.3.591",
90
- "@things-factory/print-proxy-service": "^4.3.689",
91
- "@things-factory/print-ui": "^4.3.689",
92
- "@things-factory/product-base": "^4.3.689",
93
- "@things-factory/resource-ui": "^4.3.689",
94
- "@things-factory/sales-ui": "^4.3.693",
90
+ "@things-factory/print-proxy-service": "^4.3.695",
91
+ "@things-factory/print-ui": "^4.3.695",
92
+ "@things-factory/product-base": "^4.3.695",
93
+ "@things-factory/resource-ui": "^4.3.695",
94
+ "@things-factory/sales-ui": "^4.3.695",
95
95
  "@things-factory/scene-data-transform": "^4.3.591",
96
96
  "@things-factory/scene-excel": "^4.3.591",
97
97
  "@things-factory/scene-firebase": "^4.3.591",
98
98
  "@things-factory/scene-form": "^4.3.591",
99
99
  "@things-factory/scene-google-map": "^4.3.591",
100
100
  "@things-factory/scene-graphql": "^4.3.591",
101
- "@things-factory/scene-label": "^4.3.689",
101
+ "@things-factory/scene-label": "^4.3.695",
102
102
  "@things-factory/scene-marker": "^4.3.591",
103
103
  "@things-factory/scene-mqtt": "^4.3.591",
104
104
  "@things-factory/scene-restful": "^4.3.591",
105
105
  "@things-factory/scene-visualizer": "^4.3.591",
106
- "@things-factory/setting-ui": "^4.3.689",
107
- "@things-factory/system-ui": "^4.3.689",
108
- "@things-factory/transport-base": "^4.3.689",
109
- "@things-factory/tutorial-ui": "^4.3.689",
110
- "@things-factory/warehouse-base": "^4.3.691",
111
- "@things-factory/worksheet-base": "^4.3.693"
106
+ "@things-factory/setting-ui": "^4.3.695",
107
+ "@things-factory/system-ui": "^4.3.695",
108
+ "@things-factory/transport-base": "^4.3.695",
109
+ "@things-factory/tutorial-ui": "^4.3.695",
110
+ "@things-factory/warehouse-base": "^4.3.695",
111
+ "@things-factory/worksheet-base": "^4.3.695"
112
112
  },
113
113
  "devDependencies": {
114
114
  "@things-factory/builder": "^4.3.591",
@@ -117,5 +117,5 @@
117
117
  "cypress-localstorage-commands": "^1.6.1",
118
118
  "eslint-plugin-cypress": "^2.12.1"
119
119
  },
120
- "gitHead": "e8372d502e3b7e99b9918eae3ed57093a50660bf"
120
+ "gitHead": "7155fc08d58a626367b5fb6231b598e02919e98f"
121
121
  }