-
-
Notifications
You must be signed in to change notification settings - Fork 12
OBLS-940 Refresh putaway candidates and fix putaway location entry #443
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
olewandowski1
wants to merge
1
commit into
develop
Choose a base branch
from
OBLS-940
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ export const SUBMIT_PUTAWAY_ITEM_BIN_LOCATION = 'SUBMIT_PUTAWAY_ITEM_BIN_LOCATIO | |
| export const SUBMIT_PUTAWAY_ITEM_BIN_LOCATION_SUCCESS = 'SUBMIT_PUTAWAY_ITEM_BIN_LOCATION_SUCCESS'; | ||
| export const PATCH_PUTAWAY_TASK_REQUEST = 'PATCH_PUTAWAY_TASK_REQUEST'; | ||
| export const PATCH_PUTAWAY_TASK_REQUEST_SUCCESS = 'PATCH_PUTAWAY_TASK_REQUEST_SUCCESS'; | ||
| export const PUTAWAY_CANDIDATE_PUT_AWAY = 'PUTAWAY_CANDIDATE_PUT_AWAY'; | ||
| export const GET_PUTAWAY_DETAILS_BY_CONTAINER_ID_REQUEST = 'GET_PUTAWAY_DETAILS_BY_CONTAINER_ID_REQUEST'; | ||
| export const GET_PUTAWAY_DETAILS_BY_CONTAINER_ID_REQUEST_SUCCESS = | ||
| 'GET_PUTAWAY_DETAILS_BY_CONTAINER_ID_REQUEST_SUCCESS'; | ||
|
|
@@ -66,6 +67,13 @@ export function patchPutawayTaskAction( | |
| }; | ||
| } | ||
|
|
||
| export function markCandidatePutAway(key: string, remainingQuantity: number) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should be "markCandidatePutaway" |
||
| return { | ||
| type: PUTAWAY_CANDIDATE_PUT_AWAY, | ||
| payload: { key, remainingQuantity } | ||
| }; | ||
| } | ||
|
|
||
| export function getPutawayDetailsByContainerId(containerId: string, callback?: (data: any) => void) { | ||
| return { | ||
| type: GET_PUTAWAY_DETAILS_BY_CONTAINER_ID_REQUEST, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,10 @@ | ||
| import { SortationTask } from '../../types/sortation'; | ||
| import { putawayCandidateKey } from '../../utils/putawayCandidate'; | ||
| import { | ||
| FETCH_PUTAWAY_FROM_ORDER_REQUEST_SUCCESS, | ||
| GET_PUTAWAY_CANDIDATES_REQUEST_SUCCESS, | ||
| GET_PUTAWAY_DETAILS_BY_CONTAINER_ID_REQUEST_SUCCESS, | ||
| PUTAWAY_CANDIDATE_PUT_AWAY, | ||
| SUBMIT_PUTAWAY_ITEM_BIN_LOCATION_SUCCESS | ||
| } from '../actions/putaways'; | ||
|
|
||
|
|
@@ -11,13 +13,15 @@ export interface State { | |
| putAwayItem: any; | ||
| candidates: any; | ||
| putawayTasks: SortationTask[]; | ||
| putAwayOverrides: { [key: string]: number }; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "putwayOverrides" |
||
| } | ||
|
|
||
| const initialState: State = { | ||
| putAway: null, | ||
| putAwayItem: null, | ||
| candidates: [], | ||
| putawayTasks: [] | ||
| putawayTasks: [], | ||
| putAwayOverrides: {} | ||
| }; | ||
|
|
||
| function reducer(state = initialState, action: any) { | ||
|
|
@@ -28,10 +32,27 @@ function reducer(state = initialState, action: any) { | |
| putAway: action.payload.data | ||
| }; | ||
| } | ||
| case PUTAWAY_CANDIDATE_PUT_AWAY: { | ||
| const { key, remainingQuantity } = action.payload; | ||
| return { | ||
| ...state, | ||
| putAwayOverrides: { ...state.putAwayOverrides, [key]: remainingQuantity } | ||
| }; | ||
| } | ||
| case GET_PUTAWAY_CANDIDATES_REQUEST_SUCCESS: { | ||
| const candidates = action.payload || []; | ||
| // Drop overrides the server has caught up with, so they cannot go stale | ||
| const putAwayOverrides = { ...state.putAwayOverrides }; | ||
| Object.keys(putAwayOverrides).forEach((key) => { | ||
| const match = candidates.find((candidate: any) => putawayCandidateKey(candidate) === key); | ||
| if (!match || Number(match.quantity) <= putAwayOverrides[key]) { | ||
| delete putAwayOverrides[key]; | ||
| } | ||
| }); | ||
| return { | ||
| ...state, | ||
| candidates: action.payload | ||
| candidates, | ||
| putAwayOverrides | ||
| }; | ||
| } | ||
| case SUBMIT_PUTAWAY_ITEM_BIN_LOCATION_SUCCESS: { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PUT_AWAYshould be one word -PUTAWAY,PUTAWAY_CANDIDATE_PUTAWAYshould definitely be something else, but I don't see the context yet. What is it supposed to indicate? Start of a putaway task? Split of a putaway task?