@axelor/aos-mobile-manufacturing 8.0.6 → 8.1.0
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/README.md +1 -1
- package/lib/api/manufacturing-order-api.d.ts +5 -3
- package/lib/api/manufacturing-order-api.js +27 -10
- package/lib/api/manufacturing-order-api.js.map +1 -1
- package/lib/api/operation-order-api.d.ts +5 -2
- package/lib/api/operation-order-api.js +33 -9
- package/lib/api/operation-order-api.js.map +1 -1
- package/lib/api/waste-product-api.d.ts +2 -1
- package/lib/api/waste-product-api.js +16 -15
- package/lib/api/waste-product-api.js.map +1 -1
- package/lib/components/molecules/ManufacturingOrderDatesCard/ManufacturingOrderDatesCard.d.ts +2 -2
- package/lib/components/molecules/ManufacturingOrderDatesCard/ManufacturingOrderDatesCard.js +5 -4
- package/lib/components/molecules/ManufacturingOrderDatesCard/ManufacturingOrderDatesCard.js.map +1 -1
- package/lib/components/molecules/OperationOrderDatesCard/OperationOrderDatesCard.d.ts +2 -2
- package/lib/components/molecules/OperationOrderDatesCard/OperationOrderDatesCard.js +10 -6
- package/lib/components/molecules/OperationOrderDatesCard/OperationOrderDatesCard.js.map +1 -1
- package/lib/components/organisms/ConsumedProductCard/ConsumedProductCard.d.ts +2 -1
- package/lib/components/organisms/ConsumedProductGlobalCard/ConsumedProductGlobalCard.d.ts +2 -1
- package/lib/components/organisms/ConsumedProductGlobalCard/ConsumedProductGlobalCard.js +7 -10
- package/lib/components/organisms/ConsumedProductGlobalCard/ConsumedProductGlobalCard.js.map +1 -1
- package/lib/components/organisms/LinkedManufacturingOrderCard/LinkedManufacturingOrderCard.d.ts +2 -1
- package/lib/components/organisms/LinkedManufacturingOrderCard/LinkedManufacturingOrderCard.js +6 -7
- package/lib/components/organisms/LinkedManufacturingOrderCard/LinkedManufacturingOrderCard.js.map +1 -1
- package/lib/components/organisms/ManufacturingOrderButtons/ManufacturingOrderButtons.d.ts +2 -1
- package/lib/components/organisms/ManufacturingOrderButtons/ManufacturingOrderButtons.js +15 -9
- package/lib/components/organisms/ManufacturingOrderButtons/ManufacturingOrderButtons.js.map +1 -1
- package/lib/components/organisms/ManufacturingOrderCard/ManufacturingOrderCard.d.ts +2 -1
- package/lib/components/organisms/ManufacturingOrderCard/ManufacturingOrderCard.js +13 -10
- package/lib/components/organisms/ManufacturingOrderCard/ManufacturingOrderCard.js.map +1 -1
- package/lib/components/organisms/ManufacturingOrderHalfLabelCardList/ManufacturingOrderHalfLabelCardList.d.ts +2 -1
- package/lib/components/organisms/ManufacturingOrderHeader/ManufacturingOrderHeader.d.ts +2 -1
- package/lib/components/organisms/ManufacturingOrderHeader/ManufacturingOrderHeader.js +8 -8
- package/lib/components/organisms/ManufacturingOrderHeader/ManufacturingOrderHeader.js.map +1 -1
- package/lib/components/organisms/ManufacturingOrderNotesCardList/ManufacturingOrderNotesCardList.d.ts +2 -1
- package/lib/components/organisms/ManufacturingOrderProductionOrderSetView/ManufacturingOrderProductionOrderSetView.d.ts +2 -1
- package/lib/components/organisms/ManufacturingOrderSaleOrderSetView/ManufacturingOrderSaleOrderSetView.d.ts +2 -1
- package/lib/components/organisms/OperationOrderCard/OperationOrderCard.d.ts +2 -1
- package/lib/components/organisms/OperationOrderCard/OperationOrderCard.js +5 -4
- package/lib/components/organisms/OperationOrderCard/OperationOrderCard.js.map +1 -1
- package/lib/components/organisms/OperationOrderDetailsCard/OperationOrderDetailsCard.d.ts +2 -1
- package/lib/components/organisms/OperationOrderDetailsCard/OperationOrderDetailsCard.js +11 -10
- package/lib/components/organisms/OperationOrderDetailsCard/OperationOrderDetailsCard.js.map +1 -1
- package/lib/components/organisms/OperationOrderHeader/OperationOrderHeader.d.ts +2 -2
- package/lib/components/organisms/OperationOrderHeader/OperationOrderHeader.js +4 -4
- package/lib/components/organisms/OperationOrderHeader/OperationOrderHeader.js.map +1 -1
- package/lib/components/organisms/OperationOrderLabelTextList/OperationOrderLabelTextList.d.ts +2 -2
- package/lib/components/organisms/OperationOrderStopwatch/OperationOrderStopwatch.d.ts +2 -1
- package/lib/components/organisms/OperationOrderStopwatch/OperationOrderStopwatch.js +8 -4
- package/lib/components/organisms/OperationOrderStopwatch/OperationOrderStopwatch.js.map +1 -1
- package/lib/components/organisms/ProdProductFixedItems/ProdProductFixedItems.d.ts +2 -1
- package/lib/components/organisms/ProdProductFixedItems/ProdProductFixedItems.js +11 -2
- package/lib/components/organisms/ProdProductFixedItems/ProdProductFixedItems.js.map +1 -1
- package/lib/components/organisms/ProducedProductCard/ProducedProductCard.d.ts +2 -1
- package/lib/components/organisms/ProductionFileLargeCard/ProductionFileLargeCard.d.ts +2 -2
- package/lib/components/organisms/ProductionFileSmallCard/ProductionFileSmallCard.d.ts +2 -2
- package/lib/components/organisms/WasteProductCard/WasteProductCard.d.ts +2 -1
- package/lib/components/templates/ConsumedProductTrackingNumberSelect/ConsumedProductTrackingNumberSelect.d.ts +2 -1
- package/lib/components/templates/MachineSearchBar/MachineSearchBar.d.ts +2 -1
- package/lib/components/templates/WorkCenterSearchBar/WorkCenterSearchBar.d.ts +2 -1
- package/lib/features/machinesSlice.d.ts +1 -10
- package/lib/features/manufacturingOrderSlice.d.ts +5 -50
- package/lib/features/operationOrderSlice.d.ts +4 -40
- package/lib/features/prodProductSlice.d.ts +8 -80
- package/lib/features/productionFileSlice.d.ts +1 -10
- package/lib/features/wasteProductsSlice.d.ts +5 -41
- package/lib/features/workCentersSlice.d.ts +1 -10
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/models/index.d.ts +1 -0
- package/lib/models/index.js +1 -0
- package/lib/models/index.js.map +1 -1
- package/lib/models/searchFields.js +1 -0
- package/lib/models/searchFields.js.map +1 -1
- package/lib/models/typeObjects.d.ts +2 -0
- package/lib/models/typeObjects.js +169 -0
- package/lib/models/typeObjects.js.map +1 -0
- package/lib/screens/manufactoringOrder/ManufacturingOrderDetailsScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/ManufacturingOrderListProductionOrderScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/ManufacturingOrderListSaleOrderScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/ManufacturingOrderListScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/ManufacturingOrderListScreen.js +24 -65
- package/lib/screens/manufactoringOrder/ManufacturingOrderListScreen.js.map +1 -1
- package/lib/screens/manufactoringOrder/ManufacturingOrderOperationListScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/ManufacturingOrderOperationListScreen.js +15 -27
- package/lib/screens/manufactoringOrder/ManufacturingOrderOperationListScreen.js.map +1 -1
- package/lib/screens/manufactoringOrder/consumedProduct/ChildrenManufOrderListScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/consumedProduct/ChildrenManufOrderListScreen.js +16 -32
- package/lib/screens/manufactoringOrder/consumedProduct/ChildrenManufOrderListScreen.js.map +1 -1
- package/lib/screens/manufactoringOrder/consumedProduct/ConsumedProductDetailsScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/consumedProduct/ConsumedProductDetailsScreen.js +9 -5
- package/lib/screens/manufactoringOrder/consumedProduct/ConsumedProductDetailsScreen.js.map +1 -1
- package/lib/screens/manufactoringOrder/consumedProduct/ConsumedProductListScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/consumedProduct/ConsumedProductListScreen.js +11 -6
- package/lib/screens/manufactoringOrder/consumedProduct/ConsumedProductListScreen.js.map +1 -1
- package/lib/screens/manufactoringOrder/consumedProduct/ConsumedProductSelectProductScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/consumedProduct/ConsumedProductSelectTrackingScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/index.d.ts +18 -17
- package/lib/screens/manufactoringOrder/index.js +1 -0
- package/lib/screens/manufactoringOrder/index.js.map +1 -1
- package/lib/screens/manufactoringOrder/producedProduct/ProducedProductDetailsScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/producedProduct/ProducedProductDetailsScreen.js +8 -5
- package/lib/screens/manufactoringOrder/producedProduct/ProducedProductDetailsScreen.js.map +1 -1
- package/lib/screens/manufactoringOrder/producedProduct/ProducedProductListScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/producedProduct/ProducedProductListScreen.js +9 -5
- package/lib/screens/manufactoringOrder/producedProduct/ProducedProductListScreen.js.map +1 -1
- package/lib/screens/manufactoringOrder/producedProduct/ProducedProductSelectProductScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/producedProduct/ProducedProductSelectTrackingScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/wasteProduct/WasteProductDetailsScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/wasteProduct/WasteProductDetailsScreen.js +10 -5
- package/lib/screens/manufactoringOrder/wasteProduct/WasteProductDetailsScreen.js.map +1 -1
- package/lib/screens/manufactoringOrder/wasteProduct/WasteProductListScreen.d.ts +2 -1
- package/lib/screens/manufactoringOrder/wasteProduct/WasteProductListScreen.js +19 -22
- package/lib/screens/manufactoringOrder/wasteProduct/WasteProductListScreen.js.map +1 -1
- package/lib/screens/manufactoringOrder/wasteProduct/WasteProductSelectProductScreen.d.ts +2 -1
- package/lib/screens/operationOrder/OperationOrderDetailsScreen.d.ts +2 -1
- package/lib/screens/operationOrder/OperationOrderListScreen.d.ts +2 -1
- package/lib/screens/operationOrder/OperationOrderListScreen.js +23 -53
- package/lib/screens/operationOrder/OperationOrderListScreen.js.map +1 -1
- package/lib/screens/operationOrder/OperationOrderPlanningScreen.d.ts +2 -1
- package/lib/screens/operationOrder/OperationOrderPlanningScreen.js +24 -5
- package/lib/screens/operationOrder/OperationOrderPlanningScreen.js.map +1 -1
- package/lib/screens/operationOrder/ProductionFileScreen.d.ts +2 -1
- package/lib/screens/operationOrder/index.d.ts +3 -0
- package/lib/screens/operationOrder/index.js +2 -0
- package/lib/screens/operationOrder/index.js.map +1 -1
- package/lib/types/manufacturing-order.d.ts +0 -25
- package/lib/types/manufacturing-order.js +2 -97
- package/lib/types/manufacturing-order.js.map +1 -1
- package/lib/types/operation-order.d.ts +0 -13
- package/lib/types/operation-order.js +8 -79
- package/lib/types/operation-order.js.map +1 -1
- package/lib/utils/dates.d.ts +2 -10
- package/lib/utils/dates.js +1 -1
- package/lib/utils/dates.js.map +1 -1
- package/package.json +10 -14
package/README.md
CHANGED
|
@@ -23,7 +23,7 @@ Install the library :
|
|
|
23
23
|
yarn add @axelor/aos-mobile-manufacturing
|
|
24
24
|
```
|
|
25
25
|
|
|
26
|
-
Compatibility with React v18.2.x and React Native v0.
|
|
26
|
+
Compatibility with React v18.2.x and React Native v0.70.x.
|
|
27
27
|
|
|
28
28
|
To add this package in your application, you need to add it in the _modules_ props of the component `Application` from @axelor/aos-mobile-core package. This package is dependent on the stock module, so both modules must be added to make it work.
|
|
29
29
|
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
export function searchManufacturingOrderFilter({ companyId, workshopId,
|
|
2
|
-
companyId?: any;
|
|
3
|
-
workshopId?: any;
|
|
1
|
+
export function searchManufacturingOrderFilter({ searchValue, companyId, manageWorkshop, workshopId, statusList, productId, page, }: {
|
|
4
2
|
searchValue?: any;
|
|
3
|
+
companyId?: any;
|
|
5
4
|
manageWorkshop: any;
|
|
5
|
+
workshopId?: any;
|
|
6
|
+
statusList: any;
|
|
7
|
+
productId: any;
|
|
6
8
|
page?: number;
|
|
7
9
|
}): Promise<any>;
|
|
8
10
|
export function fetchManufacturingOrder({ manufOrderId }: {
|
|
@@ -15,14 +15,14 @@
|
|
|
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 { axiosApiProvider, createStandardFetch, createStandardSearch, getSearchCriterias, } from '@axelor/aos-mobile-core';
|
|
19
|
-
|
|
20
|
-
const
|
|
18
|
+
import { axiosApiProvider, createStandardFetch, createStandardSearch, getSearchCriterias, getTypes, } from '@axelor/aos-mobile-core';
|
|
19
|
+
const createManufOrderCriteria = (searchValue, companyId, manageWorkshop, workshopId, statusList, productId) => {
|
|
20
|
+
const ManufOrder = getTypes().ManufOrder;
|
|
21
21
|
let criterias = [
|
|
22
22
|
{
|
|
23
23
|
fieldName: 'typeSelect',
|
|
24
24
|
operator: '=',
|
|
25
|
-
value:
|
|
25
|
+
value: ManufOrder?.typeSelect.production,
|
|
26
26
|
},
|
|
27
27
|
{
|
|
28
28
|
operator: 'OR',
|
|
@@ -30,22 +30,22 @@ const createManufOrderCriteria = (companyId, workshopId, manageWorkshop, searchV
|
|
|
30
30
|
{
|
|
31
31
|
fieldName: 'statusSelect',
|
|
32
32
|
operator: '=',
|
|
33
|
-
value:
|
|
33
|
+
value: ManufOrder?.statusSelect.Planned,
|
|
34
34
|
},
|
|
35
35
|
{
|
|
36
36
|
fieldName: 'statusSelect',
|
|
37
37
|
operator: '=',
|
|
38
|
-
value:
|
|
38
|
+
value: ManufOrder?.statusSelect.InProgress,
|
|
39
39
|
},
|
|
40
40
|
{
|
|
41
41
|
fieldName: 'statusSelect',
|
|
42
42
|
operator: '=',
|
|
43
|
-
value:
|
|
43
|
+
value: ManufOrder?.statusSelect.StandBy,
|
|
44
44
|
},
|
|
45
45
|
{
|
|
46
46
|
fieldName: 'statusSelect',
|
|
47
47
|
operator: '=',
|
|
48
|
-
value:
|
|
48
|
+
value: ManufOrder?.statusSelect.Finished,
|
|
49
49
|
},
|
|
50
50
|
],
|
|
51
51
|
},
|
|
@@ -75,12 +75,29 @@ const createManufOrderCriteria = (companyId, workshopId, manageWorkshop, searchV
|
|
|
75
75
|
],
|
|
76
76
|
});
|
|
77
77
|
}
|
|
78
|
+
if (Array.isArray(statusList) && statusList.length > 0) {
|
|
79
|
+
criterias.push({
|
|
80
|
+
operator: 'or',
|
|
81
|
+
criteria: statusList.map(status => ({
|
|
82
|
+
fieldName: 'statusSelect',
|
|
83
|
+
operator: '=',
|
|
84
|
+
value: status.key,
|
|
85
|
+
})),
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
if (productId != null) {
|
|
89
|
+
criterias.push({
|
|
90
|
+
fieldName: 'product.id',
|
|
91
|
+
operator: '=',
|
|
92
|
+
value: productId,
|
|
93
|
+
});
|
|
94
|
+
}
|
|
78
95
|
return criterias;
|
|
79
96
|
};
|
|
80
|
-
export async function searchManufacturingOrderFilter({
|
|
97
|
+
export async function searchManufacturingOrderFilter({ searchValue = null, companyId = null, manageWorkshop, workshopId = null, statusList, productId, page = 0, }) {
|
|
81
98
|
return createStandardSearch({
|
|
82
99
|
model: 'com.axelor.apps.production.db.ManufOrder',
|
|
83
|
-
criteria: createManufOrderCriteria(companyId, workshopId,
|
|
100
|
+
criteria: createManufOrderCriteria(searchValue, companyId, manageWorkshop, workshopId, statusList, productId),
|
|
84
101
|
fieldKey: 'manufacturing_manufacturingOrder',
|
|
85
102
|
sortKey: 'manufacturing_manufacturingOrder',
|
|
86
103
|
page,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manufacturing-order-api.js","sourceRoot":"","sources":["../../src/api/manufacturing-order-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"manufacturing-order-api.js","sourceRoot":"","sources":["../../src/api/manufacturing-order-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,EAClB,QAAQ,GACT,MAAM,yBAAyB,CAAC;AAEjC,MAAM,wBAAwB,GAAG,CAC/B,WAAW,EACX,SAAS,EACT,cAAc,EACd,UAAU,EACV,UAAU,EACV,SAAS,EACT,EAAE;IACF,MAAM,UAAU,GAAG,QAAQ,EAAE,CAAC,UAAU,CAAC;IAEzC,IAAI,SAAS,GAAG;QACd;YACE,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,UAAU;SACzC;QACD;YACE,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE;gBACR;oBACE,SAAS,EAAE,cAAc;oBACzB,QAAQ,EAAE,GAAG;oBACb,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,OAAO;iBACxC;gBACD;oBACE,SAAS,EAAE,cAAc;oBACzB,QAAQ,EAAE,GAAG;oBACb,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,UAAU;iBAC3C;gBACD;oBACE,SAAS,EAAE,cAAc;oBACzB,QAAQ,EAAE,GAAG;oBACb,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,OAAO;iBACxC;gBACD;oBACE,SAAS,EAAE,cAAc;oBACzB,QAAQ,EAAE,GAAG;oBACb,KAAK,EAAE,UAAU,EAAE,YAAY,CAAC,QAAQ;iBACzC;aACF;SACF;QACD,kBAAkB,CAAC,kCAAkC,EAAE,WAAW,CAAC;KACpE,CAAC;IAEF,IAAI,SAAS,IAAI,IAAI,EAAE;QACrB,SAAS,CAAC,IAAI,CAAC;YACb,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;KACJ;IAED,IAAI,UAAU,IAAI,IAAI,IAAI,cAAc,EAAE;QACxC,SAAS,CAAC,IAAI,CAAC;YACb,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE;gBACR;oBACE,SAAS,EAAE,0BAA0B;oBACrC,QAAQ,EAAE,GAAG;oBACb,KAAK,EAAE,UAAU;iBAClB;gBACD;oBACE,SAAS,EAAE,8CAA8C;oBACzD,QAAQ,EAAE,GAAG;oBACb,KAAK,EAAE,UAAU;iBAClB;aACF;SACF,CAAC,CAAC;KACJ;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACtD,SAAS,CAAC,IAAI,CAAC;YACb,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAClC,SAAS,EAAE,cAAc;gBACzB,QAAQ,EAAE,GAAG;gBACb,KAAK,EAAE,MAAM,CAAC,GAAG;aAClB,CAAC,CAAC;SACJ,CAAC,CAAC;KACJ;IAED,IAAI,SAAS,IAAI,IAAI,EAAE;QACrB,SAAS,CAAC,IAAI,CAAC;YACb,SAAS,EAAE,YAAY;YACvB,QAAQ,EAAE,GAAG;YACb,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;KACJ;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,EACnD,WAAW,GAAG,IAAI,EAClB,SAAS,GAAG,IAAI,EAChB,cAAc,EACd,UAAU,GAAG,IAAI,EACjB,UAAU,EACV,SAAS,EACT,IAAI,GAAG,CAAC,GACT;IACC,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,0CAA0C;QACjD,QAAQ,EAAE,wBAAwB,CAChC,WAAW,EACX,SAAS,EACT,cAAc,EACd,UAAU,EACV,UAAU,EACV,SAAS,CACV;QACD,QAAQ,EAAE,kCAAkC;QAC5C,OAAO,EAAE,kCAAkC;QAC3C,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,EAAC,YAAY,EAAC;IAC1D,OAAO,mBAAmB,CAAC;QACzB,KAAK,EAAE,0CAA0C;QACjD,EAAE,EAAE,YAAY;QAChB,QAAQ,EAAE,kCAAkC;QAC5C,aAAa,EAAE,EAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAC;KACtD,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wCAAwC,CAAC,EAC7D,mBAAmB,EACnB,IAAI,GAAG,CAAC,GACT;IACC,IAAI,mBAAmB,IAAI,IAAI,EAAE;QAC/B,OAAO,IAAI,CAAC;KACb;IAED,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,+CAA+C;QACtD,MAAM,EAAE,gCAAgC;QACxC,aAAa,EAAE;YACb,kBAAkB,EAAE,mBAAmB,CAAC,GAAG,CACzC,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE,CACtC;SACF;QACD,QAAQ,EAAE,+BAA+B;QACzC,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,IAAI;KACZ,CAAC;SACC,IAAI,CAAC,GAAG,CAAC,EAAE;QACV,MAAM,MAAM,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC;QAE/B,MAAM,cAAc,GAAG,MAAM,EAAE,OAAO,CACpC,eAAe,CAAC,EAAE,CAAC,eAAe,EAAE,aAAa,CAClD,CAAC;QAEF,OAAO,cAAc,EAAE,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC,CAAC;SACD,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,4BAA4B,CAAC,EAAC,aAAa,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC;AAChF,CAAC;AAED,KAAK,UAAU,4BAA4B,CAAC,EAAC,aAAa,EAAE,IAAI,GAAG,CAAC,EAAC;IACnE,IAAI,aAAa,IAAI,IAAI,EAAE;QACzB,OAAO,IAAI,CAAC;KACb;IAED,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,0CAA0C;QACjD,MAAM,EAAE,2BAA2B;QACnC,aAAa,EAAE;YACb,aAAa,EAAE,aAAa;SAC7B;QACD,QAAQ,EAAE,uCAAuC;QACjD,OAAO,EAAE,kCAAkC;QAC3C,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gCAAgC,CAAC,EACrD,kBAAkB,EAClB,IAAI,GAAG,CAAC,GACT;IACC,OAAO,oBAAoB,CAAC;QAC1B,KAAK,EAAE,0CAA0C;QACjD,QAAQ,EAAE;YACR;gBACE,SAAS,EAAE,aAAa;gBACxB,QAAQ,EAAE,GAAG;gBACb,KAAK,EAAE,kBAAkB;aAC1B;SACF;QACD,QAAQ,EAAE,kCAAkC;QAC5C,OAAO,EAAE,kCAAkC;QAC3C,IAAI;KACL,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,EACnD,YAAY,EACZ,iBAAiB,EACjB,YAAY,GACb;IACC,OAAO,gBAAgB,CAAC,GAAG,CAAC;QAC1B,GAAG,EAAE,sBAAsB,YAAY,EAAE;QACzC,IAAI,EAAE;YACJ,OAAO,EAAE,iBAAiB;YAC1B,MAAM,EAAE,YAAY;SACrB;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
export function searchOperationOrderFilter({ manufOrderId,
|
|
2
|
-
manufOrderId?: any;
|
|
1
|
+
export function searchOperationOrderFilter({ searchValue, manufOrderId, statusList, workCenterId, machineId, page, }: {
|
|
3
2
|
searchValue?: any;
|
|
3
|
+
manufOrderId?: any;
|
|
4
|
+
statusList: any;
|
|
5
|
+
workCenterId: any;
|
|
6
|
+
machineId: any;
|
|
4
7
|
page?: number;
|
|
5
8
|
}): Promise<any>;
|
|
6
9
|
export function getPlannedOperationOrder(date: any): Promise<any>;
|
|
@@ -15,9 +15,9 @@
|
|
|
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 { axiosApiProvider, createStandardFetch, createStandardSearch, getNextMonth, getPreviousMonth, getSearchCriterias, } from '@axelor/aos-mobile-core';
|
|
19
|
-
|
|
20
|
-
const
|
|
18
|
+
import { axiosApiProvider, createStandardFetch, createStandardSearch, getNextMonth, getPreviousMonth, getSearchCriterias, getTypes, } from '@axelor/aos-mobile-core';
|
|
19
|
+
const createOperationOrderCriteria = (searchValue, manufOrderId, statusList, workCenterId, machineId) => {
|
|
20
|
+
const OperationOrder = getTypes().OperationOrder;
|
|
21
21
|
let criterias = [
|
|
22
22
|
{
|
|
23
23
|
operator: 'OR',
|
|
@@ -25,22 +25,22 @@ const createOperationOrderCriteria = (manufOrderId, searchValue) => {
|
|
|
25
25
|
{
|
|
26
26
|
fieldName: 'statusSelect',
|
|
27
27
|
operator: '=',
|
|
28
|
-
value: OperationOrder.
|
|
28
|
+
value: OperationOrder?.statusSelect.Planned,
|
|
29
29
|
},
|
|
30
30
|
{
|
|
31
31
|
fieldName: 'statusSelect',
|
|
32
32
|
operator: '=',
|
|
33
|
-
value: OperationOrder.
|
|
33
|
+
value: OperationOrder?.statusSelect.InProgress,
|
|
34
34
|
},
|
|
35
35
|
{
|
|
36
36
|
fieldName: 'statusSelect',
|
|
37
37
|
operator: '=',
|
|
38
|
-
value: OperationOrder.
|
|
38
|
+
value: OperationOrder?.statusSelect.StandBy,
|
|
39
39
|
},
|
|
40
40
|
{
|
|
41
41
|
fieldName: 'statusSelect',
|
|
42
42
|
operator: '=',
|
|
43
|
-
value: OperationOrder.
|
|
43
|
+
value: OperationOrder?.statusSelect.Finished,
|
|
44
44
|
},
|
|
45
45
|
],
|
|
46
46
|
},
|
|
@@ -53,6 +53,30 @@ const createOperationOrderCriteria = (manufOrderId, searchValue) => {
|
|
|
53
53
|
value: manufOrderId,
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
|
+
if (Array.isArray(statusList) && statusList.length > 0) {
|
|
57
|
+
criterias.push({
|
|
58
|
+
operator: 'or',
|
|
59
|
+
criteria: statusList.map(status => ({
|
|
60
|
+
fieldName: 'statusSelect',
|
|
61
|
+
operator: '=',
|
|
62
|
+
value: status.key,
|
|
63
|
+
})),
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
if (workCenterId != null) {
|
|
67
|
+
criterias.push({
|
|
68
|
+
fieldName: 'workCenter.id',
|
|
69
|
+
operator: '=',
|
|
70
|
+
value: workCenterId,
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
if (machineId != null) {
|
|
74
|
+
criterias.push({
|
|
75
|
+
fieldName: 'machine.id',
|
|
76
|
+
operator: '=',
|
|
77
|
+
value: machineId,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
56
80
|
return criterias;
|
|
57
81
|
};
|
|
58
82
|
const createOperationOrderPlanningCriteria = date => {
|
|
@@ -96,10 +120,10 @@ const createOperationOrderPlanningCriteria = date => {
|
|
|
96
120
|
},
|
|
97
121
|
];
|
|
98
122
|
};
|
|
99
|
-
export async function searchOperationOrderFilter({
|
|
123
|
+
export async function searchOperationOrderFilter({ searchValue = null, manufOrderId = null, statusList, workCenterId, machineId, page = 0, }) {
|
|
100
124
|
return createStandardSearch({
|
|
101
125
|
model: 'com.axelor.apps.production.db.OperationOrder',
|
|
102
|
-
criteria: createOperationOrderCriteria(manufOrderId,
|
|
126
|
+
criteria: createOperationOrderCriteria(searchValue, manufOrderId, statusList, workCenterId, machineId),
|
|
103
127
|
fieldKey: 'manufacturing_operationOrder',
|
|
104
128
|
sortKey: 'manufacturing_operationOrder',
|
|
105
129
|
page,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"operation-order-api.js","sourceRoot":"","sources":["../../src/api/operation-order-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"operation-order-api.js","sourceRoot":"","sources":["../../src/api/operation-order-api.js"],"names":[],"mappings":"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"}
|
|
@@ -15,24 +15,25 @@
|
|
|
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 { axiosApiProvider, createStandardSearch } from '@axelor/aos-mobile-core';
|
|
18
|
+
import { axiosApiProvider, createStandardSearch, getSearchCriterias, } from '@axelor/aos-mobile-core';
|
|
19
19
|
import { fetchManufacturingOrder } from './manufacturing-order-api';
|
|
20
|
-
const createWasteProductCriteria = wasteProdProductList => {
|
|
20
|
+
const createWasteProductCriteria = (searchValue, wasteProdProductList) => {
|
|
21
|
+
const criteria = [
|
|
22
|
+
getSearchCriterias('manufacturing_prodProduct', searchValue),
|
|
23
|
+
];
|
|
21
24
|
if (Array.isArray(wasteProdProductList) && wasteProdProductList.length > 0) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
},
|
|
31
|
-
];
|
|
25
|
+
criteria.push({
|
|
26
|
+
operator: 'or',
|
|
27
|
+
criteria: wasteProdProductList.map(prodProduct => ({
|
|
28
|
+
fieldName: 'id',
|
|
29
|
+
operator: '=',
|
|
30
|
+
value: prodProduct?.id,
|
|
31
|
+
})),
|
|
32
|
+
});
|
|
32
33
|
}
|
|
33
|
-
return
|
|
34
|
+
return criteria;
|
|
34
35
|
};
|
|
35
|
-
export async function fetchManufacturingOrderWasteProducts({ manufOrderId, page, }) {
|
|
36
|
+
export async function fetchManufacturingOrderWasteProducts({ searchValue = null, manufOrderId, page, }) {
|
|
36
37
|
return axiosApiProvider
|
|
37
38
|
.get({
|
|
38
39
|
url: `/ws/rest/com.axelor.apps.production.db.ManufOrder/${manufOrderId}`,
|
|
@@ -44,7 +45,7 @@ export async function fetchManufacturingOrderWasteProducts({ manufOrderId, page,
|
|
|
44
45
|
manufOrder.wasteProdProductList.length > 0) {
|
|
45
46
|
return createStandardSearch({
|
|
46
47
|
model: 'com.axelor.apps.production.db.ProdProduct',
|
|
47
|
-
criteria: createWasteProductCriteria(manufOrder.wasteProdProductList),
|
|
48
|
+
criteria: createWasteProductCriteria(searchValue, manufOrder.wasteProdProductList),
|
|
48
49
|
fieldKey: 'manufacturing_prodProduct',
|
|
49
50
|
page,
|
|
50
51
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waste-product-api.js","sourceRoot":"","sources":["../../src/api/waste-product-api.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"waste-product-api.js","sourceRoot":"","sources":["../../src/api/waste-product-api.js"],"names":[],"mappings":"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"}
|
package/lib/components/molecules/ManufacturingOrderDatesCard/ManufacturingOrderDatesCard.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
declare function ManufacturingOrderDatesCard({}: {}): JSX.Element;
|
|
1
|
+
import React from 'react';
|
|
2
|
+
declare function ManufacturingOrderDatesCard({}: {}): React.JSX.Element;
|
|
3
3
|
export default ManufacturingOrderDatesCard;
|
|
@@ -17,10 +17,11 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useMemo } from 'react';
|
|
19
19
|
import { FromTo, TitledValue } from '@axelor/aos-mobile-ui';
|
|
20
|
-
import { isEmpty, useSelector, useTranslator } from '@axelor/aos-mobile-core';
|
|
20
|
+
import { isEmpty, useSelector, useTranslator, useTypes, } from '@axelor/aos-mobile-core';
|
|
21
21
|
import { ManufacturingOrder } from '../../../types';
|
|
22
22
|
function ManufacturingOrderDatesCard({}) {
|
|
23
23
|
const I18n = useTranslator();
|
|
24
|
+
const { ManufOrder } = useTypes();
|
|
24
25
|
const { manufOrder } = useSelector((state) => state.manufacturingOrder);
|
|
25
26
|
const [startDate, endDate] = useMemo(() => {
|
|
26
27
|
if (!isEmpty(manufOrder)) {
|
|
@@ -28,10 +29,10 @@ function ManufacturingOrderDatesCard({}) {
|
|
|
28
29
|
}
|
|
29
30
|
return [];
|
|
30
31
|
}, [I18n, manufOrder]);
|
|
31
|
-
return (<FromTo fromComponent={<TitledValue title={manufOrder?.statusSelect ===
|
|
32
|
-
manufOrder?.statusSelect ===
|
|
32
|
+
return (<FromTo fromComponent={<TitledValue title={manufOrder?.statusSelect === ManufOrder?.statusSelect.Draft ||
|
|
33
|
+
manufOrder?.statusSelect === ManufOrder?.statusSelect.Planned
|
|
33
34
|
? I18n.t('Base_Estimated')
|
|
34
|
-
: I18n.t('Base_Real')} value={startDate?.value}/>} toComponent={<TitledValue title={manufOrder?.statusSelect ===
|
|
35
|
+
: I18n.t('Base_Real')} value={startDate?.value}/>} toComponent={<TitledValue title={manufOrder?.statusSelect === ManufOrder?.statusSelect.Finished
|
|
35
36
|
? I18n.t('Base_Real')
|
|
36
37
|
: I18n.t('Base_Estimated')} value={endDate?.value}/>}/>);
|
|
37
38
|
}
|
package/lib/components/molecules/ManufacturingOrderDatesCard/ManufacturingOrderDatesCard.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManufacturingOrderDatesCard.js","sourceRoot":"","sources":["../../../../src/components/molecules/ManufacturingOrderDatesCard/ManufacturingOrderDatesCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,
|
|
1
|
+
{"version":3,"file":"ManufacturingOrderDatesCard.js","sourceRoot":"","sources":["../../../../src/components/molecules/ManufacturingOrderDatesCard/ManufacturingOrderDatesCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EACL,OAAO,EACP,WAAW,EACX,aAAa,EACb,QAAQ,GACT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,kBAAkB,EAAC,MAAM,gBAAgB,CAAC;AAElD,SAAS,2BAA2B,CAAC,EAAE;IACrC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,EAAC,UAAU,EAAC,GAAG,QAAQ,EAAE,CAAC;IAEhC,MAAM,EAAC,UAAU,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAE3E,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE;QACxC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACxB,OAAO,kBAAkB,CAAC,QAAQ,CAChC,UAAU,EAAE,YAAY,EACxB,UAAU,EAAE,iBAAiB,EAC7B,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,cAAc,EAC1B,UAAU,EAAE,YAAY,EACxB,IAAI,CACL,CAAC;SACH;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;IAEvB,OAAO,CACL,CAAC,MAAM,CACL,aAAa,CAAC,CACZ,CAAC,WAAW,CACV,KAAK,CAAC,CACJ,UAAU,EAAE,YAAY,KAAK,UAAU,EAAE,YAAY,CAAC,KAAK;gBAC3D,UAAU,EAAE,YAAY,KAAK,UAAU,EAAE,YAAY,CAAC,OAAO;gBAC3D,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC;gBAC1B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CACxB,CACD,KAAK,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,EACxB,CACH,CACD,WAAW,CAAC,CACV,CAAC,WAAW,CACV,KAAK,CAAC,CACJ,UAAU,EAAE,YAAY,KAAK,UAAU,EAAE,YAAY,CAAC,QAAQ;gBAC5D,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;gBACrB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAC7B,CACD,KAAK,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,EACtB,CACH,EACD,CACH,CAAC;AACJ,CAAC;AAED,eAAe,2BAA2B,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
declare function OperationOrderDatesCard({}: {}): JSX.Element;
|
|
1
|
+
import React from 'react';
|
|
2
|
+
declare function OperationOrderDatesCard({}: {}): React.JSX.Element;
|
|
3
3
|
export default OperationOrderDatesCard;
|
|
@@ -17,21 +17,25 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useMemo } from 'react';
|
|
19
19
|
import { FromTo, TitledValue } from '@axelor/aos-mobile-ui';
|
|
20
|
-
import { isEmpty, useSelector, useTranslator } from '@axelor/aos-mobile-core';
|
|
21
|
-
import
|
|
20
|
+
import { isEmpty, useSelector, useTranslator, useTypes, } from '@axelor/aos-mobile-core';
|
|
21
|
+
import { default as OperationOrderType } from '../../../types/operation-order';
|
|
22
22
|
function OperationOrderDatesCard({}) {
|
|
23
23
|
const I18n = useTranslator();
|
|
24
|
+
const { OperationOrder } = useTypes();
|
|
24
25
|
const { operationOrder } = useSelector((state) => state.operationOrder);
|
|
25
26
|
const [startDate, endDate] = useMemo(() => {
|
|
26
27
|
if (!isEmpty(operationOrder)) {
|
|
27
|
-
return
|
|
28
|
+
return OperationOrderType.getDates(operationOrder?.statusSelect, operationOrder?.plannedStartDateT, operationOrder?.plannedEndDateT, operationOrder?.realStartDateT, operationOrder?.realEndDateT, I18n);
|
|
28
29
|
}
|
|
29
30
|
return [];
|
|
30
31
|
}, [I18n, operationOrder]);
|
|
31
|
-
return (<FromTo fromComponent={<TitledValue title={operationOrder?.statusSelect ===
|
|
32
|
-
|
|
32
|
+
return (<FromTo fromComponent={<TitledValue title={operationOrder?.statusSelect ===
|
|
33
|
+
OperationOrder?.statusSelect.Draft ||
|
|
34
|
+
operationOrder?.statusSelect ===
|
|
35
|
+
OperationOrder?.statusSelect.Planned
|
|
33
36
|
? I18n.t('Base_Estimated')
|
|
34
|
-
: I18n.t('Base_Real')} value={startDate?.value}/>} toComponent={<TitledValue title={operationOrder?.statusSelect ===
|
|
37
|
+
: I18n.t('Base_Real')} value={startDate?.value}/>} toComponent={<TitledValue title={operationOrder?.statusSelect ===
|
|
38
|
+
OperationOrder?.statusSelect.Finished
|
|
35
39
|
? I18n.t('Base_Real')
|
|
36
40
|
: I18n.t('Base_Estimated')} value={endDate?.value}/>}/>);
|
|
37
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperationOrderDatesCard.js","sourceRoot":"","sources":["../../../../src/components/molecules/OperationOrderDatesCard/OperationOrderDatesCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,
|
|
1
|
+
{"version":3,"file":"OperationOrderDatesCard.js","sourceRoot":"","sources":["../../../../src/components/molecules/OperationOrderDatesCard/OperationOrderDatesCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EACL,OAAO,EACP,WAAW,EACX,aAAa,EACb,QAAQ,GACT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,OAAO,IAAI,kBAAkB,EAAC,MAAM,gCAAgC,CAAC;AAE7E,SAAS,uBAAuB,CAAC,EAAE;IACjC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,EAAC,cAAc,EAAC,GAAG,QAAQ,EAAE,CAAC;IAEpC,MAAM,EAAC,cAAc,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAE3E,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,GAAG,EAAE;QACxC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YAC5B,OAAO,kBAAkB,CAAC,QAAQ,CAChC,cAAc,EAAE,YAAY,EAC5B,cAAc,EAAE,iBAAiB,EACjC,cAAc,EAAE,eAAe,EAC/B,cAAc,EAAE,cAAc,EAC9B,cAAc,EAAE,YAAY,EAC5B,IAAI,CACL,CAAC;SACH;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;IAE3B,OAAO,CACL,CAAC,MAAM,CACL,aAAa,CAAC,CACZ,CAAC,WAAW,CACV,KAAK,CAAC,CACJ,cAAc,EAAE,YAAY;gBAC1B,cAAc,EAAE,YAAY,CAAC,KAAK;gBACpC,cAAc,EAAE,YAAY;oBAC1B,cAAc,EAAE,YAAY,CAAC,OAAO;gBACpC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC;gBAC1B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CACxB,CACD,KAAK,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,EACxB,CACH,CACD,WAAW,CAAC,CACV,CAAC,WAAW,CACV,KAAK,CAAC,CACJ,cAAc,EAAE,YAAY;gBAC5B,cAAc,EAAE,YAAY,CAAC,QAAQ;gBACnC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC;gBACrB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAC7B,CACD,KAAK,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,EACtB,CACH,EACD,CACH,CAAC;AACJ,CAAC;AAED,eAAe,uBAAuB,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import React from 'react';
|
|
1
2
|
interface ConsumedProductCardProps {
|
|
2
3
|
style?: any;
|
|
3
4
|
productName: string;
|
|
@@ -13,5 +14,5 @@ interface ConsumedProductCardProps {
|
|
|
13
14
|
incrementVisible: boolean;
|
|
14
15
|
};
|
|
15
16
|
}
|
|
16
|
-
declare const ConsumedProductCard: ({ style, productName, plannedQty, consumedQty, missingQty, availableQty, unitName, trackingNumber, onPress, increment, }: ConsumedProductCardProps) => JSX.Element;
|
|
17
|
+
declare const ConsumedProductCard: ({ style, productName, plannedQty, consumedQty, missingQty, availableQty, unitName, trackingNumber, onPress, increment, }: ConsumedProductCardProps) => React.JSX.Element;
|
|
17
18
|
export default ConsumedProductCard;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import React from 'react';
|
|
1
2
|
interface ConsumedProductGlobalCardProps {
|
|
2
3
|
productName: string;
|
|
3
4
|
plannedQty: number;
|
|
@@ -13,5 +14,5 @@ interface ConsumedProductGlobalCardProps {
|
|
|
13
14
|
onSubOfPress: () => void;
|
|
14
15
|
isSubOF: boolean;
|
|
15
16
|
}
|
|
16
|
-
declare const ConsumedProductGlobalCard: ({ productName, plannedQty, consumedQty, missingQty, availableQty, unitName, trackingNumber, onPress, onMorePress, disableMore, onLocationPress, onSubOfPress, isSubOF, }: ConsumedProductGlobalCardProps) => JSX.Element;
|
|
17
|
+
declare const ConsumedProductGlobalCard: ({ productName, plannedQty, consumedQty, missingQty, availableQty, unitName, trackingNumber, onPress, onMorePress, disableMore, onLocationPress, onSubOfPress, isSubOF, }: ConsumedProductGlobalCardProps) => React.JSX.Element;
|
|
17
18
|
export default ConsumedProductGlobalCard;
|
|
@@ -47,12 +47,12 @@ const ConsumedProductGlobalCard = ({ productName, plannedQty, consumedQty, missi
|
|
|
47
47
|
}, [handleTimeOut, incrementVisible, addedQty]);
|
|
48
48
|
return (<View style={styles.globalContainer}>
|
|
49
49
|
<ConsumedProductCard style={styles.consumedCard} productName={productName} plannedQty={plannedQty} consumedQty={consumedQty} missingQty={missingQty} availableQty={availableQty} unitName={unitName} trackingNumber={trackingNumber} onPress={onPress} increment={{ addedQty, incrementVisible }}/>
|
|
50
|
-
<View style={styles.
|
|
51
|
-
<CardIconButton style={styles.
|
|
52
|
-
{isSubOF ? (<CardIconButton style={styles.
|
|
50
|
+
<View style={styles.flexOne}>
|
|
51
|
+
<CardIconButton style={styles.flexOne} iconName="geo-alt-fill" iconColor={Colors.secondaryColor.background} onPress={onLocationPress}/>
|
|
52
|
+
{isSubOF ? (<CardIconButton style={styles.flexOne} iconName="diagram-3-fill" iconColor={Colors.secondaryColor.background} onPress={onSubOfPress}/>) : null}
|
|
53
53
|
</View>
|
|
54
|
-
{!disableMore && (<View style={styles.
|
|
55
|
-
<CardIconButton style={styles.
|
|
54
|
+
{!disableMore && (<View style={styles.flexOne}>
|
|
55
|
+
<CardIconButton style={styles.flexOne} iconName="plus-lg" iconColor={Colors.primaryColor.background} onPress={handleIncrement}/>
|
|
56
56
|
</View>)}
|
|
57
57
|
</View>);
|
|
58
58
|
};
|
|
@@ -65,16 +65,13 @@ const styles = StyleSheet.create({
|
|
|
65
65
|
justifyContent: 'space-evenly',
|
|
66
66
|
alignItems: 'center',
|
|
67
67
|
marginHorizontal: 14,
|
|
68
|
-
marginVertical: 2,
|
|
69
68
|
},
|
|
70
|
-
|
|
69
|
+
flexOne: {
|
|
71
70
|
flex: 1,
|
|
72
71
|
},
|
|
73
72
|
consumedCard: {
|
|
74
73
|
flex: 5,
|
|
75
|
-
|
|
76
|
-
cardIconButton: {
|
|
77
|
-
flex: 1,
|
|
74
|
+
margin: 2,
|
|
78
75
|
},
|
|
79
76
|
});
|
|
80
77
|
export default ConsumedProductGlobalCard;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsumedProductGlobalCard.js","sourceRoot":"","sources":["../../../../src/components/organisms/ConsumedProductGlobalCard/ConsumedProductGlobalCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACtE,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpE,OAAO,mBAAmB,MAAM,4CAA4C,CAAC;AAkB7E,MAAM,sBAAsB,GAAG,IAAI,CAAC;AAEpC,MAAM,yBAAyB,GAAG,CAAC,EACjC,WAAW,EACX,UAAU,EACV,WAAW,EACX,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,cAAc,GAAG,IAAI,EACrB,OAAO,EACP,WAAW,EACX,WAAW,GAAG,KAAK,EACnB,eAAe,EACf,YAAY,EACZ,OAAO,GAAG,KAAK,GACgB,EAAE,EAAE;IACnC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChE,IAAI,gBAAgB,GAAG,MAAM,EAAU,CAAC;IAExC,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC1B,WAAW,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;QACrC,IAAI,QAAQ,GAAG,CAAC,EAAE;YAChB,WAAW,CAAC,QAAQ,CAAC,CAAC;YACtB,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC3B,WAAW,CAAC,CAAC,CAAC,CAAC;SAChB;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IAE5B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,IAAI,QAAQ,GAAG,CAAC,EAAE;YACpC,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAC;YAC7D,gBAAgB,CAAC,OAAO,GAAG,EAAE,CAAC;YAE9B,OAAO,GAAG,EAAE;gBACV,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC,CAAC;SACH;IACH,CAAC,EAAE,CAAC,aAAa,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEhD,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAClC;MAAA,CAAC,mBAAmB,CAClB,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAC3B,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,cAAc,CAAC,CAAC,cAAc,CAAC,CAC/B,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,SAAS,CAAC,CAAC,EAAC,QAAQ,EAAE,gBAAgB,EAAC,CAAC,EAE1C;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"ConsumedProductGlobalCard.js","sourceRoot":"","sources":["../../../../src/components/organisms/ConsumedProductGlobalCard/ConsumedProductGlobalCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACtE,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpE,OAAO,mBAAmB,MAAM,4CAA4C,CAAC;AAkB7E,MAAM,sBAAsB,GAAG,IAAI,CAAC;AAEpC,MAAM,yBAAyB,GAAG,CAAC,EACjC,WAAW,EACX,UAAU,EACV,WAAW,EACX,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,cAAc,GAAG,IAAI,EACrB,OAAO,EACP,WAAW,EACX,WAAW,GAAG,KAAK,EACnB,eAAe,EACf,YAAY,EACZ,OAAO,GAAG,KAAK,GACgB,EAAE,EAAE;IACnC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChE,IAAI,gBAAgB,GAAG,MAAM,EAAU,CAAC;IAExC,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC1B,WAAW,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE;QACrC,IAAI,QAAQ,GAAG,CAAC,EAAE;YAChB,WAAW,CAAC,QAAQ,CAAC,CAAC;YACtB,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC3B,WAAW,CAAC,CAAC,CAAC,CAAC;SAChB;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;IAE5B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,gBAAgB,IAAI,QAAQ,GAAG,CAAC,EAAE;YACpC,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,EAAE,sBAAsB,CAAC,CAAC;YAC7D,gBAAgB,CAAC,OAAO,GAAG,EAAE,CAAC;YAE9B,OAAO,GAAG,EAAE;gBACV,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YACzC,CAAC,CAAC;SACH;IACH,CAAC,EAAE,CAAC,aAAa,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEhD,OAAO,CACL,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAClC;MAAA,CAAC,mBAAmB,CAClB,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAC3B,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,WAAW,CAAC,CAAC,WAAW,CAAC,CACzB,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,QAAQ,CAAC,CAAC,QAAQ,CAAC,CACnB,cAAc,CAAC,CAAC,cAAc,CAAC,CAC/B,OAAO,CAAC,CAAC,OAAO,CAAC,CACjB,SAAS,CAAC,CAAC,EAAC,QAAQ,EAAE,gBAAgB,EAAC,CAAC,EAE1C;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAC1B;QAAA,CAAC,cAAc,CACb,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CACtB,QAAQ,CAAC,cAAc,CACvB,SAAS,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAC5C,OAAO,CAAC,CAAC,eAAe,CAAC,EAE3B;QAAA,CAAC,OAAO,CAAC,CAAC,CAAC,CACT,CAAC,cAAc,CACb,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CACtB,QAAQ,CAAC,gBAAgB,CACzB,SAAS,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,CAC5C,OAAO,CAAC,CAAC,YAAY,CAAC,EACtB,CACH,CAAC,CAAC,CAAC,IAAI,CACV;MAAA,EAAE,IAAI,CACN;MAAA,CAAC,CAAC,WAAW,IAAI,CACf,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAC1B;UAAA,CAAC,cAAc,CACb,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CACtB,QAAQ,CAAC,SAAS,CAClB,SAAS,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CAC1C,OAAO,CAAC,CAAC,eAAe,CAAC,EAE7B;QAAA,EAAE,IAAI,CAAC,CACR,CACH;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,eAAe,EAAE;QACf,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,KAAK;QACZ,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,cAAc;QAC9B,UAAU,EAAE,QAAQ;QACpB,gBAAgB,EAAE,EAAE;KACrB;IACD,OAAO,EAAE;QACP,IAAI,EAAE,CAAC;KACR;IACD,YAAY,EAAE;QACZ,IAAI,EAAE,CAAC;QACP,MAAM,EAAE,CAAC;KACV;CACF,CAAC,CAAC;AAEH,eAAe,yBAAyB,CAAC"}
|
package/lib/components/organisms/LinkedManufacturingOrderCard/LinkedManufacturingOrderCard.js
CHANGED
|
@@ -16,17 +16,16 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React from 'react';
|
|
19
|
-
import { ObjectCard
|
|
20
|
-
import { clipboardProvider,
|
|
21
|
-
import ManufacturingOrder from '../../../types/manufacturing-order';
|
|
19
|
+
import { ObjectCard } from '@axelor/aos-mobile-ui';
|
|
20
|
+
import { clipboardProvider, useTypeHelpers, useTypes, } from '@axelor/aos-mobile-core';
|
|
22
21
|
const LinkedManufacturingOrderCard = ({ manufOrderSeq, statusSelect, }) => {
|
|
23
|
-
const
|
|
24
|
-
const
|
|
22
|
+
const { ManufOrder } = useTypes();
|
|
23
|
+
const { getItemColor, getItemTitle } = useTypeHelpers();
|
|
25
24
|
return (<ObjectCard showArrow={false} onPress={() => clipboardProvider.copyToClipboard(manufOrderSeq)} sideBadges={{
|
|
26
25
|
items: [
|
|
27
26
|
{
|
|
28
|
-
displayText:
|
|
29
|
-
color:
|
|
27
|
+
displayText: getItemTitle(ManufOrder?.statusSelect, statusSelect),
|
|
28
|
+
color: getItemColor(ManufOrder?.statusSelect, statusSelect),
|
|
30
29
|
},
|
|
31
30
|
],
|
|
32
31
|
}} upperTexts={{
|
package/lib/components/organisms/LinkedManufacturingOrderCard/LinkedManufacturingOrderCard.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LinkedManufacturingOrderCard.js","sourceRoot":"","sources":["../../../../src/components/organisms/LinkedManufacturingOrderCard/LinkedManufacturingOrderCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"LinkedManufacturingOrderCard.js","sourceRoot":"","sources":["../../../../src/components/organisms/LinkedManufacturingOrderCard/LinkedManufacturingOrderCard.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AACjD,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,QAAQ,GACT,MAAM,yBAAyB,CAAC;AAEjC,MAAM,4BAA4B,GAAG,CAAC,EACpC,aAAa,EACb,YAAY,GAIb,EAAE,EAAE;IACH,MAAM,EAAC,UAAU,EAAC,GAAG,QAAQ,EAAE,CAAC;IAChC,MAAM,EAAC,YAAY,EAAE,YAAY,EAAC,GAAG,cAAc,EAAE,CAAC;IAEtD,OAAO,CACL,CAAC,UAAU,CACT,SAAS,CAAC,CAAC,KAAK,CAAC,CACjB,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC,CAChE,UAAU,CAAC,CAAC;YACV,KAAK,EAAE;gBACL;oBACE,WAAW,EAAE,YAAY,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,CAAC;oBACjE,KAAK,EAAE,YAAY,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,CAAC;iBAC5D;aACF;SACF,CAAC,CACF,UAAU,CAAC,CAAC;YACV,KAAK,EAAE,CAAC,EAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAC,CAAC;SAC9D,CAAC,EACF,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,4BAA4B,CAAC"}
|
|
@@ -17,13 +17,16 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React, { useCallback } from 'react';
|
|
19
19
|
import { Button, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
20
|
-
import {
|
|
21
|
-
import ManufacturingOrder from '../../../types/manufacturing-order';
|
|
20
|
+
import { useDispatch, usePermitted, useSelector, useTranslator, useTypes, } from '@axelor/aos-mobile-core';
|
|
22
21
|
import { updateStatusOfManufOrder } from '../../../features/manufacturingOrderSlice';
|
|
23
22
|
const ManufacturingOrderButtons = ({}) => {
|
|
24
23
|
const Colors = useThemeColor();
|
|
25
24
|
const I18n = useTranslator();
|
|
26
25
|
const dispatch = useDispatch();
|
|
26
|
+
const { readonly } = usePermitted({
|
|
27
|
+
modelName: 'com.axelor.apps.production.db.ManufOrder',
|
|
28
|
+
});
|
|
29
|
+
const { ManufOrder } = useTypes();
|
|
27
30
|
const { manufOrder } = useSelector(state => state.manufacturingOrder);
|
|
28
31
|
const handleUpdateStatus = useCallback(targetStatus => {
|
|
29
32
|
dispatch(updateStatusOfManufOrder({
|
|
@@ -32,17 +35,20 @@ const ManufacturingOrderButtons = ({}) => {
|
|
|
32
35
|
targetStatus,
|
|
33
36
|
}));
|
|
34
37
|
}, [dispatch, manufOrder]);
|
|
35
|
-
if (
|
|
36
|
-
return
|
|
38
|
+
if (readonly) {
|
|
39
|
+
return null;
|
|
37
40
|
}
|
|
38
|
-
if (manufOrder.statusSelect ===
|
|
41
|
+
if (manufOrder.statusSelect === ManufOrder?.statusSelect.Planned) {
|
|
42
|
+
return (<Button title={I18n.t('Base_Start')} onPress={() => handleUpdateStatus(ManufOrder?.statusSelect.InProgress)} iconName="play-fill"/>);
|
|
43
|
+
}
|
|
44
|
+
if (manufOrder.statusSelect === ManufOrder?.statusSelect.InProgress) {
|
|
39
45
|
return (<>
|
|
40
|
-
<Button title={I18n.t('Base_Pause')} onPress={() => handleUpdateStatus(
|
|
41
|
-
<Button title={I18n.t('Base_Finish')} onPress={() => handleUpdateStatus(
|
|
46
|
+
<Button title={I18n.t('Base_Pause')} onPress={() => handleUpdateStatus(ManufOrder?.statusSelect.StandBy)} iconName="pause-fill" color={Colors.secondaryColor}/>
|
|
47
|
+
<Button title={I18n.t('Base_Finish')} onPress={() => handleUpdateStatus(ManufOrder?.statusSelect.Finished)} iconName="power"/>
|
|
42
48
|
</>);
|
|
43
49
|
}
|
|
44
|
-
if (manufOrder.statusSelect ===
|
|
45
|
-
return (<Button title={I18n.t('Base_Continue')} onPress={() => handleUpdateStatus(
|
|
50
|
+
if (manufOrder.statusSelect === ManufOrder?.statusSelect.StandBy) {
|
|
51
|
+
return (<Button title={I18n.t('Base_Continue')} onPress={() => handleUpdateStatus(ManufOrder?.statusSelect.InProgress)} iconName="skip-end-fill"/>);
|
|
46
52
|
}
|
|
47
53
|
return null;
|
|
48
54
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ManufacturingOrderButtons.js","sourceRoot":"","sources":["../../../../src/components/organisms/ManufacturingOrderButtons/ManufacturingOrderButtons.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAC,MAAM,OAAO,CAAC;AACzC,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC5D,OAAO,
|
|
1
|
+
{"version":3,"file":"ManufacturingOrderButtons.js","sourceRoot":"","sources":["../../../../src/components/organisms/ManufacturingOrderButtons/ManufacturingOrderButtons.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAC,MAAM,OAAO,CAAC;AACzC,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EACL,WAAW,EACX,YAAY,EACZ,WAAW,EACX,aAAa,EACb,QAAQ,GACT,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAC,wBAAwB,EAAC,MAAM,2CAA2C,CAAC;AAEnF,MAAM,yBAAyB,GAAG,CAAC,EAAE,EAAE,EAAE;IACvC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,EAAC,QAAQ,EAAC,GAAG,YAAY,CAAC;QAC9B,SAAS,EAAE,0CAA0C;KACtD,CAAC,CAAC;IACH,MAAM,EAAC,UAAU,EAAC,GAAG,QAAQ,EAAE,CAAC;IAEhC,MAAM,EAAC,UAAU,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;IAEpE,MAAM,kBAAkB,GAAG,WAAW,CACpC,YAAY,CAAC,EAAE;QACb,QAAQ,CACN,wBAAwB,CAAC;YACvB,YAAY,EAAE,UAAU,CAAC,EAAE;YAC3B,iBAAiB,EAAE,UAAU,CAAC,OAAO;YACrC,YAAY;SACb,CAAC,CACH,CAAC;IACJ,CAAC,EACD,CAAC,QAAQ,EAAE,UAAU,CAAC,CACvB,CAAC;IAEF,IAAI,QAAQ,EAAE;QACZ,OAAO,IAAI,CAAC;KACb;IAED,IAAI,UAAU,CAAC,YAAY,KAAK,UAAU,EAAE,YAAY,CAAC,OAAO,EAAE;QAChE,OAAO,CACL,CAAC,MAAM,CACL,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAC5B,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CACvE,QAAQ,CAAC,WAAW,EACpB,CACH,CAAC;KACH;IAED,IAAI,UAAU,CAAC,YAAY,KAAK,UAAU,EAAE,YAAY,CAAC,UAAU,EAAE;QACnE,OAAO,CACL,EACE;QAAA,CAAC,MAAM,CACL,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAC5B,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,CACpE,QAAQ,CAAC,YAAY,CACrB,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,EAE/B;QAAA,CAAC,MAAM,CACL,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAC7B,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CACrE,QAAQ,CAAC,OAAO,EAEpB;MAAA,GAAG,CACJ,CAAC;KACH;IAED,IAAI,UAAU,CAAC,YAAY,KAAK,UAAU,EAAE,YAAY,CAAC,OAAO,EAAE;QAChE,OAAO,CACL,CAAC,MAAM,CACL,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAC/B,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,CACvE,QAAQ,CAAC,eAAe,EACxB,CACH,CAAC;KACH;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,eAAe,yBAAyB,CAAC"}
|