@things-factory/operato-wms 3.8.0 → 3.8.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/client/pages/adjustment/transfer-inventory.js +32 -6
- package/client/pages/inbound/putaway-product.js +1 -1
- package/client/pages/inventory/inventory-adjustment-approval.js +0 -18
- package/client/pages/inventory/inventory-adjustment.js +9 -10
- package/client/pages/order/release-order/b2b/b2b-order-requests.js +7 -7
- package/client/pages/order/release-order/b2c/b2c-order-requests.js +5 -5
- package/client/pages/order/release-order/batch-picking-popup.js +18 -1
- package/client/pages/order/release-order/create-release-order.js +2 -2
- package/client/pages/outbound/picking-product.js +21 -22
- package/client/pages/vas/print-product-label.js +3 -1
- package/dist-server/graphql/resolvers/reports/product-label-report.js +1 -0
- package/dist-server/graphql/resolvers/reports/product-label-report.js.map +1 -1
- package/dist-server/graphql/resolvers/shipping-provider/shipping-providers.js +1 -1
- package/package.json +6 -6
- package/server/graphql/resolvers/reports/product-label-report.ts +1 -0
- package/server/graphql/resolvers/shipping-provider/shipping-providers.ts +1 -1
- package/translations/en.json +1 -0
- package/translations/ko.json +1 -0
- package/translations/ms.json +1 -0
- package/translations/zh.json +1 -0
|
@@ -280,7 +280,13 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
|
|
|
280
280
|
<label class="content">${this?._selectedInventory?.packingType || '-'}</label>
|
|
281
281
|
|
|
282
282
|
<label class="content-title">${i18next.t('label.qty')}</label>
|
|
283
|
-
<label class="content">${this?._selectedInventory?.qty ||
|
|
283
|
+
<label class="content">${(this?._selectedInventory?.qty || 0).toString()}</label>
|
|
284
|
+
|
|
285
|
+
<label class="content-title">${i18next.t('label.reserve_qty')}</label>
|
|
286
|
+
<label class="content">${(this?._selectedInventory?.lockedQty || 0).toString()}</label>
|
|
287
|
+
|
|
288
|
+
<label class="content-title">${i18next.t('label.available_qty')}</label>
|
|
289
|
+
<label class="content">${(this?._selectedInventory?.availableQty || 0).toString()}</label>
|
|
284
290
|
|
|
285
291
|
<!-- <input name="fromLocationName" readonly /> -->
|
|
286
292
|
</fieldset>
|
|
@@ -299,11 +305,11 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
|
|
|
299
305
|
this.qtyInput.value = 0
|
|
300
306
|
}
|
|
301
307
|
if (this._selectedInventory) {
|
|
302
|
-
if (this._selectedInventory.
|
|
308
|
+
if (this._selectedInventory.availableQty > parseInt(this.qtyInput.value)) {
|
|
303
309
|
this._requireNewId = true
|
|
304
310
|
} else {
|
|
305
|
-
if (parseInt(this.qtyInput.value) > this._selectedInventory.
|
|
306
|
-
this.qtyInput.value = this._selectedInventory.
|
|
311
|
+
if (parseInt(this.qtyInput.value) > this._selectedInventory.availableQty) {
|
|
312
|
+
this.qtyInput.value = this._selectedInventory.availableQty
|
|
307
313
|
}
|
|
308
314
|
this._requireNewId = false
|
|
309
315
|
}
|
|
@@ -396,6 +402,8 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
|
|
|
396
402
|
'packingType',
|
|
397
403
|
'packingSize',
|
|
398
404
|
'qty',
|
|
405
|
+
'lockedQty',
|
|
406
|
+
'availableQty',
|
|
399
407
|
'expirationDate'
|
|
400
408
|
]
|
|
401
409
|
},
|
|
@@ -480,6 +488,20 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
|
|
|
480
488
|
header: i18next.t('field.qty'),
|
|
481
489
|
width: 60
|
|
482
490
|
},
|
|
491
|
+
{
|
|
492
|
+
type: 'integer',
|
|
493
|
+
name: 'lockedQty',
|
|
494
|
+
label: true,
|
|
495
|
+
header: i18next.t('field.reserve_qty'),
|
|
496
|
+
width: 60
|
|
497
|
+
},
|
|
498
|
+
{
|
|
499
|
+
type: 'integer',
|
|
500
|
+
name: 'availableQty',
|
|
501
|
+
label: true,
|
|
502
|
+
header: i18next.t('field.available_qty'),
|
|
503
|
+
width: 60
|
|
504
|
+
},
|
|
483
505
|
{
|
|
484
506
|
type: 'date',
|
|
485
507
|
name: 'expirationDate',
|
|
@@ -568,7 +590,7 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
|
|
|
568
590
|
return {
|
|
569
591
|
...record,
|
|
570
592
|
sku: record.product.sku,
|
|
571
|
-
|
|
593
|
+
availableQty: record.qty - (record.lockedQty > 0 ? record.lockedQty : 0)
|
|
572
594
|
}
|
|
573
595
|
})
|
|
574
596
|
}
|
|
@@ -654,7 +676,11 @@ class TransferInventory extends connect(store)(localize(i18next)(PageView)) {
|
|
|
654
676
|
throw new Error(i18next.t('text.please_select_an_inventory'))
|
|
655
677
|
}
|
|
656
678
|
|
|
657
|
-
if (!this.
|
|
679
|
+
if (!(this._selectedInventory.availableQty > 0)) {
|
|
680
|
+
throw new Error(i18next.t('text.not_enough_available_qty'))
|
|
681
|
+
}
|
|
682
|
+
|
|
683
|
+
if (!parseInt(this.qtyInput?.value || 0) > 0) {
|
|
658
684
|
throw new Error(i18next.t('text.please_enter_transfer_qty'))
|
|
659
685
|
}
|
|
660
686
|
|
|
@@ -1152,7 +1152,7 @@ class PutawayProduct extends connect(store)(localize(i18next)(PageView)) {
|
|
|
1152
1152
|
if (filters) {
|
|
1153
1153
|
const response = await client.query({
|
|
1154
1154
|
query: gql`
|
|
1155
|
-
query locations($filters: [Filter]) {
|
|
1155
|
+
query locations($filters: [Filter!]!) {
|
|
1156
1156
|
locations(filters: $filters) {
|
|
1157
1157
|
items {
|
|
1158
1158
|
id
|
|
@@ -120,7 +120,6 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
|
|
|
120
120
|
|
|
121
121
|
async pageInitialized() {
|
|
122
122
|
this._lockedPallet = []
|
|
123
|
-
this.location = await this.fetchLocation()
|
|
124
123
|
const partners = await this._fetchPartners()
|
|
125
124
|
const _approvalStatus = await getCodeByName('APPROVAL_STATUS')
|
|
126
125
|
|
|
@@ -592,23 +591,6 @@ class InventoryAdjustmentApproval extends connect(store)(localize(i18next)(PageV
|
|
|
592
591
|
return response.data.productsByBizplace.items
|
|
593
592
|
}
|
|
594
593
|
|
|
595
|
-
async fetchLocation() {
|
|
596
|
-
const response = await client.query({
|
|
597
|
-
query: gql`
|
|
598
|
-
query locations($filters: [Filter!]) {
|
|
599
|
-
locations(filters: $filters) {
|
|
600
|
-
items {
|
|
601
|
-
id
|
|
602
|
-
name
|
|
603
|
-
}
|
|
604
|
-
}
|
|
605
|
-
}
|
|
606
|
-
`,
|
|
607
|
-
variables: { filters: [] }
|
|
608
|
-
})
|
|
609
|
-
return response.data.locations.items
|
|
610
|
-
}
|
|
611
|
-
|
|
612
594
|
_convertUnixTimestampToDate(unixTimestampValue) {
|
|
613
595
|
let convertedUnix = new Date(unixTimestampValue)
|
|
614
596
|
return `${convertedUnix.getDate()}/${convertedUnix.getMonth() + 1}/${convertedUnix.getFullYear()}`
|
|
@@ -571,7 +571,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
571
571
|
const filters = await this.searchForm.getQueryFilters()
|
|
572
572
|
const response = await client.query({
|
|
573
573
|
query: gql`
|
|
574
|
-
query inventories($filters: [Filter!]
|
|
574
|
+
query inventories($filters: [Filter!]!, $pagination: Pagination, $sortings: [Sorting!]!) {
|
|
575
575
|
inventories(filters: $filters, pagination: $pagination, sortings: $sortings) {
|
|
576
576
|
items {
|
|
577
577
|
id
|
|
@@ -768,7 +768,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
768
768
|
|
|
769
769
|
const response = await client.mutate({
|
|
770
770
|
mutation: gql`
|
|
771
|
-
mutation submitInventoryChanges($patches: [InventoryPatch]!) {
|
|
771
|
+
mutation submitInventoryChanges($patches: [InventoryPatch!]!) {
|
|
772
772
|
submitInventoryChanges(patches: $patches)
|
|
773
773
|
}
|
|
774
774
|
`,
|
|
@@ -828,13 +828,12 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
828
828
|
data = await this.fetchInventoriesForExport()
|
|
829
829
|
}
|
|
830
830
|
|
|
831
|
-
let [product, bizplace] = await Promise.all([
|
|
831
|
+
let [product, bizplace, location] = await Promise.all([
|
|
832
832
|
this.fetchProduct(bizplaceFilters),
|
|
833
|
-
this.fetchBizplaces([{ ...bizplaceFilters[0], name: 'bizplace' }])
|
|
833
|
+
this.fetchBizplaces([{ ...bizplaceFilters[0], name: 'bizplace' }]),
|
|
834
|
+
this.fetchLocation()
|
|
834
835
|
])
|
|
835
836
|
|
|
836
|
-
let location = this.fetchLocation()
|
|
837
|
-
|
|
838
837
|
headerSetting = headerSetting.map(column => {
|
|
839
838
|
switch (column.key) {
|
|
840
839
|
case 'bizplace.name':
|
|
@@ -845,7 +844,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
845
844
|
return { ...itm, name: `(${itm.sku}) ${itm.name} - ${itm.description}` }
|
|
846
845
|
})
|
|
847
846
|
break
|
|
848
|
-
case 'location':
|
|
847
|
+
case 'location.name':
|
|
849
848
|
column.arrData = location
|
|
850
849
|
break
|
|
851
850
|
default:
|
|
@@ -891,7 +890,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
891
890
|
async fetchBizplaces(bizplace = []) {
|
|
892
891
|
const response = await client.query({
|
|
893
892
|
query: gql`
|
|
894
|
-
query bizplaces($filters: [Filter!]) {
|
|
893
|
+
query bizplaces($filters: [Filter!]!) {
|
|
895
894
|
bizplaces(filters: $filters) {
|
|
896
895
|
items {
|
|
897
896
|
id
|
|
@@ -911,7 +910,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
911
910
|
bizplace[0].name = 'bizplace'
|
|
912
911
|
const response = await client.query({
|
|
913
912
|
query: gql`
|
|
914
|
-
query productsByBizplace($filters: [Filter!]) {
|
|
913
|
+
query productsByBizplace($filters: [Filter!]!) {
|
|
915
914
|
productsByBizplace(filters: $filters) {
|
|
916
915
|
items {
|
|
917
916
|
id
|
|
@@ -933,7 +932,7 @@ class InventoryAdjustment extends connect(store)(localize(i18next)(PageView)) {
|
|
|
933
932
|
async fetchLocation() {
|
|
934
933
|
const response = await client.query({
|
|
935
934
|
query: gql`
|
|
936
|
-
query locations($filters: [Filter!]) {
|
|
935
|
+
query locations($filters: [Filter!]!) {
|
|
937
936
|
locations(filters: $filters) {
|
|
938
937
|
items {
|
|
939
938
|
id
|
|
@@ -60,13 +60,13 @@ class B2bOrderRequests extends localize(i18next)(PageView) {
|
|
|
60
60
|
get context() {
|
|
61
61
|
return {
|
|
62
62
|
title: i18next.t('title.release_order_requests'),
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
63
|
+
actions: [
|
|
64
|
+
{
|
|
65
|
+
title: i18next.t('button.batch_picking'),
|
|
66
|
+
action: this._openBatchPickingPopup.bind(this),
|
|
67
|
+
...CommonButtonStyles.activate
|
|
68
|
+
}
|
|
69
|
+
],
|
|
70
70
|
exportable: {
|
|
71
71
|
name: i18next.t('title.release_order_requests'),
|
|
72
72
|
data: this._exportableData.bind(this)
|
|
@@ -65,12 +65,12 @@ class B2cOrderRequests extends localize(i18next)(PageView) {
|
|
|
65
65
|
title: i18next.t('button.generate_packing_list'),
|
|
66
66
|
action: this._generatePackingList.bind(this),
|
|
67
67
|
...CommonButtonStyles.label
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
title: i18next.t('button.batch_picking'),
|
|
71
|
+
action: this._openBatchPickingPopup.bind(this),
|
|
72
|
+
...CommonButtonStyles.activate
|
|
68
73
|
}
|
|
69
|
-
// {
|
|
70
|
-
// title: i18next.t('button.batch_picking'),
|
|
71
|
-
// action: this._openBatchPickingPopup.bind(this),
|
|
72
|
-
// ...CommonButtonStyles.activate
|
|
73
|
-
// }
|
|
74
74
|
],
|
|
75
75
|
exportable: {
|
|
76
76
|
name: i18next.t('title.release_order_requests'),
|
|
@@ -7,7 +7,7 @@ import { isMobileDevice } from '@things-factory/utils'
|
|
|
7
7
|
import { css, html, LitElement } from 'lit-element'
|
|
8
8
|
import gql from 'graphql-tag'
|
|
9
9
|
import { ScrollbarStyles } from '@things-factory/styles'
|
|
10
|
-
import { ORDER_STATUS } from '../../constants'
|
|
10
|
+
import { ORDER_STATUS, RO_TYPES } from '../../constants'
|
|
11
11
|
import '@things-factory/biz-ui'
|
|
12
12
|
|
|
13
13
|
class BatchPickingPopup extends localize(i18next)(LitElement) {
|
|
@@ -146,6 +146,16 @@ class BatchPickingPopup extends localize(i18next)(LitElement) {
|
|
|
146
146
|
name: 'releaseDate',
|
|
147
147
|
type: 'date',
|
|
148
148
|
props: { searchOper: 'lte' }
|
|
149
|
+
},
|
|
150
|
+
{
|
|
151
|
+
label: i18next.t('field.type'),
|
|
152
|
+
name: 'type',
|
|
153
|
+
type: 'select',
|
|
154
|
+
options: Object.keys(RO_TYPES).map(map => {
|
|
155
|
+
debugger
|
|
156
|
+
return { name: RO_TYPES[map].name, value: RO_TYPES[map].value }
|
|
157
|
+
}),
|
|
158
|
+
props: { searchOper: 'eq' }
|
|
149
159
|
}
|
|
150
160
|
]
|
|
151
161
|
|
|
@@ -165,6 +175,12 @@ class BatchPickingPopup extends localize(i18next)(LitElement) {
|
|
|
165
175
|
header: i18next.t('field.release_good_no'),
|
|
166
176
|
width: 150
|
|
167
177
|
},
|
|
178
|
+
{
|
|
179
|
+
type: 'string',
|
|
180
|
+
name: 'type',
|
|
181
|
+
header: i18next.t('field.type'),
|
|
182
|
+
width: 100
|
|
183
|
+
},
|
|
168
184
|
{
|
|
169
185
|
type: 'string',
|
|
170
186
|
name: 'refNo',
|
|
@@ -288,6 +304,7 @@ class BatchPickingPopup extends localize(i18next)(LitElement) {
|
|
|
288
304
|
name
|
|
289
305
|
refNo
|
|
290
306
|
releaseDate
|
|
307
|
+
type
|
|
291
308
|
bizplace {
|
|
292
309
|
id
|
|
293
310
|
name
|
|
@@ -1396,7 +1396,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
|
|
|
1396
1396
|
|
|
1397
1397
|
async fetchInventoriesByBundle(productBundleId, bundleReleaseQty) {
|
|
1398
1398
|
const page = 1
|
|
1399
|
-
const limit =
|
|
1399
|
+
const limit = 99999
|
|
1400
1400
|
const pagination = { page, limit }
|
|
1401
1401
|
const filters = [
|
|
1402
1402
|
{
|
|
@@ -1419,7 +1419,7 @@ class CreateReleaseOrder extends localize(i18next)(PageView) {
|
|
|
1419
1419
|
|
|
1420
1420
|
const response = await client.query({
|
|
1421
1421
|
query: gql`
|
|
1422
|
-
query inventoriesByBundle($filters: [Filter], $pagination: Pagination, $sortings: [Sorting]) {
|
|
1422
|
+
query inventoriesByBundle($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
|
|
1423
1423
|
inventoriesByBundle(filters: $filters, pagination: $pagination, sortings: $sortings) {
|
|
1424
1424
|
bundleGroup {
|
|
1425
1425
|
batchId
|
|
@@ -352,10 +352,18 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
|
|
|
352
352
|
if (e.keyCode === 13) {
|
|
353
353
|
e.preventDefault()
|
|
354
354
|
this._currentBinLocation = null
|
|
355
|
-
if (this.
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
355
|
+
if (this.refPickingType === PICKING_TYPES.PICKING.value) {
|
|
356
|
+
if (this.releaseGoodNoInput.value) {
|
|
357
|
+
this.releaseGoodNo = this.releaseGoodNoInput.value
|
|
358
|
+
await this.fetchAll(this.releaseGoodNo)
|
|
359
|
+
this.completeHandler()
|
|
360
|
+
}
|
|
361
|
+
} else {
|
|
362
|
+
if (this.taskNoInput.value) {
|
|
363
|
+
this.taskNo = this.taskNoInput.value
|
|
364
|
+
await this.fetchAll(this.taskNo)
|
|
365
|
+
this.completeHandler()
|
|
366
|
+
}
|
|
359
367
|
}
|
|
360
368
|
}
|
|
361
369
|
}}"
|
|
@@ -571,7 +579,10 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
|
|
|
571
579
|
if (this.serialInput) this.serialInput.value = ''
|
|
572
580
|
|
|
573
581
|
this._selectedOrderInventory = record
|
|
574
|
-
|
|
582
|
+
|
|
583
|
+
await this.fetchInventories(
|
|
584
|
+
this.refPickingType === PICKING_TYPES.PICKING.value ? this.releaseGoodNo : this.taskNo
|
|
585
|
+
)
|
|
575
586
|
let updatedRecords = this._selectedOrderInventory
|
|
576
587
|
if (updatedRecords.releaseQty === updatedRecords.pickedQty) {
|
|
577
588
|
updatedRecords.status = 'DONE'
|
|
@@ -846,12 +857,14 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
|
|
|
846
857
|
if (record.pickedQty == record.releaseQty) {
|
|
847
858
|
if (this._isCartonLabel) {
|
|
848
859
|
this.cartonInput.value = ''
|
|
849
|
-
this.
|
|
860
|
+
this.productBarcodeInput.value = ''
|
|
861
|
+
// this._focusOnCartonNoInput()
|
|
850
862
|
}
|
|
851
863
|
this.inputForm.reset()
|
|
852
864
|
} else {
|
|
853
|
-
this._focusOnProductBarcodeInput()
|
|
865
|
+
// this._focusOnProductBarcodeInput()
|
|
854
866
|
this.fillUpForm(this.inputForm, record)
|
|
867
|
+
this.focusOnInput()
|
|
855
868
|
}
|
|
856
869
|
}
|
|
857
870
|
}
|
|
@@ -1048,21 +1061,7 @@ class PickingProduct extends connect(store)(localize(i18next)(PageView)) {
|
|
|
1048
1061
|
openSerialNumberPopup() {
|
|
1049
1062
|
openPopup(
|
|
1050
1063
|
html`
|
|
1051
|
-
<serial-number-popup
|
|
1052
|
-
.orderInventory="${this?._selectedOrderInventory?.relatedOrderInv}"
|
|
1053
|
-
@completed="${() => {
|
|
1054
|
-
// if (this.refPickingType === PICKING_TYPES.PICKING.value) {
|
|
1055
|
-
// this.fetchInventories(this.releaseGoodNoInput.value)
|
|
1056
|
-
// this.fetchPalletsHandler(this.releaseGoodNoInput.value)
|
|
1057
|
-
// } else {
|
|
1058
|
-
// this.fetchInventories(this.taskNoInput.value)
|
|
1059
|
-
// this.fetchPalletsHandler(this.taskNoInput.value)
|
|
1060
|
-
// }
|
|
1061
|
-
// // this._selectedTaskStatus = null
|
|
1062
|
-
// this._selectedOrderInventory = null
|
|
1063
|
-
// this._isReplacement = false
|
|
1064
|
-
}}"
|
|
1065
|
-
></serial-number-popup>
|
|
1064
|
+
<serial-number-popup .orderInventory="${this?._selectedOrderInventory?.relatedOrderInv}"></serial-number-popup>
|
|
1066
1065
|
`,
|
|
1067
1066
|
{
|
|
1068
1067
|
backdrop: true,
|
|
@@ -475,6 +475,7 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
|
|
|
475
475
|
id
|
|
476
476
|
batchId
|
|
477
477
|
packingType
|
|
478
|
+
releaseQty
|
|
478
479
|
product {
|
|
479
480
|
name
|
|
480
481
|
sku
|
|
@@ -549,7 +550,8 @@ class PrintProductLabel extends connect(store)(localize(i18next)(PageView)) {
|
|
|
549
550
|
auxValue1: product.auxValue1 || '',
|
|
550
551
|
auxUnit2: product.auxUnit2 || '',
|
|
551
552
|
auxValue2: product.auxValue2 || '',
|
|
552
|
-
bizplaceId: releaseGood.bizplace.id
|
|
553
|
+
bizplaceId: releaseGood.bizplace.id,
|
|
554
|
+
printQty: oi.releaseQty || 0
|
|
553
555
|
}
|
|
554
556
|
|
|
555
557
|
if (product.productDetails && product.productDetails.length) {
|
|
@@ -28,6 +28,7 @@ exports.productLabelReport = {
|
|
|
28
28
|
WHERE "bizplace_id" = '${bizplaceId}'
|
|
29
29
|
${type ? `AND "type" ilike '%${type}%'` : ''}
|
|
30
30
|
AND "date"::date BETWEEN '${fromDate}' AND '${toDate}'
|
|
31
|
+
ORDER BY type ASC, date ASC
|
|
31
32
|
`);
|
|
32
33
|
// @farishelmi any usage for this function? If no please remove.
|
|
33
34
|
/*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-label-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/product-label-report.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,+DAAsE;AAGzD,QAAA,kBAAkB,GAAG;IAChC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QAC9D,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;YACpD,uDAAuD;YACvD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,CAAA;YAC9E,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,0CAAE,KAAK,CAAA;YACrE,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,CAAA;YAC5E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,KAAK,CAAA;YAExE,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;YAEzE,MAAM,KAAK,GAAG,MAAM,IAAA,uBAAa,EAAC,uBAAQ,CAAC,CAAC,KAAK,CAAC;;;;;;;uDAOD,4BAAa,CAAC,qBAAqB;oCACtD,MAAM,CAAC,EAAE;;iCAEZ,UAAU;UACjC,IAAI,CAAC,CAAC,CAAC,sBAAsB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE;oCAChB,QAAQ,UAAU,MAAM
|
|
1
|
+
{"version":3,"file":"product-label-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/product-label-report.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,+DAAsE;AAGzD,QAAA,kBAAkB,GAAG;IAChC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;;QAC9D,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;YACpD,uDAAuD;YACvD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,CAAA;YAC9E,MAAM,IAAI,GAAG,MAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,0CAAE,KAAK,CAAA;YACrE,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,CAAA;YAC5E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,KAAK,CAAA;YAExE,IAAI,CAAC,UAAU,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;YAEzE,MAAM,KAAK,GAAG,MAAM,IAAA,uBAAa,EAAC,uBAAQ,CAAC,CAAC,KAAK,CAAC;;;;;;;uDAOD,4BAAa,CAAC,qBAAqB;oCACtD,MAAM,CAAC,EAAE;;iCAEZ,UAAU;UACjC,IAAI,CAAC,CAAC,CAAC,sBAAsB,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE;oCAChB,QAAQ,UAAU,MAAM;;OAErD,CAAC,CAAA;YAEF,gEAAgE;YAChE;;;;;;;;;;;;cAYE;YAEF,OAAO;gBACL,KAAK;gBACL,KAAK,EAAE,CAAC;aACT,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
|
|
@@ -8,7 +8,7 @@ exports.shippingProviders = {
|
|
|
8
8
|
try {
|
|
9
9
|
const { domain } = context.state;
|
|
10
10
|
const items = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).query(`
|
|
11
|
-
SELECT DISTINCT transporter FROM release_goods WHERE domain_id = '${domain.id}'
|
|
11
|
+
SELECT DISTINCT transporter FROM release_goods WHERE domain_id = '${domain.id}' AND transporter IS NOT null AND transporter != '' AND type = 'b2c'
|
|
12
12
|
`);
|
|
13
13
|
return { items: items };
|
|
14
14
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-wms",
|
|
3
|
-
"version": "3.8.
|
|
3
|
+
"version": "3.8.4",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -69,9 +69,9 @@
|
|
|
69
69
|
"@things-factory/print-proxy-service": "^3.8.0",
|
|
70
70
|
"@things-factory/print-service": "^3.8.0",
|
|
71
71
|
"@things-factory/print-ui": "^3.8.0",
|
|
72
|
-
"@things-factory/product-base": "^3.8.
|
|
72
|
+
"@things-factory/product-base": "^3.8.3",
|
|
73
73
|
"@things-factory/resource-ui": "^3.8.0",
|
|
74
|
-
"@things-factory/sales-ui": "^3.8.
|
|
74
|
+
"@things-factory/sales-ui": "^3.8.3",
|
|
75
75
|
"@things-factory/scene-chartjs": "^3.7.5",
|
|
76
76
|
"@things-factory/scene-clock": "^3.7.5",
|
|
77
77
|
"@things-factory/scene-clone": "^3.7.5",
|
|
@@ -102,11 +102,11 @@
|
|
|
102
102
|
"@things-factory/system-ui": "^3.8.0",
|
|
103
103
|
"@things-factory/transport-base": "^3.8.0",
|
|
104
104
|
"@things-factory/tutorial-ui": "^3.8.0",
|
|
105
|
-
"@things-factory/warehouse-base": "^3.8.
|
|
106
|
-
"@things-factory/worksheet-base": "^3.8.
|
|
105
|
+
"@things-factory/warehouse-base": "^3.8.3",
|
|
106
|
+
"@things-factory/worksheet-base": "^3.8.4"
|
|
107
107
|
},
|
|
108
108
|
"devDependencies": {
|
|
109
109
|
"@things-factory/builder": "^3.7.5"
|
|
110
110
|
},
|
|
111
|
-
"gitHead": "
|
|
111
|
+
"gitHead": "9dedf75962d3a804204ae3341588ee91533c63dd"
|
|
112
112
|
}
|
|
@@ -28,6 +28,7 @@ export const productLabelReport = {
|
|
|
28
28
|
WHERE "bizplace_id" = '${bizplaceId}'
|
|
29
29
|
${type ? `AND "type" ilike '%${type}%'` : ''}
|
|
30
30
|
AND "date"::date BETWEEN '${fromDate}' AND '${toDate}'
|
|
31
|
+
ORDER BY type ASC, date ASC
|
|
31
32
|
`)
|
|
32
33
|
|
|
33
34
|
// @farishelmi any usage for this function? If no please remove.
|
|
@@ -9,7 +9,7 @@ export const shippingProviders = {
|
|
|
9
9
|
const { domain }: { domain: Domain } = context.state
|
|
10
10
|
|
|
11
11
|
const items: any[] = await getRepository(ReleaseGood).query(`
|
|
12
|
-
SELECT DISTINCT transporter FROM release_goods WHERE domain_id = '${domain.id}'
|
|
12
|
+
SELECT DISTINCT transporter FROM release_goods WHERE domain_id = '${domain.id}' AND transporter IS NOT null AND transporter != '' AND type = 'b2c'
|
|
13
13
|
`)
|
|
14
14
|
|
|
15
15
|
return { items: items }
|
package/translations/en.json
CHANGED
|
@@ -545,6 +545,7 @@
|
|
|
545
545
|
"label.attention_to": "attention to",
|
|
546
546
|
"label.availabel_pallet_qty": "available pallet qty",
|
|
547
547
|
"label.available_qty": "available qty",
|
|
548
|
+
"label.reserve_qty": "reserve qty",
|
|
548
549
|
"label.bag": "bag",
|
|
549
550
|
"label.balance": "balance",
|
|
550
551
|
"label.batch_and_product": "batch and product",
|
package/translations/ko.json
CHANGED
|
@@ -583,6 +583,7 @@
|
|
|
583
583
|
"label.attention_to": "[ko] attention to",
|
|
584
584
|
"label.availabel_pallet_qty": "사용 가능 파레트 수량",
|
|
585
585
|
"label.available_qty": "사용가능 수량",
|
|
586
|
+
"label.reserve_qty": "[ko] reserve qty",
|
|
586
587
|
"label.bag_crates_carton_ibc_drums_pails": "bag/crates/carton/ibc/drums/pails",
|
|
587
588
|
"label.bag": "백",
|
|
588
589
|
"label.balance": "잔고",
|
package/translations/ms.json
CHANGED
|
@@ -560,6 +560,7 @@
|
|
|
560
560
|
"label.attention_to": "[ms] attention to",
|
|
561
561
|
"label.availabel_pallet_qty": "baki kuantiti palet",
|
|
562
562
|
"label.available_qty": "baki kuantiti",
|
|
563
|
+
"label.reserve_qty": "[ms] reserve qty",
|
|
563
564
|
"label.bag": "beg",
|
|
564
565
|
"label.balance": "baki",
|
|
565
566
|
"label.batch_and_product": "batch and product",
|
package/translations/zh.json
CHANGED
|
@@ -540,6 +540,7 @@
|
|
|
540
540
|
"label.attention_to": "[zh] attention to",
|
|
541
541
|
"label.availabel_pallet_qty": "available pallet qty",
|
|
542
542
|
"label.available_qty": "available qty",
|
|
543
|
+
"label.reserve_qty": "[zh] reserve qty",
|
|
543
544
|
"label.bag": "bag",
|
|
544
545
|
"label.balance": "balance",
|
|
545
546
|
"label.batch_and_product": "batch and product",
|