Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1263553

Browse files
authored
OBPIH-7346 add more cycle count reason codes (#5582)
1 parentf5206b8 commit1263553

File tree

8 files changed

+62
-8
lines changed

8 files changed

+62
-8
lines changed

‎grails-app/controllers/org/pih/warehouse/api/ReasonCodeApiController.groovy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ class ReasonCodeApiController {
3131
reasonCodes.addAll(getReasonCodes(ReasonCode.listRequisitionQuantityChangeReasonCodes()))
3232
}elseif (ActivityCode.ADJUST_INVENTORYin activityCodes) {
3333
reasonCodes.addAll(getReasonCodes(ReasonCode.listInventoryAdjustmentReasonCodes()))
34+
}elseif (ActivityCode.CYCLE_COUNTin activityCodes) {
35+
reasonCodes.addAll(getReasonCodes(ReasonCode.listCycleCountReasonCodes()))
3436
}else {
3537
reasonCodes.addAll(getReasonCodes(ReasonCode.listDefault()))
3638
}

‎grails-app/domain/org/pih/warehouse/inventory/CycleCountItem.groovy‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@ class CycleCountItem implements Comparable {
7878
returntrue
7979
}
8080

81-
returnReasonCode.listInventoryAdjustmentReasonCodes().contains(discrepancyReasonCode)?
82-
true :
83-
['cycleCountItem.discrepancyReasonCode.invalid']
81+
returnReasonCode.listCycleCountReasonCodes().contains(discrepancyReasonCode)?true: ['invalid']
8482
})
8583
location(nullable:true)
8684
}

‎grails-app/i18n/messages.properties‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,7 @@ enum.ActivityCode.SUBMIT_REQUEST=Submit request
766766
enum.ActivityCode.DYNAMIC_CREATION=Dynamic creation
767767
enum.ActivityCode.AUTOSAVE=Autosave
768768
enum.ActivityCode.ALLOW_OVERPICK=Allow over-pick
769+
enum.ActivityCode.CYCLE_COUNT=Cycle Count
769770
enum.ActivityCode.NONE=None
770771
enum.CommodityClass.NONE=None
771772
enum.CommodityClass.MEDICATION=Medication
@@ -913,6 +914,17 @@ enum.ReasonCode.CLINICAL_JUDGMENT=Clinical judgement
913914
enum.ReasonCode.INSUFFICIENT_QUANTITY_AVAILABLE=Insufficient quantity available
914915
enum.ReasonCode.BACKORDER=Backorder
915916
enum.ReasonCode.DUPLICATE_REQUEST=Duplicate Request
917+
enum.ReasonCode.BIN_CORRECTION=Bin correction
918+
enum.ReasonCode.LOT_CORRECTION=Lot correction
919+
enum.ReasonCode.INCORRECT_LOT_PICKED=Incorrect lot picked
920+
enum.ReasonCode.FIX_NEGATIVE_INVENTORY=Fix negative inventory
921+
enum.ReasonCode.INBOUND_NOT_RECORDED=Inbound not recorded
922+
enum.ReasonCode.OUTBOUND_NOT_RECORDED=Outbound not recorded
923+
enum.ReasonCode.RETURN_NOT_RECORDED=Return not recorded
924+
enum.ReasonCode.ERROR_IN_INBOUND=Error in inbound
925+
enum.ReasonCode.ERROR_IN_OUTBOUND=Error in outbound
926+
enum.ReasonCode.BIN_LOCATION_MISSING=Bin location missing
927+
enum.ReasonCode.MISPLACED=Misplaced
916928
enum.RequisitionStatus.CREATED=Created
917929
enum.RequisitionStatus.EDITING=Editing
918930
enum.RequisitionStatus.CHECKING=Checking
@@ -4281,6 +4293,7 @@ react.locationsConfiguration.ActivityCode.HOLD_STOCK=Hold stock
42814293
react.locationsConfiguration.ActivityCode.SUBMIT_REQUEST=Submit request
42824294
react.locationsConfiguration.ActivityCode.DYNAMIC_CREATION=Dynamic creation
42834295
react.locationsConfiguration.ActivityCode.AUTOSAVE=Autosave
4296+
react.locationsConfiguration.ActivityCode.CYCLE_COUNT=Cycle Count
42844297
react.locationsConfiguration.ActivityCode.NONE=None
42854298
react.locationsConfiguration.alert.locationGroupSaveCompleted.label=Location group was successfully saved!
42864299
react.locationsConfiguration.alert.organizationSaveCompleted.label=Organization was successfully saved!

‎src/js/hooks/cycleCount/useResolveStepTable.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const useResolveStepTable = ({
7676

7777
useEffect(()=>{
7878
if(!reasonCodes?.length){
79-
dispatch(fetchReasonCodes('ADJUST_INVENTORY',FETCH_CYCLE_COUNT_REASON_CODES));
79+
dispatch(fetchReasonCodes('CYCLE_COUNT',FETCH_CYCLE_COUNT_REASON_CODES));
8080
}
8181
},[]);
8282

‎src/main/groovy/org/pih/warehouse/core/ActivityCode.groovy‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ enum ActivityCode {
6969

7070
ALLOW_OVERPICK('ALLOW_OVERPICK'),
7171

72+
CYCLE_COUNT('CYCLE_COUNT'),
73+
7274
NONE('NONE')
7375

7476
finalString id
@@ -105,6 +107,7 @@ enum ActivityCode {
105107
DYNAMIC_CREATION,
106108
AUTOSAVE,
107109
ALLOW_OVERPICK,
110+
CYCLE_COUNT,
108111
NONE,
109112
]
110113
}

‎src/main/groovy/org/pih/warehouse/core/ReasonCode.groovy‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,17 @@ enum ReasonCode {
6868
INSUFFICIENT_QUANTITY_AVAILABLE(36),
6969
BACKORDER(37),
7070
DUPLICATE_REQUEST(38),
71+
BIN_CORRECTION(39),
72+
LOT_CORRECTION(40),
73+
INCORRECT_LOT_PICKED(41),
74+
FIX_NEGATIVE_INVENTORY(42),
75+
INBOUND_NOT_RECORDED(43),
76+
OUTBOUND_NOT_RECORDED(44),
77+
RETURN_NOT_RECORDED(45),
78+
ERROR_IN_INBOUND(46),
79+
ERROR_IN_OUTBOUND(47),
80+
BIN_LOCATION_MISSING(48),
81+
MISPLACED(49),
7182
OTHER(100)
7283

7384

@@ -207,4 +218,33 @@ enum ReasonCode {
207218
INSUFFICIENT_QUANTITY_AVAILABLE,
208219
]
209220
}
221+
222+
staticlistCycleCountReasonCodes() {
223+
return [
224+
CONSUMED,
225+
CORRECTION,
226+
DAMAGED,
227+
DATA_ENTRY_ERROR,
228+
EXPIRED,
229+
FOUND,
230+
MISSING,
231+
RECOUNTED,
232+
REJECTED,
233+
RETURNED,
234+
SCRAPPED,
235+
STOLEN,
236+
BIN_CORRECTION,
237+
LOT_CORRECTION,
238+
INCORRECT_LOT_PICKED,
239+
FIX_NEGATIVE_INVENTORY,
240+
INBOUND_NOT_RECORDED,
241+
OUTBOUND_NOT_RECORDED,
242+
RETURN_NOT_RECORDED,
243+
ERROR_IN_INBOUND,
244+
ERROR_IN_OUTBOUND,
245+
BIN_LOCATION_MISSING,
246+
MISPLACED,
247+
OTHER
248+
]
249+
}
210250
}

‎src/main/groovy/org/pih/warehouse/inventory/CycleCountItemCommand.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class CycleCountItemCommand implements Validateable {
6565
returntrue
6666
}
6767

68-
returnReasonCode.listInventoryAdjustmentReasonCodes().contains(discrepancyReasonCode)?true: ['invalid']
68+
returnReasonCode.listCycleCountReasonCodes().contains(discrepancyReasonCode)?true: ['invalid']
6969
})
7070
comment(nullable:true,blank:true)
7171
assignee(nullable:true)

‎src/main/groovy/org/pih/warehouse/inventory/CycleCountUpdateItemCommand.groovy‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ class CycleCountUpdateItemCommand implements Validateable {
3636
returntrue
3737
}
3838

39-
returnReasonCode.listInventoryAdjustmentReasonCodes().contains(discrepancyReasonCode)?
40-
true :
41-
['cycleCountUpdateItemCommand.discrepancyReasonCode.invalid']
39+
returnReasonCode.listCycleCountReasonCodes().contains(discrepancyReasonCode)?true: ['invalid']
4240
})
4341
comment(nullable:true,blank:true)
4442
assignee(nullable:true)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp