Skip to content

OBPIH-6225 Add PO UoM in the PO shipment workflow #4891

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.

Sign up for GitHub

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

Merged
awalkowiak merged 6 commits into from
Oct 18, 2024
Merged

OBPIH-6225 Add PO UoM in the PO shipment workflow #4891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
38b2a92
OBPIH-6225 Include Uom and quantity of packs requested in StockMoveme…
drodzewicz Oct 10, 2024
1704e85
OBPIH-6225 Include packsRequested, unitOfMeasure and calculatedQuanti…
drodzewicz Oct 10, 2024
7749258
OBPIH-6225 Include quantityPickedPerUom column on sendpage table
drodzewicz Oct 10, 2024
f7a934c
OBPIH-6225 implement getPacksRequest getter for calculating number of…
drodzewicz Oct 16, 2024
308d0e5
OBPIH-6225 Fix variable and label namings
drodzewicz Oct 17, 2024
b228d64
OBPIH-6225 Do not use lodash get util function
drodzewicz Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions grails-app/i18n/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3414,6 +3414,12 @@ react.stockMovement.binLocation.label=Bin Location
react.stockMovement.quantityRequired.label=Qty Required
react.stockMovement.quantityToShip.label=Quantity to Ship
react.stockMovement.quantityPicked.label=Qty Picked
react.stockMovement.quantityPickedEach.label=Qty Picked (each)
react.stockMovement.quantityPickedPOUom.label=Qty Picked (in PO UoM)
react.stockMovement.quantityPerUom.InputTooltip.label=Input quantity in the UoM from PO
react.stockMovement.quantityPOUom.label=Quantity (in PO UoM)
react.stockMovement.quantityEach.label=Quantity (each)
react.stockMovement.POUom.label=PO UoM
react.stockMovement.picked.label=Picked
react.stockMovement.missingPickedLot.label=The picked lot is missing at rows: ${rows}
react.stockMovement.editPick.label=Edit Pick
Expand Down
59 changes: 44 additions & 15 deletions src/js/components/stock-movement-wizard/combined-shipments/AddItemsPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,17 +159,46 @@ const FIELDS = {
},
}),
},
quantityRequested: {
packsRequested: {
type: TextField,
label: 'react.stockMovement.quantity.label',
defaultMessage: 'Qty',
label: 'react.stockMovement.quantityPOUom.label',
defaultMessage: 'Quantity (in PO UoM)',
flexWidth: '1',
required: true,
headerTooltip: 'react.stockMovement.quantityPerUom.InputTooltip.label',
multilineHeader: true,
attributes: {
type: 'number',
showError: true,
},
},
unitOfMeasure: {
type: TextField,
label: 'react.stockMovement.POUom.label',
defaultMessage: 'PO UoM',
flexWidth: 0.9,
attributes: {
disabled: true,
},
},
calculatedQuantityRequested: {
type: TextField,
label: 'react.stockMovement.quantityEach.label',
defaultMessage: 'Quantity (each)',
multilineHeader: true,
flexWidth: 1,
attributes: {
disabled: true,
},
getDynamicAttr: ({ rowIndex, values }) => ({
formatValue: () => {
const row = values.lineItems[rowIndex] || {};
const packsRequested = _.toInteger(row.packsRequested);
const packSize = _.toInteger(row.packSize);
return packsRequested * packSize;
},
}),
},
palletName: {
type: TextField,
label: 'react.stockMovement.packLevel1.label',
Expand Down Expand Up @@ -324,7 +353,7 @@ class AddItemsPage extends Component {
return _.map(items, (item) => ({
id: item.id || null,
product: { id: item.product.id },
quantityRequested: item.quantityRequested,
quantityRequested: item.packsRequested * item.packSize,
palletName: item.palletName,
boxName: item.boxName,
lotNumber: item.lotNumber,
Expand Down Expand Up @@ -382,11 +411,8 @@ class AddItemsPage extends Component {
const date = moment(this.props.minimumExpirationDate, 'MM/DD/YYYY');

_.forEach(values.lineItems, (item, key) => {
if (!_.isNil(item.product) && (!item.quantityRequested || item.quantityRequested <= 0)) {
errors.lineItems[key] = { quantityRequested: 'react.stockMovement.error.enterQuantity.label' };
}
if (_.toInteger(item.quantityRequested) % item.packSize !== 0) {
errors.lineItems[key] = { quantityRequested: 'react.stockMovement.error.multipleOfPackSize.label' };
if (!_.isNil(item.product) && (!item.packsRequested || item.packsRequested <= 0)) {
errors.lineItems[key] = { packsRequested: 'react.stockMovement.error.enterQuantity.label' };
}
if (!_.isEmpty(item.boxName) && _.isEmpty(item.palletName)) {
errors.lineItems[key] = { boxName: 'react.stockMovement.error.boxWithoutPallet.label' };
Expand All @@ -403,21 +429,24 @@ class AddItemsPage extends Component {
if (!item.id || splitItems.length > 1) {
const requestedQuantity = _.reduce(
splitItems, (sum, val) =>
(sum + (val.quantityRequested ? _.toInteger(val.quantityRequested) : 0)),
(sum + (val.packsRequested
? _.toInteger(val.packsRequested * val.packSize)
: 0
)),
0,
);
if (requestedQuantity > item.quantityAvailable) {
_.forEach(values.lineItems, (lineItem, lineItemKey) => {
_.forEach(splitItems, (splitItem) => {
if (lineItem === splitItem) {
errors.lineItems[lineItemKey] = { quantityRequested: 'react.stockMovement.error.higherSplitQuantity.label' };
errors.lineItems[lineItemKey] = { packsRequested: 'react.stockMovement.error.higherSplitQuantity.label' };
}
});
});
}
} else if (splitItems.length === 1
&& item && item.quantityAvailable < _.toInteger(item.quantityRequested)) {
errors.lineItems[key] = { quantityRequested: 'react.stockMovement.error.higherQuantity.label' };
&& item && item.quantityAvailable < _.toInteger(item.packsRequested * item.packSize)) {
errors.lineItems[key] = { packsRequested: 'react.stockMovement.error.higherQuantity.label' };
}
if (!ignoreLotAndExpiry) {
if (item.expirationDate && (_.isNil(item.lotNumber) || _.isEmpty(item.lotNumber))) {
Expand Down Expand Up @@ -620,7 +649,7 @@ class AddItemsPage extends Component {

const lineItems = _.filter(formValues.lineItems, (val) => !_.isEmpty(val) && val.product);

if (_.some(lineItems, (item) => !item.quantityRequested || item.quantityRequested === '0')) {
if (_.some(lineItems, (item) => !item.packsRequested || item.packsRequested === '0')) {
this.confirmSave(() =>
this.saveAndTransitionToNextStep(formValues, lineItems));
} else {
Expand Down Expand Up @@ -816,7 +845,7 @@ class AddItemsPage extends Component {
save(formValues) {
const lineItems = _.filter(formValues.lineItems, (item) => !_.isEmpty(item));
if (lineItems.length > 0) {
if (_.some(lineItems, (item) => !item.quantityRequested || item.quantityRequested === '0')) {
if (_.some(lineItems, (item) => !item.packsRequested || item.packsRequested === '0')) {
this.confirmSave(() => this.saveItems(lineItems));
} else {
this.saveItems(lineItems);
Expand Down
21 changes: 19 additions & 2 deletions src/js/components/stock-movement-wizard/combined-shipments/SendMovementPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,27 @@ const SUPPLIER_FIELDS = {
defaultMessage: 'Expiry',
flexWidth: '3.5',
},
quantityPickedPerUom: {
type: LabelField,
label: 'react.stockMovement.quantityPickedPOUom.label',
defaultMessage: 'Qty Picked (in PO UoM)',
multilineHeader: true,
fixedWidth: '100px',
attributes: {
disabled: true,
},
getDynamicAttr: ({ rowIndex, tableItems }) => ({
formatValue: () => {
const row = tableItems[rowIndex] || {};
return `${row.packsRequested} ${row.unitOfMeasure}`;
},
}),
},
quantityRequested: {
type: LabelField,
fixedWidth: '150px',
label: 'react.stockMovement.quantityPicked.label',
defaultMessage: 'Qty Picked',
label: 'react.stockMovement.quantityPickedEach.label',
defaultMessage: 'Qty Picked (each)',
},
'recipient.name': {
type: LabelField,
Expand Down Expand Up @@ -836,6 +852,7 @@ class SendMovementPage extends Component {
isBoxNameEmpty: _.every(this.state.values.tableItems, ({ boxName }) => !boxName),
// eslint-disable-next-line max-len
isPalletNameEmpty: _.every(this.state.values.tableItems, ({ palletName }) => !palletName),
tableItems: values.tableItems
}))}
</div>
</div>
Expand Down
12 changes: 12 additions & 0 deletions src/main/groovy/org/pih/warehouse/api/StockMovementItem.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ class StockMovementItem {
BigDecimal quantityPicked
BigDecimal quantityShipped

String unitOfMeasure

// saved QOH in ward request
Integer quantityCounted

Expand Down Expand Up @@ -78,6 +80,13 @@ class StockMovementItem {
return stocklistItem?.quantity ?: null
}

BigDecimal getPacksRequested () {
if (packSize == null || packSize == 0) {
Copy link
Collaborator

@alannadolny alannadolny Oct 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so when we are checking if packSize is null or 0, we can use !packSize

Copy link
Collaborator Author

@drodzewicz drodzewicz Oct 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made other changes but I'd prefer to leave this as it is now, I feel like this way is more explicit to show what are we checking instead of !packSize

return null
}
return quantityRequested?.toBigDecimal() / packSize.toBigDecimal()
}


static constraints = {
id(nullable: true)
Expand Down Expand Up @@ -131,6 +140,8 @@ class StockMovementItem {
quantityCanceled : quantityCanceled,
quantityRevised : quantityRevised,
quantityPicked : quantityPicked,
unitOfMeasure : unitOfMeasure,
packsRequested : packsRequested,
quantityRequired : quantityRequired,
reasonCode : reasonCode,
comments : comments,
Expand Down Expand Up @@ -179,6 +190,7 @@ class StockMovementItem {
orderNumber: shipmentItem?.orderNumber,
orderId: shipmentItem?.orderId,
quantityAvailable: shipmentItem.quantityRemainingToShip,
unitOfMeasure: shipmentItem.unitOfMeasure,
packSize: shipmentItem.quantityPerUom,
)
}
Expand Down