@axelor/aos-mobile-manufacturing 7.0.0 → 7.0.2

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 (28) hide show
  1. package/lib/components/templates/ConsumedProductTrackingNumberSelect/ConsumedProductTrackingNumberSelect.d.ts +9 -0
  2. package/lib/components/templates/ConsumedProductTrackingNumberSelect/ConsumedProductTrackingNumberSelect.js +43 -0
  3. package/lib/components/templates/ConsumedProductTrackingNumberSelect/ConsumedProductTrackingNumberSelect.js.map +1 -0
  4. package/lib/components/templates/index.d.ts +1 -0
  5. package/lib/components/templates/index.js +1 -0
  6. package/lib/components/templates/index.js.map +1 -1
  7. package/lib/features/machinesSlice.js +6 -25
  8. package/lib/features/machinesSlice.js.map +1 -1
  9. package/lib/features/manufacturingOrderSlice.js +16 -79
  10. package/lib/features/manufacturingOrderSlice.js.map +1 -1
  11. package/lib/features/operationOrderSlice.js +6 -28
  12. package/lib/features/operationOrderSlice.js.map +1 -1
  13. package/lib/features/prodProductSlice.d.ts +15 -0
  14. package/lib/features/prodProductSlice.js +29 -0
  15. package/lib/features/prodProductSlice.js.map +1 -1
  16. package/lib/features/productionFileSlice.js +6 -28
  17. package/lib/features/productionFileSlice.js.map +1 -1
  18. package/lib/features/wasteProductsSlice.js +6 -28
  19. package/lib/features/wasteProductsSlice.js.map +1 -1
  20. package/lib/features/workCentersSlice.js +6 -25
  21. package/lib/features/workCentersSlice.js.map +1 -1
  22. package/lib/i18n/en.json +2 -1
  23. package/lib/i18n/fr.json +2 -1
  24. package/lib/index.js +4 -0
  25. package/lib/index.js.map +1 -1
  26. package/lib/screens/manufactoringOrder/consumedProduct/ConsumedProductDetailsScreen.js +18 -4
  27. package/lib/screens/manufactoringOrder/consumedProduct/ConsumedProductDetailsScreen.js.map +1 -1
  28. package/package.json +4 -4
@@ -0,0 +1,9 @@
1
+ export default ConsumedProductTrackingNumberSelect;
2
+ declare function ConsumedProductTrackingNumberSelect({ product, stockMoveLineId, stockMoveLineVersion, manufOrderId, manufOrderVersion, visible, }: {
3
+ product: any;
4
+ stockMoveLineId: any;
5
+ stockMoveLineVersion: any;
6
+ manufOrderId: any;
7
+ manufOrderVersion: any;
8
+ visible: any;
9
+ }): JSX.Element;
@@ -0,0 +1,43 @@
1
+ /*
2
+ * Axelor Business Solutions
3
+ *
4
+ * Copyright (C) 2023 Axelor (<http://axelor.com>).
5
+ *
6
+ * This program is free software: you can redistribute it and/or modify
7
+ * it under the terms of the GNU Affero General Public License, version 3,
8
+ * as published by the Free Software Foundation.
9
+ *
10
+ * This program is distributed in the hope that it will be useful,
11
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
+ * GNU Affero General Public License for more details.
14
+ *
15
+ * You should have received a copy of the GNU Affero General Public License
16
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
17
+ */
18
+ import React, { useCallback } from 'react';
19
+ import { useDispatch } from '@axelor/aos-mobile-core';
20
+ import { ProductTrackingNumberSelect } from '@axelor/aos-mobile-stock';
21
+ import { addTrackingNumberToConsumedProduct } from '../../../features/prodProductSlice';
22
+ const trackingScanKey = 'tracking_consumed-product-select';
23
+ const ConsumedProductTrackingNumberSelect = ({ product, stockMoveLineId, stockMoveLineVersion, manufOrderId, manufOrderVersion, visible, }) => {
24
+ const dispatch = useDispatch();
25
+ const handleAddTrackingNumber = useCallback(selectedTrackingNumber => {
26
+ dispatch(addTrackingNumberToConsumedProduct({
27
+ stockMoveLineId,
28
+ stockMoveLineVersion,
29
+ manufOrderId,
30
+ manufOrderVersion,
31
+ trackingNumber: selectedTrackingNumber,
32
+ }));
33
+ }, [
34
+ dispatch,
35
+ manufOrderId,
36
+ manufOrderVersion,
37
+ stockMoveLineId,
38
+ stockMoveLineVersion,
39
+ ]);
40
+ return (<ProductTrackingNumberSelect product={product} visible={visible} trackingScanKey={trackingScanKey} onAddTrackingNumber={handleAddTrackingNumber}/>);
41
+ };
42
+ export default ConsumedProductTrackingNumberSelect;
43
+ //# sourceMappingURL=ConsumedProductTrackingNumberSelect.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ConsumedProductTrackingNumberSelect.js","sourceRoot":"","sources":["../../../../src/components/templates/ConsumedProductTrackingNumberSelect/ConsumedProductTrackingNumberSelect.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAC,MAAM,OAAO,CAAC;AACzC,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAC,2BAA2B,EAAC,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAC,kCAAkC,EAAC,MAAM,oCAAoC,CAAC;AAEtF,MAAM,eAAe,GAAG,kCAAkC,CAAC;AAE3D,MAAM,mCAAmC,GAAG,CAAC,EAC3C,OAAO,EACP,eAAe,EACf,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,OAAO,GACR,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,uBAAuB,GAAG,WAAW,CACzC,sBAAsB,CAAC,EAAE;QACvB,QAAQ,CACN,kCAAkC,CAAC;YACjC,eAAe;YACf,oBAAoB;YACpB,YAAY;YACZ,iBAAiB;YACjB,cAAc,EAAE,sBAAsB;SACvC,CAAC,CACH,CAAC;IACJ,CAAC,EACD;QACE,QAAQ;QACR,YAAY;QACZ,iBAAiB;QACjB,eAAe;QACf,oBAAoB;KACrB,CACF,CAAC;IAEF,OAAO,CACL,CAAC,2BAA2B,CAC1B,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,eAAe,CAAC,CAAC,eAAe,CAAC,CACjC,mBAAmB,CAAC,CAAC,uBAAuB,CAAC,EAC7C,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,mCAAmC,CAAC"}
@@ -1,2 +1,3 @@
1
+ export { default as ConsumedProductTrackingNumberSelect } from "./ConsumedProductTrackingNumberSelect/ConsumedProductTrackingNumberSelect";
1
2
  export { default as MachineSearchBar } from "./MachineSearchBar/MachineSearchBar";
2
3
  export { default as WorkCenterSearchBar } from "./WorkCenterSearchBar/WorkCenterSearchBar";
@@ -15,6 +15,7 @@
15
15
  * You should have received a copy of the GNU Affero General Public License
16
16
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
17
17
  */
18
+ export { default as ConsumedProductTrackingNumberSelect } from './ConsumedProductTrackingNumberSelect/ConsumedProductTrackingNumberSelect';
18
19
  export { default as MachineSearchBar } from './MachineSearchBar/MachineSearchBar';
19
20
  export { default as WorkCenterSearchBar } from './WorkCenterSearchBar/WorkCenterSearchBar';
20
21
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/templates/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAC,OAAO,IAAI,mBAAmB,EAAC,MAAM,2CAA2C,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/templates/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,OAAO,IAAI,mCAAmC,EAAC,MAAM,2EAA2E,CAAC;AACzI,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAC,OAAO,IAAI,mBAAmB,EAAC,MAAM,2CAA2C,CAAC"}
@@ -16,7 +16,7 @@
16
16
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
17
17
  */
18
18
  import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
19
- import { handlerApiCall } from '@axelor/aos-mobile-core';
19
+ import { generateInifiniteScrollCases, handlerApiCall, } from '@axelor/aos-mobile-core';
20
20
  import { searchMachineFilter } from '../api/machine-api';
21
21
  export const searchMachines = createAsyncThunk('machines/searchMachine', async function (data, { getState }) {
22
22
  return handlerApiCall({
@@ -37,30 +37,11 @@ const machinesSlice = createSlice({
37
37
  name: 'machines',
38
38
  initialState,
39
39
  extraReducers: builder => {
40
- builder.addCase(searchMachines.pending, (state, action) => {
41
- if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
42
- state.loading = true;
43
- }
44
- else {
45
- state.moreLoading = true;
46
- }
47
- });
48
- builder.addCase(searchMachines.fulfilled, (state, action) => {
49
- state.loading = false;
50
- state.moreLoading = false;
51
- if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
52
- state.machineList = action.payload;
53
- state.isListEnd = false;
54
- }
55
- else {
56
- if (action.payload != null) {
57
- state.isListEnd = false;
58
- state.machineList = [...state.machineList, ...action.payload];
59
- }
60
- else {
61
- state.isListEnd = true;
62
- }
63
- }
40
+ generateInifiniteScrollCases(builder, searchMachines, {
41
+ loading: 'loading',
42
+ moreLoading: 'moreLoading',
43
+ isListEnd: 'isListEnd',
44
+ list: 'machineList',
64
45
  });
65
46
  },
66
47
  });
@@ -1 +1 @@
1
- {"version":3,"file":"machinesSlice.js","sourceRoot":"","sources":["../../src/features/machinesSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAEvD,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAC5C,wBAAwB,EACxB,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,mBAAmB;QAClC,IAAI;QACJ,MAAM,EAAE,0CAA0C;QAClD,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,KAAK;IACd,WAAW,EAAE,EAAE;IACf,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;CACjB,CAAC;AAEF,MAAM,aAAa,GAAG,WAAW,CAAC;IAChC,IAAI,EAAE,UAAU;IAChB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACxD,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE;gBAC9D,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;aACtB;iBAAM;gBACL,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;aAC1B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC1D,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACtB,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;YAC1B,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE;gBAC9D,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC;gBACnC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;aACzB;iBAAM;gBACL,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,EAAE;oBAC1B,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;oBACxB,KAAK,CAAC,WAAW,GAAG,CAAC,GAAG,KAAK,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;iBAC/D;qBAAM;oBACL,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;iBACxB;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO,CAAC"}
1
+ {"version":3,"file":"machinesSlice.js","sourceRoot":"","sources":["../../src/features/machinesSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,4BAA4B,EAC5B,cAAc,GACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAEvD,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAC5C,wBAAwB,EACxB,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,mBAAmB;QAClC,IAAI;QACJ,MAAM,EAAE,0CAA0C;QAClD,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,KAAK;IACd,WAAW,EAAE,EAAE;IACf,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;CACjB,CAAC;AAEF,MAAM,aAAa,GAAG,WAAW,CAAC;IAChC,IAAI,EAAE,UAAU;IAChB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,4BAA4B,CAAC,OAAO,EAAE,cAAc,EAAE;YACpD,OAAO,EAAE,SAAS;YAClB,WAAW,EAAE,aAAa;YAC1B,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,aAAa;SACpB,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC,OAAO,CAAC"}
@@ -16,7 +16,7 @@
16
16
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
17
17
  */
18
18
  import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
19
- import { handlerApiCall } from '@axelor/aos-mobile-core';
19
+ import { generateInifiniteScrollCases, handlerApiCall, } from '@axelor/aos-mobile-core';
20
20
  import { fetchChildrenManufacturingOrders, fetchManufacturingOrder, fetchManufacturingOrderOfProductionOrder, searchManufacturingOrderFilter, updateManufacturingOrderStatus, } from '../api/manufacturing-order-api';
21
21
  export const fetchManufacturingOrders = createAsyncThunk('manufacturingOrder/fetchManufacturingOrders', async function (data, { getState }) {
22
22
  return handlerApiCall({
@@ -89,30 +89,11 @@ const manufacturingOrderSlice = createSlice({
89
89
  name: 'manufacturingOrder',
90
90
  initialState,
91
91
  extraReducers: builder => {
92
- builder.addCase(fetchManufacturingOrders.pending, (state, action) => {
93
- if (action.meta.arg.page === 0) {
94
- state.loading = true;
95
- }
96
- else {
97
- state.moreLoading = true;
98
- }
99
- });
100
- builder.addCase(fetchManufacturingOrders.fulfilled, (state, action) => {
101
- state.loading = false;
102
- state.moreLoading = false;
103
- if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
104
- state.manufOrderList = action.payload;
105
- state.isListEnd = false;
106
- }
107
- else {
108
- if (action.payload != null) {
109
- state.isListEnd = false;
110
- state.manufOrderList = [...state.manufOrderList, ...action.payload];
111
- }
112
- else {
113
- state.isListEnd = true;
114
- }
115
- }
92
+ generateInifiniteScrollCases(builder, fetchManufacturingOrders, {
93
+ loading: 'loading',
94
+ moreLoading: 'moreLoading',
95
+ isListEnd: 'isListEnd',
96
+ list: 'manufOrderList',
116
97
  });
117
98
  builder.addCase(fetchManufOrder.pending, state => {
118
99
  state.loadingOrder = true;
@@ -121,61 +102,17 @@ const manufacturingOrderSlice = createSlice({
121
102
  state.loadingOrder = false;
122
103
  state.manufOrder = action.payload;
123
104
  });
124
- builder.addCase(fetchLinkedManufOrders.pending, (state, action) => {
125
- if (action.meta.arg.page === 0) {
126
- state.loadingLinkMO = true;
127
- }
128
- else {
129
- state.moreLoadingLinkMO = true;
130
- }
131
- });
132
- builder.addCase(fetchLinkedManufOrders.fulfilled, (state, action) => {
133
- state.loadingLinkMO = false;
134
- state.moreLoadingLinkMO = false;
135
- if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
136
- state.linkedManufOrders = action.payload;
137
- state.isListEndLinkMO = false;
138
- }
139
- else {
140
- if (action.payload != null) {
141
- state.isListEndLinkMO = false;
142
- state.linkedManufOrders = [
143
- ...state.linkedManufOrders,
144
- ...action.payload,
145
- ];
146
- }
147
- else {
148
- state.isListEndLinkMO = true;
149
- }
150
- }
151
- });
152
- builder.addCase(fetchChildrenOfManufacturingOrder.pending, (state, action) => {
153
- if (action.meta.arg.page === 0) {
154
- state.loadingChildrenMO = true;
155
- }
156
- else {
157
- state.moreLoadingChildrenMO = true;
158
- }
105
+ generateInifiniteScrollCases(builder, fetchLinkedManufOrders, {
106
+ loading: 'loadingLinkMO',
107
+ moreLoading: 'moreLoadingLinkMO',
108
+ isListEnd: 'isListEndLinkMO',
109
+ list: 'linkedManufOrders',
159
110
  });
160
- builder.addCase(fetchChildrenOfManufacturingOrder.fulfilled, (state, action) => {
161
- state.loadingChildrenMO = false;
162
- state.moreLoadingChildrenMO = false;
163
- if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
164
- state.childrenManufOrders = action.payload;
165
- state.isListEndChildrenMO = false;
166
- }
167
- else {
168
- if (action.payload != null) {
169
- state.isListEndChildrenMO = false;
170
- state.childrenManufOrders = [
171
- ...state.childrenManufOrders,
172
- ...action.payload,
173
- ];
174
- }
175
- else {
176
- state.isListEndChildrenMO = true;
177
- }
178
- }
111
+ generateInifiniteScrollCases(builder, fetchChildrenOfManufacturingOrder, {
112
+ loading: 'loadingChildrenMO',
113
+ moreLoading: 'moreLoadingChildrenMO',
114
+ isListEnd: 'isListEndChildrenMO',
115
+ list: 'childrenManufOrders',
179
116
  });
180
117
  builder.addCase(updateStatusOfManufOrder.fulfilled, (state, action) => {
181
118
  state.manufOrder = action.payload;
@@ -1 +1 @@
1
- {"version":3,"file":"manufacturingOrderSlice.js","sourceRoot":"","sources":["../../src/features/manufacturingOrderSlice.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"manufacturingOrderSlice.js","sourceRoot":"","sources":["../../src/features/manufacturingOrderSlice.js"],"names":[],"mappings":"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"}
@@ -16,7 +16,7 @@
16
16
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
17
17
  */
18
18
  import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
19
- import { handlerApiCall, updateAgendaItems } from '@axelor/aos-mobile-core';
19
+ import { generateInifiniteScrollCases, handlerApiCall, updateAgendaItems, } from '@axelor/aos-mobile-core';
20
20
  import { searchOperationOrderFilter, fetchOperationOrder, updateOperationOrderStatus, getPlannedOperationOrder, } from '../api/operation-order-api';
21
21
  export const fetchOperationOrders = createAsyncThunk('OperationOrder/fetchOperationOrders', async function (data, { getState }) {
22
22
  return handlerApiCall({
@@ -73,13 +73,11 @@ const operationOrderSlice = createSlice({
73
73
  name: 'operationOrder',
74
74
  initialState,
75
75
  extraReducers: builder => {
76
- builder.addCase(fetchOperationOrders.pending, (state, action) => {
77
- if (action.meta.arg.page === 0) {
78
- state.loading = true;
79
- }
80
- else {
81
- state.moreLoading = true;
82
- }
76
+ generateInifiniteScrollCases(builder, fetchOperationOrders, {
77
+ loading: 'loading',
78
+ moreLoading: 'moreLoading',
79
+ isListEnd: 'isListEnd',
80
+ list: 'operationOrderList',
83
81
  });
84
82
  builder.addCase(fetchPlannedOperationOrder.pending, state => {
85
83
  state.loading = true;
@@ -88,26 +86,6 @@ const operationOrderSlice = createSlice({
88
86
  state.loading = false;
89
87
  state.plannedOperationOrderList = updateAgendaItems(state.plannedOperationOrderList, action.payload);
90
88
  });
91
- builder.addCase(fetchOperationOrders.fulfilled, (state, action) => {
92
- state.loading = false;
93
- state.moreLoading = false;
94
- if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
95
- state.operationOrderList = action.payload;
96
- state.isListEnd = false;
97
- }
98
- else {
99
- if (action.payload != null) {
100
- state.isListEnd = false;
101
- state.operationOrderList = [
102
- ...state.operationOrderList,
103
- ...action.payload,
104
- ];
105
- }
106
- else {
107
- state.isListEnd = true;
108
- }
109
- }
110
- });
111
89
  builder.addCase(fetchOperationOrderById.pending, state => {
112
90
  state.loadingOrder = true;
113
91
  });
@@ -1 +1 @@
1
- {"version":3,"file":"operationOrderSlice.js","sourceRoot":"","sources":["../../src/features/operationOrderSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAE,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EACL,0BAA0B,EAC1B,mBAAmB,EACnB,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAClD,qCAAqC,EACrC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,0BAA0B;QACzC,IAAI;QACJ,MAAM,EAAE,gDAAgD;QACxD,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,gBAAgB,CACxD,2CAA2C,EAC3C,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,wBAAwB;QACvC,IAAI;QACJ,MAAM,EAAE,uDAAuD;QAC/D,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,gBAAgB,CACrD,oCAAoC,EACpC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,mBAAmB;QAClC,IAAI;QACJ,MAAM,EAAE,mDAAmD;QAC3D,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,gBAAgB,CAClD,2CAA2C,EAC3C,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,0BAA0B;QACzC,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,sDAAsD;QAC9D,QAAQ,EAAE,QAAQ;QAClB,eAAe,EAAE,EAAC,SAAS,EAAE,KAAK,EAAC;KACpC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CACf,cAAc,CAAC;QACb,aAAa,EAAE,mBAAmB;QAClC,IAAI,EAAE,EAAC,gBAAgB,EAAE,MAAM,CAAC,EAAE,EAAC;QACnC,MAAM,EAAE,mDAAmD;QAC3D,QAAQ,EAAE,QAAQ;QAClB,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,KAAK;IACd,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;IAChB,kBAAkB,EAAE,EAAE;IACtB,YAAY,EAAE,KAAK;IACnB,cAAc,EAAE,EAAE;IAClB,yBAAyB,EAAE,EAAE;CAC9B,CAAC;AAEF,MAAM,mBAAmB,GAAG,WAAW,CAAC;IACtC,IAAI,EAAE,gBAAgB;IACtB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC9D,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE;gBAC9B,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;aACtB;iBAAM;gBACL,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;aAC1B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAC1D,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,0BAA0B,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACtE,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACtB,KAAK,CAAC,yBAAyB,GAAG,iBAAiB,CACjD,KAAK,CAAC,yBAAyB,EAC/B,MAAM,CAAC,OAAO,CACf,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAChE,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACtB,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;YAC1B,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE;gBAC9D,KAAK,CAAC,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC;gBAC1C,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;aACzB;iBAAM;gBACL,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,EAAE;oBAC1B,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;oBACxB,KAAK,CAAC,kBAAkB,GAAG;wBACzB,GAAG,KAAK,CAAC,kBAAkB;wBAC3B,GAAG,MAAM,CAAC,OAAO;qBAClB,CAAC;iBACH;qBAAM;oBACL,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;iBACxB;aACF;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YACvD,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACnE,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC;YAC3B,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAChE,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,OAAO,CAAC"}
1
+ {"version":3,"file":"operationOrderSlice.js","sourceRoot":"","sources":["../../src/features/operationOrderSlice.js"],"names":[],"mappings":"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"}
@@ -38,9 +38,24 @@ export const updateProdProductOfManufOrder: import("@reduxjs/toolkit").AsyncThun
38
38
  fulfilledMeta?: unknown;
39
39
  rejectedMeta?: unknown;
40
40
  }>;
41
+ export const addTrackingNumberToConsumedProduct: import("@reduxjs/toolkit").AsyncThunk<{
42
+ consumedProducts: any;
43
+ stockMoveLine: any;
44
+ }, void, {
45
+ state?: unknown;
46
+ dispatch?: import("redux").Dispatch<import("redux").AnyAction>;
47
+ extra?: unknown;
48
+ rejectValue?: unknown;
49
+ serializedErrorType?: unknown;
50
+ pendingMeta?: unknown;
51
+ fulfilledMeta?: unknown;
52
+ rejectedMeta?: unknown;
53
+ }>;
41
54
  export const prodProductsReducer: import("redux").Reducer<{
42
55
  loadingConsumedProducts: boolean;
43
56
  consumedProductList: any[];
57
+ loadingConsumedProductStockMoveLine: boolean;
58
+ consumedProductStockMoveLine: {};
44
59
  loadingProducedProducts: boolean;
45
60
  producedProductList: any[];
46
61
  }, import("redux").AnyAction>;
@@ -17,6 +17,7 @@
17
17
  */
18
18
  import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
19
19
  import { handlerApiCall } from '@axelor/aos-mobile-core';
20
+ import { updateStockMoveLineTrackingNumber } from '@axelor/aos-mobile-stock';
20
21
  import { createProdProduct, fetchManufacturingOrderConsumedProducts, fetchManufacturingOrderProducedProducts, updateProdProduct, } from '../api/prod-product-api';
21
22
  const TYPE_CONSUMED = 'consumed';
22
23
  const TYPE_PRODUCED = 'produced';
@@ -76,9 +77,29 @@ export const updateProdProductOfManufOrder = createAsyncThunk('prodProducts/upda
76
77
  }
77
78
  });
78
79
  });
80
+ export const addTrackingNumberToConsumedProduct = createAsyncThunk('consumedProduct/addTrackingNumberToConsumedProduct', async function (data = {}, { getState }) {
81
+ return handlerApiCall({
82
+ fetchFunction: updateStockMoveLineTrackingNumber,
83
+ data,
84
+ action: 'Manufacturing_SliceAction_AddTrackingNumberToConsumedProductStockMoveLine',
85
+ getState,
86
+ responseOptions: { showToast: true },
87
+ }).then(async (res) => {
88
+ const { productList } = await handlerApiCall({
89
+ fetchFunction: fetchManufacturingOrderConsumedProducts,
90
+ data,
91
+ action: 'Manufacturing_SliceAction_FetchComsumedProducts',
92
+ getState,
93
+ responseOptions: {},
94
+ });
95
+ return { consumedProducts: productList, stockMoveLine: res };
96
+ });
97
+ });
79
98
  const initialState = {
80
99
  loadingConsumedProducts: false,
81
100
  consumedProductList: [],
101
+ loadingConsumedProductStockMoveLine: false,
102
+ consumedProductStockMoveLine: {},
82
103
  loadingProducedProducts: false,
83
104
  producedProductList: [],
84
105
  };
@@ -108,6 +129,14 @@ const prodProductsSlice = createSlice({
108
129
  state.producedProductList = action.payload?.productList;
109
130
  }
110
131
  });
132
+ builder.addCase(addTrackingNumberToConsumedProduct.pending, state => {
133
+ state.loadingConsumedProductStockMoveLine = true;
134
+ });
135
+ builder.addCase(addTrackingNumberToConsumedProduct.fulfilled, (state, action) => {
136
+ state.loadingConsumedProductStockMoveLine = false;
137
+ state.consumedProductList = action.payload?.consumedProducts;
138
+ state.consumedProductStockMoveLine = action.payload?.stockMoveLine;
139
+ });
111
140
  },
112
141
  });
113
142
  export const prodProductsReducer = prodProductsSlice.reducer;
@@ -1 +1 @@
1
- {"version":3,"file":"prodProductSlice.js","sourceRoot":"","sources":["../../src/features/prodProductSlice.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"prodProductSlice.js","sourceRoot":"","sources":["../../src/features/prodProductSlice.js"],"names":[],"mappings":"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"}
@@ -16,7 +16,7 @@
16
16
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
17
17
  */
18
18
  import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
19
- import { handlerApiCall } from '@axelor/aos-mobile-core';
19
+ import { generateInifiniteScrollCases, handlerApiCall, } from '@axelor/aos-mobile-core';
20
20
  import { searchProductionFile } from '../api/production-file-api';
21
21
  export const fetchProductionFile = createAsyncThunk('productionFile/fetchProductionFile', async function (data, { getState }) {
22
22
  return handlerApiCall({
@@ -37,33 +37,11 @@ const productionFileSlice = createSlice({
37
37
  name: 'productionFile',
38
38
  initialState,
39
39
  extraReducers: builder => {
40
- builder.addCase(fetchProductionFile.pending, (state, action) => {
41
- if (action.meta.arg.page === 0) {
42
- state.loading = true;
43
- }
44
- else {
45
- state.moreLoading = true;
46
- }
47
- });
48
- builder.addCase(fetchProductionFile.fulfilled, (state, action) => {
49
- state.loading = false;
50
- state.moreLoading = false;
51
- if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
52
- state.productionFileList = action.payload;
53
- state.isListEnd = false;
54
- }
55
- else {
56
- if (action.payload != null) {
57
- state.isListEnd = false;
58
- state.productionFileList = [
59
- ...state.productionFileList,
60
- ...action.payload,
61
- ];
62
- }
63
- else {
64
- state.isListEnd = true;
65
- }
66
- }
40
+ generateInifiniteScrollCases(builder, fetchProductionFile, {
41
+ loading: 'loading',
42
+ moreLoading: 'moreLoading',
43
+ isListEnd: 'isListEnd',
44
+ list: 'productionFileList',
67
45
  });
68
46
  },
69
47
  });
@@ -1 +1 @@
1
- {"version":3,"file":"productionFileSlice.js","sourceRoot":"","sources":["../../src/features/productionFileSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAC,oBAAoB,EAAC,MAAM,4BAA4B,CAAC;AAEhE,MAAM,CAAC,MAAM,mBAAmB,GAAG,gBAAgB,CACjD,oCAAoC,EACpC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,oBAAoB;QACnC,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,+CAA+C;QACvD,QAAQ,EAAE,QAAQ;QAClB,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,KAAK;IACd,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;IAChB,kBAAkB,EAAE,EAAE;CACvB,CAAC;AAEF,MAAM,mBAAmB,GAAG,WAAW,CAAC;IACtC,IAAI,EAAE,gBAAgB;IACtB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC7D,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE;gBAC9B,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;aACtB;iBAAM;gBACL,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;aAC1B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC/D,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACtB,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;YAC1B,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE;gBAC9D,KAAK,CAAC,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC;gBAC1C,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;aACzB;iBAAM;gBACL,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,EAAE;oBAC1B,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;oBACxB,KAAK,CAAC,kBAAkB,GAAG;wBACzB,GAAG,KAAK,CAAC,kBAAkB;wBAC3B,GAAG,MAAM,CAAC,OAAO;qBAClB,CAAC;iBACH;qBAAM;oBACL,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;iBACxB;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,OAAO,CAAC"}
1
+ {"version":3,"file":"productionFileSlice.js","sourceRoot":"","sources":["../../src/features/productionFileSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,4BAA4B,EAC5B,cAAc,GACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,oBAAoB,EAAC,MAAM,4BAA4B,CAAC;AAEhE,MAAM,CAAC,MAAM,mBAAmB,GAAG,gBAAgB,CACjD,oCAAoC,EACpC,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,oBAAoB;QACnC,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,+CAA+C;QACvD,QAAQ,EAAE,QAAQ;QAClB,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,KAAK;IACd,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;IAChB,kBAAkB,EAAE,EAAE;CACvB,CAAC;AAEF,MAAM,mBAAmB,GAAG,WAAW,CAAC;IACtC,IAAI,EAAE,gBAAgB;IACtB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,4BAA4B,CAAC,OAAO,EAAE,mBAAmB,EAAE;YACzD,OAAO,EAAE,SAAS;YAClB,WAAW,EAAE,aAAa;YAC1B,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,oBAAoB;SAC3B,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,OAAO,CAAC"}
@@ -16,7 +16,7 @@
16
16
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
17
17
  */
18
18
  import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
19
- import { handlerApiCall } from '@axelor/aos-mobile-core';
19
+ import { generateInifiniteScrollCases, handlerApiCall, } from '@axelor/aos-mobile-core';
20
20
  import { createManufacturingOrderWasteProduct, declareManufacturingOrderWasteProduct, fetchManufacturingOrderWasteProducts, updateManufacturingOrderWasteProduct, } from '../api/waste-product-api';
21
21
  export const fetchWasteProducts = createAsyncThunk('wasteProducts/fetchWasteProducts', async function (data, { getState }) {
22
22
  return handlerApiCall({
@@ -76,33 +76,11 @@ const wasteProductsSlice = createSlice({
76
76
  },
77
77
  },
78
78
  extraReducers: builder => {
79
- builder.addCase(fetchWasteProducts.pending, (state, action) => {
80
- if (action.meta.arg.page === 0) {
81
- state.loading = true;
82
- }
83
- else {
84
- state.moreLoading = true;
85
- }
86
- });
87
- builder.addCase(fetchWasteProducts.fulfilled, (state, action) => {
88
- state.loading = false;
89
- state.moreLoading = false;
90
- if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
91
- state.wasteProductList = action.payload;
92
- state.isListEnd = false;
93
- }
94
- else {
95
- if (action.payload != null) {
96
- state.isListEnd = false;
97
- state.wasteProductList = [
98
- ...state.wasteProductList,
99
- ...action.payload,
100
- ];
101
- }
102
- else {
103
- state.isListEnd = true;
104
- }
105
- }
79
+ generateInifiniteScrollCases(builder, fetchWasteProducts, {
80
+ loading: 'loading',
81
+ moreLoading: 'moreLoading',
82
+ isListEnd: 'isListEnd',
83
+ list: 'wasteProductList',
106
84
  });
107
85
  builder.addCase(updateWasteProductOfManufOrder.fulfilled, (state, action) => {
108
86
  state.wasteProductList = action.payload;
@@ -1 +1 @@
1
- {"version":3,"file":"wasteProductsSlice.js","sourceRoot":"","sources":["../../src/features/wasteProductsSlice.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wasteProductsSlice.js","sourceRoot":"","sources":["../../src/features/wasteProductsSlice.js"],"names":[],"mappings":"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"}
@@ -16,7 +16,7 @@
16
16
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
17
17
  */
18
18
  import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
19
- import { handlerApiCall } from '@axelor/aos-mobile-core';
19
+ import { generateInifiniteScrollCases, handlerApiCall, } from '@axelor/aos-mobile-core';
20
20
  import { searchWorkCenterFilter } from '../api/work-center-api';
21
21
  export const searchWorkCenters = createAsyncThunk('workCenter/searchWorkCenter', async function (data, { getState }) {
22
22
  return handlerApiCall({
@@ -37,30 +37,11 @@ const workCentersSlice = createSlice({
37
37
  name: 'workCenters',
38
38
  initialState,
39
39
  extraReducers: builder => {
40
- builder.addCase(searchWorkCenters.pending, (state, action) => {
41
- if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
42
- state.loading = true;
43
- }
44
- else {
45
- state.moreLoading = true;
46
- }
47
- });
48
- builder.addCase(searchWorkCenters.fulfilled, (state, action) => {
49
- state.loading = false;
50
- state.moreLoading = false;
51
- if (action.meta.arg.page === 0 || action.meta.arg.page == null) {
52
- state.workCenterList = action.payload;
53
- state.isListEnd = false;
54
- }
55
- else {
56
- if (action.payload != null) {
57
- state.isListEnd = false;
58
- state.workCenterList = [...state.workCenterList, ...action.payload];
59
- }
60
- else {
61
- state.isListEnd = true;
62
- }
63
- }
40
+ generateInifiniteScrollCases(builder, searchWorkCenters, {
41
+ loading: 'loading',
42
+ moreLoading: 'moreLoading',
43
+ isListEnd: 'isListEnd',
44
+ list: 'workCenterList',
64
45
  });
65
46
  },
66
47
  });
@@ -1 +1 @@
1
- {"version":3,"file":"workCentersSlice.js","sourceRoot":"","sources":["../../src/features/workCentersSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAC,sBAAsB,EAAC,MAAM,wBAAwB,CAAC;AAE9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,gBAAgB,CAC/C,6BAA6B,EAC7B,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,sBAAsB;QACrC,IAAI;QACJ,MAAM,EAAE,4CAA4C;QACpD,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,KAAK;IACd,cAAc,EAAE,EAAE;IAClB,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;CACjB,CAAC;AAEF,MAAM,gBAAgB,GAAG,WAAW,CAAC;IACnC,IAAI,EAAE,aAAa;IACnB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC3D,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE;gBAC9D,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;aACtB;iBAAM;gBACL,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;aAC1B;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC7D,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;YACtB,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;YAC1B,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE;gBAC9D,KAAK,CAAC,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC;gBACtC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;aACzB;iBAAM;gBACL,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,EAAE;oBAC1B,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;oBACxB,KAAK,CAAC,cAAc,GAAG,CAAC,GAAG,KAAK,CAAC,cAAc,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;iBACrE;qBAAM;oBACL,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;iBACxB;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,OAAO,CAAC"}
1
+ {"version":3,"file":"workCentersSlice.js","sourceRoot":"","sources":["../../src/features/workCentersSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,4BAA4B,EAC5B,cAAc,GACf,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,sBAAsB,EAAC,MAAM,wBAAwB,CAAC;AAE9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,gBAAgB,CAC/C,6BAA6B,EAC7B,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,sBAAsB;QACrC,IAAI;QACJ,MAAM,EAAE,4CAA4C;QACpD,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,IAAI,EAAC;KACzC,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,OAAO,EAAE,KAAK;IACd,cAAc,EAAE,EAAE;IAClB,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;CACjB,CAAC;AAEF,MAAM,gBAAgB,GAAG,WAAW,CAAC;IACnC,IAAI,EAAE,aAAa;IACnB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,4BAA4B,CAAC,OAAO,EAAE,iBAAiB,EAAE;YACvD,OAAO,EAAE,SAAS;YAClB,WAAW,EAAE,aAAa;YAC1B,SAAS,EAAE,WAAW;YACtB,IAAI,EAAE,gBAAgB;SACvB,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,OAAO,CAAC"}
package/lib/i18n/en.json CHANGED
@@ -63,5 +63,6 @@
63
63
  "Manufacturing_SliceAction_CreateWasteProduct": "create new waste product",
64
64
  "Manufacturing_SliceAction_UpdateWasteProductQty": "update waste product qty",
65
65
  "Manufacturing_SliceAction_DeclareWasteProducts": "declare waste products",
66
- "Manufacturing_SliceAction_FilterWorkCenter": "filter work center"
66
+ "Manufacturing_SliceAction_FilterWorkCenter": "filter work center",
67
+ "Manufacturing_SliceAction_AddTrackingNumberToConsumedProductStockMoveLine": "add tracking number to consumed product stock move line"
67
68
  }
package/lib/i18n/fr.json CHANGED
@@ -63,5 +63,6 @@
63
63
  "Manufacturing_SliceAction_CreateWasteProduct": "création d'un rebut",
64
64
  "Manufacturing_SliceAction_UpdateWasteProductQty": "mise à jour de la quantité d'un produit rebut",
65
65
  "Manufacturing_SliceAction_DeclareWasteProducts": "déclaration des rebuts",
66
- "Manufacturing_SliceAction_FilterWorkCenter": "filtre des postes de charge"
66
+ "Manufacturing_SliceAction_FilterWorkCenter": "filtre des postes de charge",
67
+ "Manufacturing_SliceAction_AddTrackingNumberToConsumedProductStockMoveLine": "ajouter un numéro de suivi à la ligne de déplacement du stock de produits consommés"
67
68
  }
package/lib/index.js CHANGED
@@ -27,6 +27,10 @@ export const ManufacturingModule = {
27
27
  title: 'Manufacturing_Manufacturing',
28
28
  subtitle: 'Manufacturing_Manufacturing',
29
29
  icon: 'cogs',
30
+ compatibilityAOS: {
31
+ moduleName: 'axelor-production',
32
+ downToVersion: '6.4.0',
33
+ },
30
34
  menus: {
31
35
  manufacturing_menu_manufacturing_order: {
32
36
  title: 'Manufacturing_ManufacturingOrder',
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,yBAAyB,MAAM,8BAA8B,CAAC;AACrE,OAAO,qBAAqB,MAAM,0BAA0B,CAAC;AAC7D,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,qBAAqB,MAAM,YAAY,CAAC;AACpD,OAAO,EACL,sBAAsB,EACtB,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,uBAAuB,EAAC,MAAM,mCAAmC,CAAC;AAE1E,MAAM,CAAC,MAAM,mBAAmB,GAAW;IACzC,IAAI,EAAE,mBAAmB;IACzB,KAAK,EAAE,6BAA6B;IACpC,QAAQ,EAAE,6BAA6B;IACvC,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE;QACL,sCAAsC,EAAE;YACtC,KAAK,EAAE,kCAAkC;YACzC,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE,8BAA8B;SACvC;QACD,kCAAkC,EAAE;YAClC,KAAK,EAAE,8BAA8B;YACrC,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,0BAA0B;SACnC;QACD,2CAA2C,EAAE;YAC3C,KAAK,EAAE,qCAAqC;YAC5C,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,8BAA8B;SACvC;KACF;IACD,OAAO,EAAE;QACP,GAAG,yBAAyB;QAC5B,GAAG,qBAAqB;KACzB;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,EAAE,EAAE,cAAc;KACnB;IACD,QAAQ,EAAE;QACR,GAAG,qBAAqB;KACzB;IACD,MAAM,EAAE;QACN,YAAY,EAAE,EAAC,GAAG,sBAAsB,EAAC;QACzC,UAAU,EAAE,EAAC,GAAG,wBAAwB,EAAC;QACzC,YAAY,EAAE,EAAC,GAAG,0BAA0B,EAAC;QAC7C,eAAe,EAAE,uBAAuB;KACzC;CACF,CAAC;AAEF,cAAc,cAAc,CAAC;AAE7B,OAAO,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,iCAAiC,CAAC;AAEhD,cAAc,8CAA8C,CAAC;AAC7D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,yBAAyB,MAAM,8BAA8B,CAAC;AACrE,OAAO,qBAAqB,MAAM,0BAA0B,CAAC;AAC7D,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,qBAAqB,MAAM,YAAY,CAAC;AACpD,OAAO,EACL,sBAAsB,EACtB,0BAA0B,EAC1B,wBAAwB,GACzB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,uBAAuB,EAAC,MAAM,mCAAmC,CAAC;AAE1E,MAAM,CAAC,MAAM,mBAAmB,GAAW;IACzC,IAAI,EAAE,mBAAmB;IACzB,KAAK,EAAE,6BAA6B;IACpC,QAAQ,EAAE,6BAA6B;IACvC,IAAI,EAAE,MAAM;IACZ,gBAAgB,EAAE;QAChB,UAAU,EAAE,mBAAmB;QAC/B,aAAa,EAAE,OAAO;KACvB;IACD,KAAK,EAAE;QACL,sCAAsC,EAAE;YACtC,KAAK,EAAE,kCAAkC;YACzC,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE,8BAA8B;SACvC;QACD,kCAAkC,EAAE;YAClC,KAAK,EAAE,8BAA8B;YACrC,IAAI,EAAE,eAAe;YACrB,MAAM,EAAE,0BAA0B;SACnC;QACD,2CAA2C,EAAE;YAC3C,KAAK,EAAE,qCAAqC;YAC5C,IAAI,EAAE,cAAc;YACpB,MAAM,EAAE,8BAA8B;SACvC;KACF;IACD,OAAO,EAAE;QACP,GAAG,yBAAyB;QAC5B,GAAG,qBAAqB;KACzB;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,EAAE,EAAE,cAAc;KACnB;IACD,QAAQ,EAAE;QACR,GAAG,qBAAqB;KACzB;IACD,MAAM,EAAE;QACN,YAAY,EAAE,EAAC,GAAG,sBAAsB,EAAC;QACzC,UAAU,EAAE,EAAC,GAAG,wBAAwB,EAAC;QACzC,YAAY,EAAE,EAAC,GAAG,0BAA0B,EAAC;QAC7C,eAAe,EAAE,uBAAuB;KACzC;CACF,CAAC;AAEF,cAAc,cAAc,CAAC;AAE7B,OAAO,EAAC,oBAAoB,EAAC,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAC,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAEpD,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,iCAAiC,CAAC;AAEhD,cAAc,8CAA8C,CAAC;AAC7D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC"}
@@ -15,22 +15,32 @@
15
15
  * You should have received a copy of the GNU Affero General Public License
16
16
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
17
17
  */
18
- import React, { useCallback, useEffect, useState } from 'react';
18
+ import React, { useCallback, useEffect, useMemo, useState } from 'react';
19
19
  import { HeaderContainer, Screen, ScrollView, Text } from '@axelor/aos-mobile-ui';
20
20
  import { useDispatch, useSelector, useTranslator } from '@axelor/aos-mobile-core';
21
21
  import { fetchProductWithId, QuantityCard, ProductCardInfo, } from '@axelor/aos-mobile-stock';
22
- import { ManufacturingOrderHeader, ProdProductFixedItems, } from '../../../components';
22
+ import { ConsumedProductTrackingNumberSelect, ManufacturingOrderHeader, ProdProductFixedItems, } from '../../../components';
23
23
  import { addProdProductToManufOrder, updateProdProductOfManufOrder, } from '../../../features/prodProductSlice';
24
24
  import { ManufacturingOrder } from '../../../types';
25
25
  const ConsumedProductDetailsScreen = ({ route, navigation }) => {
26
26
  const manufOrder = route.params.manufOrder;
27
27
  const consumedProduct = route.params.consumedProduct;
28
- const trackingNumber = route.params.trackingNumber;
29
28
  const I18n = useTranslator();
30
29
  const dispatch = useDispatch();
31
30
  const { loadingProductFromId, productFromId } = useSelector(state => state.product);
31
+ const { consumedProductStockMoveLine } = useSelector(state => state.prodProducts);
32
32
  const product = consumedProduct ? productFromId : route.params.product;
33
33
  const [consumedQty, setConsumedQty] = useState(consumedProduct ? consumedProduct.realQty : 0);
34
+ const trackingNumber = useMemo(() => route.params.trackingNumber ||
35
+ consumedProduct.trackingNumber ||
36
+ (consumedProduct?.stockMoveLineId === consumedProductStockMoveLine?.id
37
+ ? consumedProductStockMoveLine.trackingNumber
38
+ : null), [
39
+ route.params.trackingNumber,
40
+ consumedProduct,
41
+ consumedProductStockMoveLine,
42
+ ]);
43
+ const isTrackingNumberSelectVisible = useMemo(() => product?.trackingNumberConfiguration != null && trackingNumber == null, [product, trackingNumber]);
34
44
  useEffect(() => {
35
45
  if (consumedProduct != null) {
36
46
  dispatch(fetchProductWithId(consumedProduct.productId));
@@ -66,7 +76,9 @@ const ConsumedProductDetailsScreen = ({ route, navigation }) => {
66
76
  ]);
67
77
  const handleUpdateConsumedProduct = useCallback(() => {
68
78
  dispatch(updateProdProductOfManufOrder({
69
- stockMoveLineVersion: consumedProduct?.stockMoveLineVersion,
79
+ stockMoveLineVersion: consumedProduct?.stockMoveLineId === consumedProductStockMoveLine?.id
80
+ ? consumedProductStockMoveLine.version
81
+ : consumedProduct?.stockMoveLineVersion,
70
82
  stockMoveLineId: consumedProduct?.stockMoveLineId,
71
83
  prodProductQty: consumedQty,
72
84
  type: 'consumed',
@@ -76,6 +88,7 @@ const ConsumedProductDetailsScreen = ({ route, navigation }) => {
76
88
  handleNavigateBackToList();
77
89
  }, [
78
90
  consumedProduct,
91
+ consumedProductStockMoveLine,
79
92
  consumedQty,
80
93
  dispatch,
81
94
  handleNavigateBackToList,
@@ -88,6 +101,7 @@ const ConsumedProductDetailsScreen = ({ route, navigation }) => {
88
101
  trackingNumber == null
89
102
  ? null
90
103
  : trackingNumber.trackingNumberSeq} onPress={handleShowProduct}/>)}
104
+ <ConsumedProductTrackingNumberSelect product={product} stockMoveLineId={consumedProduct?.stockMoveLineId} stockMoveLineVersion={consumedProduct?.stockMoveLineVersion} manufOrderId={manufOrder?.id} manufOrderVersion={manufOrder?.version} visible={isTrackingNumberSelectVisible}/>
91
105
  <QuantityCard labelQty={I18n.t('Manufacturing_ConsumedQty')} defaultValue={consumedQty} onValueChange={setConsumedQty} editable={manufOrder?.statusSelect === ManufacturingOrder.status.InProgress}>
92
106
  <Text>
93
107
  {`${I18n.t('Manufacturing_PlannedQty')}: ${parseFloat(consumedProduct ? consumedProduct.plannedQty : 0).toFixed(2)} ${consumedProduct
@@ -1 +1 @@
1
- {"version":3,"file":"ConsumedProductDetailsScreen.js","sourceRoot":"","sources":["../../../../src/screens/manufactoringOrder/consumedProduct/ConsumedProductDetailsScreen.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ConsumedProductDetailsScreen.js","sourceRoot":"","sources":["../../../../src/screens/manufactoringOrder/consumedProduct/ConsumedProductDetailsScreen.js"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@axelor/aos-mobile-manufacturing",
3
- "version": "7.0.0",
3
+ "version": "7.0.2",
4
4
  "author": "Axelor",
5
5
  "license": "AGPL-3.0-only",
6
6
  "publishConfig": {
@@ -28,9 +28,9 @@
28
28
  "react-i18next": "^11.18.6"
29
29
  },
30
30
  "dependencies": {
31
- "@axelor/aos-mobile-core": "7.0.0",
32
- "@axelor/aos-mobile-stock": "7.0.0",
33
- "@axelor/aos-mobile-ui": "7.0.0",
31
+ "@axelor/aos-mobile-core": "7.0.2",
32
+ "@axelor/aos-mobile-stock": "7.0.2",
33
+ "@axelor/aos-mobile-ui": "7.0.2",
34
34
  "@reduxjs/toolkit": "^1.8.5"
35
35
  },
36
36
  "devDependencies": {