@things-factory/operato-wms 4.1.35 → 5.0.0-alpha.10

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.
Files changed (27) hide show
  1. package/client/pages/inbound/unload-product.js +3 -3
  2. package/client/pages/inventory/non-loaded-inventory.js +38 -34
  3. package/client/pages/inventory-check/create-cycle-count.js +0 -2
  4. package/client/pages/master/product/product-detail-bizplace-setting-popup.js +0 -2
  5. package/client/pages/master/product/product-details-popup.js +10 -9
  6. package/client/pages/master/product/product-list.js +10 -9
  7. package/client/pages/outbound/packing-product.js +14 -11
  8. package/client/pages/outbound/worksheet-batch-picking.js +1 -1
  9. package/client/pages/report/outbound-serial-number-report.js +11 -4
  10. package/dist-server/graphql/index.js +5 -1
  11. package/dist-server/graphql/index.js.map +1 -1
  12. package/dist-server/graphql/resolvers/index.js +5 -1
  13. package/dist-server/graphql/resolvers/index.js.map +1 -1
  14. package/dist-server/graphql/resolvers/reports/outbound-serial-number-report.js +4 -2
  15. package/dist-server/graphql/resolvers/reports/outbound-serial-number-report.js.map +1 -1
  16. package/dist-server/graphql/types/index.js +5 -1
  17. package/dist-server/graphql/types/index.js.map +1 -1
  18. package/dist-server/graphql/types/reports/outbound-serial-number-report.js +2 -1
  19. package/dist-server/graphql/types/reports/outbound-serial-number-report.js.map +1 -1
  20. package/dist-server/index.js +5 -1
  21. package/dist-server/index.js.map +1 -1
  22. package/dist-server/utils/index.js +5 -1
  23. package/dist-server/utils/index.js.map +1 -1
  24. package/package.json +66 -66
  25. package/server/graphql/resolvers/reports/outbound-serial-number-report.ts +4 -2
  26. package/server/graphql/types/reports/outbound-serial-number-report.ts +2 -1
  27. package/translations/en.json +1 -0
package/client/pages/inbound/unload-product.js CHANGED
@@ -11,7 +11,7 @@ import './serial-number-list-popup'
11
11
 
12
12
  import gql from 'graphql-tag'
13
13
  import { css, html } from 'lit-element'
14
- import orderBy from 'lodash/orderBy'
14
+ import orderBy from 'lodash-es/orderBy'
15
15
  import { connect } from 'pwa-helpers/connect-mixin.js'
16
16
 
17
17
  import { MultiColumnFormStyles } from '@things-factory/form-ui'
@@ -859,7 +859,6 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
859
859
  this._showToast(e)
860
860
  }
861
861
  }
862
-
863
862
  async _scanProductUnload() {
864
863
  if (this._scanning) return this._showToast({ message: i18next.t('text.previous_scan_is_executing') })
865
864
  this._scanning = true
@@ -1011,8 +1010,9 @@ class UnloadProduct extends connect(store)(localize(i18next)(PageView)) {
1011
1010
  }
1012
1011
  } catch (e) {
1013
1012
  this._showToast(e)
1013
+ } finally {
1014
+ this._scanning = false
1014
1015
  }
1015
- this._scanning = false
1016
1016
  }
1017
1017
 
1018
1018
  async fetchProductDetail(gtin, productId) {
package/client/pages/inventory/non-loaded-inventory.js CHANGED
@@ -8,7 +8,7 @@ import { connect } from 'pwa-helpers/connect-mixin'
8
8
  import { i18next, localize } from '@things-factory/i18n-base'
9
9
  import { client, PageView, store } from '@things-factory/shell'
10
10
  import { ScrollbarStyles } from '@things-factory/styles'
11
- import { flattenObject, isMobileDevice } from '@things-factory/utils'
11
+ import { isMobileDevice } from '@things-factory/utils'
12
12
 
13
13
  class NonLoadedInventory extends connect(store)(localize(i18next)(PageView)) {
14
14
  static get styles() {
@@ -96,7 +96,7 @@ class NonLoadedInventory extends connect(store)(localize(i18next)(PageView)) {
96
96
  { type: 'gutter', gutterName: 'row-selector', multiple: true },
97
97
  {
98
98
  type: 'string',
99
- name: 'orderNo',
99
+ name: 'releaseOrderNo',
100
100
  header: i18next.t('field.ro_no'),
101
101
  sortable: true,
102
102
  width: 150
@@ -125,42 +125,41 @@ class NonLoadedInventory extends connect(store)(localize(i18next)(PageView)) {
125
125
  },
126
126
  {
127
127
  type: 'string',
128
- name: 'product_sku',
128
+ name: 'productSku',
129
129
  header: i18next.t('field.sku'),
130
130
  sortable: true,
131
131
  width: 150
132
132
  },
133
133
  {
134
134
  type: 'string',
135
- name: 'product_name',
135
+ name: 'productName',
136
136
  header: i18next.t('field.product'),
137
137
  sortable: true,
138
138
  width: 250
139
139
  },
140
140
  {
141
141
  type: 'string',
142
- name: 'product_brand',
142
+ name: 'productBrand',
143
143
  header: i18next.t('field.brand'),
144
144
  sortable: true,
145
145
  width: 150
146
146
  },
147
147
  {
148
- type: 'code',
148
+ type: 'string',
149
149
  name: 'packingType',
150
150
  header: i18next.t('field.packing_type'),
151
- record: { codeName: 'PACKING_TYPES' },
152
151
  sortable: true,
153
152
  width: 150
154
153
  },
155
154
  {
156
155
  type: 'number',
157
- name: 'qty',
156
+ name: 'pickedQty',
158
157
  header: i18next.t('field.qty'),
159
158
  width: 80
160
159
  },
161
160
  {
162
161
  type: 'float',
163
- name: 'uomValue',
162
+ name: 'pickedUomValue',
164
163
  header: i18next.t('field.total_uom_value'),
165
164
  width: 110
166
165
  },
@@ -184,7 +183,7 @@ class NonLoadedInventory extends connect(store)(localize(i18next)(PageView)) {
184
183
  this._searchFields = [
185
184
  {
186
185
  label: i18next.t('field.product_info'),
187
- name: 'product_info',
186
+ name: 'productInfo',
188
187
  type: 'text',
189
188
  props: { searchOper: 'eq' }
190
189
  },
@@ -208,13 +207,13 @@ class NonLoadedInventory extends connect(store)(localize(i18next)(PageView)) {
208
207
  },
209
208
  {
210
209
  label: i18next.t('field.ro_no'),
211
- name: 'ro_no',
210
+ name: 'roNo',
212
211
  type: 'text',
213
212
  props: { searchOper: 'i_like' }
214
213
  },
215
214
  {
216
215
  label: i18next.t('field.bin_location'),
217
- name: 'bin_location',
216
+ name: 'binLocation',
218
217
  type: 'text',
219
218
  props: { searchOper: 'i_like' }
220
219
  }
@@ -239,17 +238,20 @@ class NonLoadedInventory extends connect(store)(localize(i18next)(PageView)) {
239
238
  const filters = await this.searchForm.getQueryFilters()
240
239
  const response = await client.query({
241
240
  query: gql`
242
- query nonLoadedInventories($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
243
- nonLoadedInventories(filters: $filters, pagination: $pagination, sortings: $sortings) {
241
+ query nonLoadedOrderInventories($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
242
+ nonLoadedOrderInventories(filters: $filters, pagination: $pagination, sortings: $sortings) {
244
243
  items {
245
- orderNo
246
- palletId
247
- cartonId
248
- batchId
249
- batchIdRef
244
+ releaseGood {
245
+ name
246
+ }
247
+ inventory {
248
+ palletId
249
+ cartonId
250
+ }
250
251
  packingType
251
- qty
252
- uomValue
252
+ batchId
253
+ pickedQty
254
+ pickedUomValue
253
255
  uom
254
256
  product {
255
257
  sku
@@ -257,7 +259,9 @@ class NonLoadedInventory extends connect(store)(localize(i18next)(PageView)) {
257
259
  brand
258
260
  description
259
261
  }
260
- binLocation
262
+ binLocation {
263
+ name
264
+ }
261
265
  updatedAt
262
266
  }
263
267
  total
@@ -272,19 +276,19 @@ class NonLoadedInventory extends connect(store)(localize(i18next)(PageView)) {
272
276
  })
273
277
 
274
278
  return {
275
- total: response.data.nonLoadedInventories.total || 0,
279
+ total: response.data.nonLoadedOrderInventories.total || 0,
276
280
  records:
277
- response.data.nonLoadedInventories.items.map(item => {
278
- return flattenObject(
279
- {
280
- ...item,
281
- product: {
282
- ...item.product,
283
- name: `${item.product.name} ${item.product.description}`
284
- }
285
- },
286
- '_'
287
- )
281
+ response.data.nonLoadedOrderInventories.items.map(item => {
282
+ return {
283
+ ...item,
284
+ productName: `${item.product.name} ${item.product.description}`,
285
+ productSku: item.product.sku,
286
+ productBrand: item.product.brand,
287
+ binLocation: item.binLocation.name,
288
+ palletId: item.inventory.palletId,
289
+ cartonId: item.inventory.cartonId,
290
+ releaseOrderNo: item.releaseGood.name
291
+ }
288
292
  }) || []
289
293
  }
290
294
  }
package/client/pages/inventory-check/create-cycle-count.js CHANGED
@@ -16,8 +16,6 @@ import { isMobileDevice } from '@things-factory/utils'
16
16
  import { fetchLocationSortingRule } from '../../fetch-location-sorting-rule'
17
17
  import { LOCATION_SORTING_RULE } from '../constants'
18
18
 
19
- const _ = require('lodash')
20
-
21
19
  class CreateCycleCount extends localize(i18next)(PageView) {
22
20
  static get properties() {
23
21
  return {
package/client/pages/master/product/product-detail-bizplace-setting-popup.js CHANGED
@@ -9,8 +9,6 @@ import { client, CustomAlert, gqlContext } from '@things-factory/shell'
9
9
  import { ScrollbarStyles } from '@things-factory/styles'
10
10
  import { flattenObject, isMobileDevice } from '@things-factory/utils'
11
11
 
12
- const _ = require('lodash')
13
-
14
12
  export class ProductDetailBizplaceSettingPopup extends localize(i18next)(LitElement) {
15
13
  static get styles() {
16
14
  return [
package/client/pages/master/product/product-details-popup.js CHANGED
@@ -3,6 +3,9 @@ import '@things-factory/grist-ui'
3
3
 
4
4
  import gql from 'graphql-tag'
5
5
  import { css, html, LitElement } from 'lit-element'
6
+ import isEmpty from 'lodash-es/isEmpty'
7
+ import isNaN from 'lodash-es/isNaN'
8
+ import isNumber from 'lodash-es/isNumber'
6
9
 
7
10
  import { getCodeByName } from '@things-factory/code-base'
8
11
  import { i18next, localize } from '@things-factory/i18n-base'
@@ -10,8 +13,6 @@ import { client, CustomAlert, gqlContext } from '@things-factory/shell'
10
13
  import { ScrollbarStyles } from '@things-factory/styles'
11
14
  import { isMobileDevice } from '@things-factory/utils'
12
15
 
13
- const _ = require('lodash')
14
-
15
16
  export class ProductDetailsPopup extends localize(i18next)(LitElement) {
16
17
  static get styles() {
17
18
  return [
@@ -555,20 +556,20 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
555
556
  let data = this.dataGrist._data.records.map(itm => {
556
557
  itm.error = false
557
558
 
558
- if (_.isEmpty(itm.gtin) || '') {
559
+ if (isEmpty(itm.gtin) || '') {
559
560
  itm.error = true
560
561
  if (!errors.find(err => err.type == 'gtin')) errors.push({ type: 'gtin', value: 'GTIN is required' })
561
562
  }
562
- if (_.isEmpty(itm.packingType) || '') {
563
+ if (isEmpty(itm.packingType) || '') {
563
564
  itm.error = true
564
565
  if (!errors.find(err => err.type == 'packingType'))
565
566
  errors.push({ type: 'packingType', value: 'Packing type is required' })
566
567
  }
567
- if (_.isEmpty(itm.uom) || '') {
568
+ if (isEmpty(itm.uom) || '') {
568
569
  itm.error = true
569
570
  if (!errors.find(err => err.type == 'uom')) errors.push({ type: 'uom', value: 'UOM is required' })
570
571
  }
571
- if (!_.isNumber(itm.uomValue) || _.isNaN(itm.uomValue) || '') {
572
+ if (!isNumber(itm.uomValue) || isNaN(itm.uomValue) || '') {
572
573
  itm.error = true
573
574
  if (!errors.find(err => err.type == 'uomValue'))
574
575
  errors.push({ type: 'uomValue', value: 'UOM Value is required' })
@@ -626,7 +627,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
626
627
  ...this.dataGrist._data,
627
628
  records: this._updateRowOption(
628
629
  this.dataGrist._data.records.map((record, idx) => {
629
- if (!_.isEmpty(record.childProductDetail) && record.childProductDetail == before) {
630
+ if (!isEmpty(record.childProductDetail) && record.childProductDetail == before) {
630
631
  record.childProductDetail = after
631
632
  }
632
633
  return record
@@ -636,7 +637,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
636
637
 
637
638
  break
638
639
  case 'uomValue':
639
- if (_.isNaN(after)) {
640
+ if (isNaN(after)) {
640
641
  updatedRecords.records[row].uomValue = 1
641
642
  }
642
643
  break
@@ -691,7 +692,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
691
692
  value: ''
692
693
  },
693
694
  ...data
694
- .filter(child => child.gtin != itm.gtin && !_.isEmpty(child.gtin))
695
+ .filter(child => child.gtin != itm.gtin && !isEmpty(child.gtin))
695
696
  .map(x => {
696
697
  const rowOption = {
697
698
  display: x.gtin,
package/client/pages/master/product/product-list.js CHANGED
@@ -5,6 +5,9 @@ import './product-detail-bizplace-setting-popup'
5
5
 
6
6
  import gql from 'graphql-tag'
7
7
  import { css, html } from 'lit-element'
8
+ import isEmpty from 'lodash-es/isEmpty'
9
+ import isNaN from 'lodash-es/isNaN'
10
+ import isNumber from 'lodash-es/isNumber'
8
11
 
9
12
  import { getCodeByName } from '@things-factory/code-base'
10
13
  import { i18next, localize } from '@things-factory/i18n-base'
@@ -14,8 +17,6 @@ import { client, CustomAlert, gqlContext, PageView } from '@things-factory/shell
14
17
  import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
15
18
  import { isMobileDevice } from '@things-factory/utils'
16
19
 
17
- const _ = require('lodash')
18
-
19
20
  class ProductList extends localize(i18next)(PageView) {
20
21
  static get properties() {
21
22
  return {
@@ -821,7 +822,7 @@ class ProductList extends localize(i18next)(PageView) {
821
822
 
822
823
  async _saveProducts(patches) {
823
824
  try {
824
- if (_.isEmpty(this._bizplaceInput.value) || this._bizplaceInput?.value == undefined) {
825
+ if (isEmpty(this._bizplaceInput.value) || this._bizplaceInput?.value == undefined) {
825
826
  return this.showToast(i18next.t('text.no_company_selected'))
826
827
  }
827
828
 
@@ -944,23 +945,23 @@ class ProductList extends localize(i18next)(PageView) {
944
945
  _validate(data) {
945
946
  let errors = []
946
947
  data = data.map(itm => {
947
- if (_.isEmpty(itm.sku) || '') {
948
+ if (isEmpty(itm.sku) || '') {
948
949
  if (!errors.find(err => err.type == 'sku')) errors.push({ type: 'sku', value: 'Product SKU is required' })
949
950
  }
950
- if (_.isEmpty(itm.name) || '') {
951
+ if (isEmpty(itm.name) || '') {
951
952
  if (!errors.find(err => err.type == 'name')) errors.push({ type: 'name', value: 'Product name is required' })
952
953
  }
953
- if (_.isEmpty(itm.type) || '') {
954
+ if (isEmpty(itm.type) || '') {
954
955
  if (!errors.find(err => err.type == 'type')) errors.push({ type: 'name', value: 'Product type is required' })
955
956
  }
956
- if (_.isEmpty(itm.packingType) || '') {
957
+ if (isEmpty(itm.packingType) || '') {
957
958
  if (!errors.find(err => err.type == 'packingType'))
958
959
  errors.push({ type: 'packingType', value: 'Packing type is required' })
959
960
  }
960
- if (_.isEmpty(itm.uom) || '') {
961
+ if (isEmpty(itm.uom) || '') {
961
962
  if (!errors.find(err => err.type == 'uom')) errors.push({ type: 'uom', value: 'UOM is required' })
962
963
  }
963
- if (!_.isNumber(itm.uomValue) || _.isNaN(itm.uomValue) || '' || itm?.uomValue <= 0) {
964
+ if (!isNumber(itm.uomValue) || isNaN(itm.uomValue) || '' || itm?.uomValue <= 0) {
964
965
  if (!errors.find(err => err.type == 'uomValue'))
965
966
  errors.push({ type: 'uomValue', value: 'UOM Value is required' })
966
967
  }
package/client/pages/outbound/packing-product.js CHANGED
@@ -698,19 +698,22 @@ class PackingProduct extends connect(store)(localize(i18next)(PageView)) {
698
698
  }
699
699
 
700
700
  //find product match with input barcode
701
- const foundOrderInventory = this.data.records.filter(itm =>
702
- itm.product.productDetails.filter(
703
- detail =>
704
- detail.gtin === this.productBarcodeInput.value.trim() &&
705
- detail.packingType == itm.product.packingType &&
706
- detail.packingSize == itm.product.packingSize
707
- )
701
+ const foundOrderInventory = this.data.records.find(
702
+ itm =>
703
+ itm.product.productDetails.find(
704
+ detail =>
705
+ detail.gtin === this.productBarcodeInput.value.trim() &&
706
+ detail.packingType == itm.packingType &&
707
+ detail.packingSize == itm.packingSize
708
+ ) != undefined
708
709
  )
709
710
 
710
- if (foundOrderInventory?.length > 0 && foundOrderInventory[0]?.status === WORKSHEET_STATUS.EXECUTING.value) {
711
- this._selectedOrderInventory = foundOrderInventory[0]
712
- } else if (foundOrderInventory?.length == 1 && foundOrderInventory[0]?.status === WORKSHEET_STATUS.DONE.value) {
713
- throw new Error(i18next.t('text.scanned_product_status_is_done'))
711
+ if (foundOrderInventory) {
712
+ if (foundOrderInventory?.status === WORKSHEET_STATUS.EXECUTING.value) {
713
+ this._selectedOrderInventory = foundOrderInventory
714
+ } else if (foundOrderInventory?.status === WORKSHEET_STATUS.DONE.value) {
715
+ throw new Error(i18next.t('text.scanned_product_status_is_done'))
716
+ }
714
717
  } else {
715
718
  throw new Error(i18next.t('text.incorrect_product_barcode'))
716
719
  }
package/client/pages/outbound/worksheet-batch-picking.js CHANGED
@@ -6,7 +6,7 @@ import './select-operator-popup'
6
6
 
7
7
  import gql from 'graphql-tag'
8
8
  import { css, html } from 'lit-element'
9
- import orderBy from 'lodash/orderBy'
9
+ import orderBy from 'lodash-es/orderBy'
10
10
 
11
11
  import { MultiColumnFormStyles } from '@things-factory/form-ui'
12
12
  import { i18next, localize } from '@things-factory/i18n-base'
package/client/pages/report/outbound-serial-number-report.js CHANGED
@@ -185,8 +185,14 @@ class OutboundSerialNumberReport extends connect(store)(localize(i18next)(PageVi
185
185
  },
186
186
  {
187
187
  type: 'string',
188
- name: 'deliverTo',
189
- header: i18next.t('field.deliver_to'),
188
+ name: 'attentionTo',
189
+ header: i18next.t('field.attention_to'),
190
+ width: 200
191
+ },
192
+ {
193
+ type: 'string',
194
+ name: 'fullDeliveryAddress',
195
+ header: i18next.t('field.full_delivery_address'),
190
196
  width: 200
191
197
  },
192
198
  {
@@ -258,7 +264,7 @@ class OutboundSerialNumberReport extends connect(store)(localize(i18next)(PageVi
258
264
  'refNo1',
259
265
  'refNo2',
260
266
  'refNo3',
261
- 'deliverTo',
267
+ 'fullDeliveryAddress',
262
268
  'palletId',
263
269
  'cartonId',
264
270
  'product|sku',
@@ -336,7 +342,8 @@ class OutboundSerialNumberReport extends connect(store)(localize(i18next)(PageVi
336
342
  refNo1
337
343
  refNo2
338
344
  refNo3
339
- deliverTo
345
+ fullDeliveryAddress
346
+ attentionTo
340
347
  palletId
341
348
  cartonId
342
349
  product {
package/dist-server/graphql/index.js CHANGED
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
package/dist-server/graphql/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/graphql/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAmC;AACnC,uDAAwC;AAE3B,QAAA,MAAM,GAAG;IACpB,QAAQ;IACR,SAAS;CACV,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/graphql/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAmC;AACnC,uDAAwC;AAE3B,QAAA,MAAM,GAAG;IACpB,QAAQ;IACR,SAAS;CACV,CAAA"}
package/dist-server/graphql/resolvers/index.js CHANGED
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
package/dist-server/graphql/resolvers/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/resolvers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAC/C,4DAA6C;AAC7C,8DAA+C;AAC/C,uDAAwC;AACxC,+CAAgC;AAChC,oDAAqC;AACrC,mDAAoC;AACpC,4EAA6D;AAC7D,uEAAwD;AAE3C,QAAA,OAAO,GAAG;IACrB,YAAY,CAAC,KAAK;IAClB,WAAW,CAAC,KAAK;IACjB,YAAY,CAAC,KAAK;IAClB,SAAS,CAAC,KAAK;IACf,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,mBAAmB,CAAC,KAAK;IACzB,iBAAiB,CAAC,KAAK;CACxB,CAAA;AAEY,QAAA,SAAS,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/resolvers/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAC/C,4DAA6C;AAC7C,8DAA+C;AAC/C,uDAAwC;AACxC,+CAAgC;AAChC,oDAAqC;AACrC,mDAAoC;AACpC,4EAA6D;AAC7D,uEAAwD;AAE3C,QAAA,OAAO,GAAG;IACrB,YAAY,CAAC,KAAK;IAClB,WAAW,CAAC,KAAK;IACjB,YAAY,CAAC,KAAK;IAClB,SAAS,CAAC,KAAK;IACf,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,mBAAmB,CAAC,KAAK;IACzB,iBAAiB,CAAC,KAAK;CACxB,CAAA;AAEY,QAAA,SAAS,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA"}
package/dist-server/graphql/resolvers/reports/outbound-serial-number-report.js CHANGED
@@ -41,7 +41,8 @@ exports.outboundSerialNumberReport = {
41
41
  select * from (
42
42
  select
43
43
  row_number() over(partition by rg."name" order by coalesce(w.started_at, ii.created_at), p.sku ) as "no",
44
- rg."name" as "order_no", coalesce(cp2.company_name, cp2.name, cp2.company_name, cp.name, rg.attention_company, rg.attention_to) as "deliver_to",
44
+ rg."name" as "order_no", concat_ws(', ',rg.delivery_address_1,rg.delivery_address_2,rg.delivery_address_3,rg.delivery_address_4,rg.delivery_address_5,rg.postal_code,rg.city,rg.state) as "full_delivery_address",
45
+ rg."attention_to" as "attention_to",
45
46
  i.pallet_id, i.carton_id, rg.ref_no, rg.ref_no_2, rg.ref_no_3,
46
47
  p.id as "product_id", p.sku as "product_sku", p.brand_sku as "product_brand_sku",
47
48
  p.name as "product_name", p.description as "product_description", p."type" as "product_type",
@@ -82,7 +83,8 @@ exports.outboundSerialNumberReport = {
82
83
  description: bizplace.description,
83
84
  name: bizplace.name
84
85
  },
85
- deliverTo: itm.deliver_to,
86
+ fullDeliveryAddress: itm.full_delivery_address,
87
+ attentionTo: itm.attention_to,
86
88
  palletId: itm.pallet_id,
87
89
  cartonId: itm.carton_id,
88
90
  orderNo: itm.order_no,
package/dist-server/graphql/resolvers/reports/outbound-serial-number-report.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"outbound-serial-number-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-serial-number-report.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"outbound-serial-number-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/outbound-serial-number-report.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/types/index.js CHANGED
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
package/dist-server/graphql/types/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAC/C,4DAA6C;AAC7C,8DAA+C;AAC/C,uDAAwC;AACxC,+CAAgC;AAChC,oDAAqC;AACrC,mDAAoC;AACpC,4EAA6D;AAC7D,sEAAuD;AAE1C,QAAA,OAAO,GAAG;IACrB,YAAY,CAAC,KAAK;IAClB,WAAW,CAAC,KAAK;IACjB,YAAY,CAAC,KAAK;IAClB,SAAS,CAAC,KAAK;IACf,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,mBAAmB,CAAC,KAAK;IACzB,gBAAgB,CAAC,KAAK;CACvB,CAAA;AAEY,QAAA,SAAS,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;AAE5B,QAAA,KAAK,GAAG;IACnB,GAAG,YAAY,CAAC,KAAK;IACrB,GAAG,WAAW,CAAC,KAAK;IACpB,GAAG,SAAS,CAAC,KAAK;IAClB,GAAG,OAAO,CAAC,KAAK;IAChB,GAAG,OAAO,CAAC,KAAK;IAChB,GAAG,mBAAmB,CAAC,KAAK;IAC5B,GAAG,gBAAgB,CAAC,KAAK;CAC1B,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAA+C;AAC/C,4DAA6C;AAC7C,8DAA+C;AAC/C,uDAAwC;AACxC,+CAAgC;AAChC,oDAAqC;AACrC,mDAAoC;AACpC,4EAA6D;AAC7D,sEAAuD;AAE1C,QAAA,OAAO,GAAG;IACrB,YAAY,CAAC,KAAK;IAClB,WAAW,CAAC,KAAK;IACjB,YAAY,CAAC,KAAK;IAClB,SAAS,CAAC,KAAK;IACf,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,KAAK;IACb,mBAAmB,CAAC,KAAK;IACzB,gBAAgB,CAAC,KAAK;CACvB,CAAA;AAEY,QAAA,SAAS,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;AAE5B,QAAA,KAAK,GAAG;IACnB,GAAG,YAAY,CAAC,KAAK;IACrB,GAAG,WAAW,CAAC,KAAK;IACpB,GAAG,SAAS,CAAC,KAAK;IAClB,GAAG,OAAO,CAAC,KAAK;IAChB,GAAG,OAAO,CAAC,KAAK;IAChB,GAAG,mBAAmB,CAAC,KAAK;IAC5B,GAAG,gBAAgB,CAAC,KAAK;CAC1B,CAAA"}
package/dist-server/graphql/types/reports/outbound-serial-number-report.js CHANGED
@@ -9,7 +9,8 @@ exports.OutboundSerialNumberReport = (0, graphql_tag_1.default) `
9
9
  type OutboundSerialNumberReport {
10
10
  no: Int
11
11
  bizplace: Bizplace
12
- deliverTo: String
12
+ fullDeliveryAddress: String
13
+ attentionTo:String
13
14
  palletId: String
14
15
  cartonId: String
15
16
  orderNo: String
package/dist-server/graphql/types/reports/outbound-serial-number-report.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"outbound-serial-number-report.js","sourceRoot":"","sources":["../../../../server/graphql/types/reports/outbound-serial-number-report.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,0BAA0B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;CAe5C,CAAA"}
1
+ {"version":3,"file":"outbound-serial-number-report.js","sourceRoot":"","sources":["../../../../server/graphql/types/reports/outbound-serial-number-report.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,0BAA0B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;CAgB5C,CAAA"}
package/dist-server/index.js CHANGED
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
package/dist-server/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAAyB;AACzB,+CAA4B;AAE5B,oBAAiB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,+CAA4B;AAE5B,oBAAiB"}
package/dist-server/utils/index.js CHANGED
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
package/dist-server/utils/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAmC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAmC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/operato-wms",
3
- "version": "4.1.35",
3
+ "version": "5.0.0-alpha.10",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -41,72 +41,72 @@
41
41
  "docker:run": "docker run --platform linux/amd64 -p 4000:3000 hatiolab/operato-wms:latest"
42
42
  },
43
43
  "dependencies": {
44
- "@operato/ghost-print": "^0.3.28",
45
- "@operato/scene-chartjs": "^0.1.5",
46
- "@operato/scene-clock": "^0.1.5",
47
- "@operato/scene-clone": "^0.1.5",
48
- "@operato/scene-compass": "^0.1.5",
49
- "@operato/scene-gauge": "^0.1.5",
50
- "@operato/scene-half-roundrect": "^0.1.5",
51
- "@operato/scene-indoor-map": "^0.1.5",
52
- "@operato/scene-legend": "^0.1.5",
53
- "@operato/scene-news-ticker": "^0.1.5",
54
- "@operato/scene-progressbar": "^0.1.5",
55
- "@operato/scene-random": "^0.1.5",
56
- "@operato/scene-switch": "^0.1.5",
57
- "@operato/scene-tab": "^0.1.5",
58
- "@operato/scene-table": "^0.1.5",
59
- "@operato/scene-wheel-sorter": "^0.1.5",
60
- "@things-factory/apptool-ui": "^4.1.28",
61
- "@things-factory/attachment-ui": "^4.1.28",
62
- "@things-factory/auth-ui": "^4.1.28",
63
- "@things-factory/barcode-ui": "^4.1.28",
64
- "@things-factory/biz-ui": "^4.1.28",
65
- "@things-factory/board-service": "^4.1.28",
66
- "@things-factory/board-ui": "^4.1.28",
67
- "@things-factory/code-ui": "^4.1.28",
68
- "@things-factory/context-ui": "^4.1.28",
69
- "@things-factory/export-ui": "^4.1.28",
70
- "@things-factory/export-ui-csv": "^4.1.28",
71
- "@things-factory/export-ui-excel": "^4.1.28",
72
- "@things-factory/fav-base": "^4.1.28",
73
- "@things-factory/form-ui": "^4.1.28",
74
- "@things-factory/grist-ui": "^4.1.28",
75
- "@things-factory/help": "^4.1.28",
76
- "@things-factory/i18n-base": "^4.1.28",
77
- "@things-factory/id-rule-base": "^4.1.28",
78
- "@things-factory/import-ui": "^4.1.28",
79
- "@things-factory/import-ui-excel": "^4.1.28",
80
- "@things-factory/menu-ui": "^4.1.28",
81
- "@things-factory/more-ui": "^4.1.28",
82
- "@things-factory/notification": "^4.1.28",
83
- "@things-factory/pdf": "^4.1.28",
84
- "@things-factory/print-proxy-service": "^4.1.28",
85
- "@things-factory/print-service": "^4.1.28",
86
- "@things-factory/print-ui": "^4.1.28",
87
- "@things-factory/product-base": "^4.1.34",
88
- "@things-factory/resource-ui": "^4.1.28",
89
- "@things-factory/sales-ui": "^4.1.35",
90
- "@things-factory/scene-data-transform": "^4.1.28",
91
- "@things-factory/scene-excel": "^4.1.28",
92
- "@things-factory/scene-firebase": "^4.1.28",
93
- "@things-factory/scene-form": "^4.1.28",
94
- "@things-factory/scene-google-map": "^4.1.28",
95
- "@things-factory/scene-graphql": "^4.1.28",
96
- "@things-factory/scene-label": "^4.1.28",
97
- "@things-factory/scene-marker": "^4.1.28",
98
- "@things-factory/scene-mqtt": "^4.1.28",
99
- "@things-factory/scene-restful": "^4.1.28",
100
- "@things-factory/scene-visualizer": "^4.1.28",
101
- "@things-factory/setting-ui": "^4.1.28",
102
- "@things-factory/system-ui": "^4.1.28",
103
- "@things-factory/transport-base": "^4.1.28",
104
- "@things-factory/tutorial-ui": "^4.1.28",
105
- "@things-factory/warehouse-base": "^4.1.35",
106
- "@things-factory/worksheet-base": "^4.1.35"
44
+ "@operato/ghost-print": "1.0.0-alpha.23",
45
+ "@operato/scene-chartjs": "^1.0.0-alpha.4",
46
+ "@operato/scene-clock": "^1.0.0-alpha.4",
47
+ "@operato/scene-clone": "^1.0.0-alpha.4",
48
+ "@operato/scene-compass": "^1.0.0-alpha.4",
49
+ "@operato/scene-gauge": "^1.0.0-alpha.4",
50
+ "@operato/scene-half-roundrect": "^1.0.0-alpha.4",
51
+ "@operato/scene-indoor-map": "^1.0.0-alpha.4",
52
+ "@operato/scene-legend": "^1.0.0-alpha.4",
53
+ "@operato/scene-news-ticker": "^1.0.0-alpha.4",
54
+ "@operato/scene-progressbar": "^1.0.0-alpha.4",
55
+ "@operato/scene-random": "^1.0.0-alpha.4",
56
+ "@operato/scene-switch": "^1.0.0-alpha.4",
57
+ "@operato/scene-tab": "^1.0.0-alpha.4",
58
+ "@operato/scene-table": "^1.0.0-alpha.4",
59
+ "@operato/scene-wheel-sorter": "^1.0.0-alpha.4",
60
+ "@things-factory/apptool-ui": "^5.0.0-alpha.10",
61
+ "@things-factory/attachment-ui": "^5.0.0-alpha.10",
62
+ "@things-factory/auth-ui": "^5.0.0-alpha.10",
63
+ "@things-factory/barcode-ui": "^5.0.0-alpha.10",
64
+ "@things-factory/biz-ui": "^5.0.0-alpha.10",
65
+ "@things-factory/board-service": "^5.0.0-alpha.10",
66
+ "@things-factory/board-ui": "^5.0.0-alpha.10",
67
+ "@things-factory/code-ui": "^5.0.0-alpha.10",
68
+ "@things-factory/context-ui": "^5.0.0-alpha.10",
69
+ "@things-factory/export-ui": "^5.0.0-alpha.10",
70
+ "@things-factory/export-ui-csv": "^5.0.0-alpha.10",
71
+ "@things-factory/export-ui-excel": "^5.0.0-alpha.10",
72
+ "@things-factory/fav-base": "^5.0.0-alpha.10",
73
+ "@things-factory/form-ui": "^5.0.0-alpha.10",
74
+ "@things-factory/grist-ui": "^5.0.0-alpha.10",
75
+ "@things-factory/help": "^5.0.0-alpha.10",
76
+ "@things-factory/i18n-base": "^5.0.0-alpha.10",
77
+ "@things-factory/id-rule-base": "^5.0.0-alpha.10",
78
+ "@things-factory/import-ui": "^5.0.0-alpha.10",
79
+ "@things-factory/import-ui-excel": "^5.0.0-alpha.10",
80
+ "@things-factory/menu-ui": "^5.0.0-alpha.10",
81
+ "@things-factory/more-ui": "^5.0.0-alpha.10",
82
+ "@things-factory/notification": "^5.0.0-alpha.10",
83
+ "@things-factory/pdf": "^5.0.0-alpha.10",
84
+ "@things-factory/print-proxy-service": "^5.0.0-alpha.10",
85
+ "@things-factory/print-service": "^5.0.0-alpha.10",
86
+ "@things-factory/print-ui": "^5.0.0-alpha.10",
87
+ "@things-factory/product-base": "^5.0.0-alpha.10",
88
+ "@things-factory/resource-ui": "^5.0.0-alpha.10",
89
+ "@things-factory/sales-ui": "^5.0.0-alpha.10",
90
+ "@things-factory/scene-data-transform": "^5.0.0-alpha.10",
91
+ "@things-factory/scene-excel": "^5.0.0-alpha.10",
92
+ "@things-factory/scene-firebase": "^5.0.0-alpha.10",
93
+ "@things-factory/scene-form": "^5.0.0-alpha.10",
94
+ "@things-factory/scene-google-map": "^5.0.0-alpha.10",
95
+ "@things-factory/scene-graphql": "^5.0.0-alpha.10",
96
+ "@things-factory/scene-label": "^5.0.0-alpha.10",
97
+ "@things-factory/scene-marker": "^5.0.0-alpha.10",
98
+ "@things-factory/scene-mqtt": "^5.0.0-alpha.10",
99
+ "@things-factory/scene-restful": "^5.0.0-alpha.10",
100
+ "@things-factory/scene-visualizer": "^5.0.0-alpha.10",
101
+ "@things-factory/setting-ui": "^5.0.0-alpha.10",
102
+ "@things-factory/system-ui": "^5.0.0-alpha.10",
103
+ "@things-factory/transport-base": "^5.0.0-alpha.10",
104
+ "@things-factory/tutorial-ui": "^5.0.0-alpha.10",
105
+ "@things-factory/warehouse-base": "^5.0.0-alpha.10",
106
+ "@things-factory/worksheet-base": "^5.0.0-alpha.10"
107
107
  },
108
108
  "devDependencies": {
109
- "@things-factory/builder": "^4.1.28"
109
+ "@things-factory/builder": "^5.0.0-alpha.10"
110
110
  },
111
- "gitHead": "a7e4a62c6ab05d18879ab945ac0f10be440a5f34"
111
+ "gitHead": "24e85b0265d10cb664b8279bb927ea2a86227775"
112
112
  }
package/server/graphql/resolvers/reports/outbound-serial-number-report.ts CHANGED
@@ -50,7 +50,8 @@ export const outboundSerialNumberReport = {
50
50
  select * from (
51
51
  select
52
52
  row_number() over(partition by rg."name" order by coalesce(w.started_at, ii.created_at), p.sku ) as "no",
53
- rg."name" as "order_no", coalesce(cp2.company_name, cp2.name, cp2.company_name, cp.name, rg.attention_company, rg.attention_to) as "deliver_to",
53
+ rg."name" as "order_no", concat_ws(', ',rg.delivery_address_1,rg.delivery_address_2,rg.delivery_address_3,rg.delivery_address_4,rg.delivery_address_5,rg.postal_code,rg.city,rg.state) as "full_delivery_address",
54
+ rg."attention_to" as "attention_to",
54
55
  i.pallet_id, i.carton_id, rg.ref_no, rg.ref_no_2, rg.ref_no_3,
55
56
  p.id as "product_id", p.sku as "product_sku", p.brand_sku as "product_brand_sku",
56
57
  p.name as "product_name", p.description as "product_description", p."type" as "product_type",
@@ -99,7 +100,8 @@ export const outboundSerialNumberReport = {
99
100
  description: bizplace.description,
100
101
  name: bizplace.name
101
102
  },
102
- deliverTo: itm.deliver_to,
103
+ fullDeliveryAddress: itm.full_delivery_address,
104
+ attentionTo:itm.attention_to,
103
105
  palletId: itm.pallet_id,
104
106
  cartonId: itm.carton_id,
105
107
  orderNo: itm.order_no,
package/server/graphql/types/reports/outbound-serial-number-report.ts CHANGED
@@ -4,7 +4,8 @@ export const OutboundSerialNumberReport = gql`
4
4
  type OutboundSerialNumberReport {
5
5
  no: Int
6
6
  bizplace: Bizplace
7
- deliverTo: String
7
+ fullDeliveryAddress: String
8
+ attentionTo:String
8
9
  palletId: String
9
10
  cartonId: String
10
11
  orderNo: String
package/translations/en.json CHANGED
@@ -245,6 +245,7 @@
245
245
  "field.from_date": "from date",
246
246
  "field.from_pallet": "from pallet",
247
247
  "field.from": "from",
248
+ "field.full_delivery_address": "full delivery address",
248
249
  "field.gan_no": "GAN No.",
249
250
  "field.gan_status": "GAN status",
250
251
  "field.gan": "GAN",