diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index f8cc806a..f2767383 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -4,12 +4,12 @@ class URLs { static const String appReleaseBuildNumber = "26"; // static const host1 = "https://atomsm.hmg.com"; // production url - // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url - static const host1 = "https://atomsmuat.hmg.com"; // local UAT url + static const host1 = "https://atomsmdev.hmg.com"; // local DEV url + // static const host1 = "https://atomsmuat.hmg.com"; // local UAT url // static String _baseUrl = "$_host/mobile"; - // static final String _baseUrl = "$_host/v3/mobile"; // new V3 apis - static final String _baseUrl = "$_host/v4/mobile"; // for asset inventory on UAT + static final String _baseUrl = "$_host/v3/mobile"; // new V3 apis + // static final String _baseUrl = "$_host/v4/mobile"; // for asset inventory on UAT // static final String _baseUrl = "$_host/mobile"; // host local UAT // static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM diff --git a/lib/modules/asset_inventory_module/models/asset_inventory_model.dart b/lib/modules/asset_inventory_module/models/asset_inventory_model.dart index 0498b95a..a07d980a 100644 --- a/lib/modules/asset_inventory_module/models/asset_inventory_model.dart +++ b/lib/modules/asset_inventory_module/models/asset_inventory_model.dart @@ -219,6 +219,7 @@ class AssetInventoryModel { 'newSerialNo': newSerialNo, 'newAssetNameId': newAssetNameId, 'newAssetNameText': newAssetNameText, + 'newAssetNumber': newAssetNumber, 'newModelId': newModelId, 'newModelName': newModelName, 'newManufacturerId': newManufacturerId, diff --git a/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart b/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart index 28a46706..de5cb11a 100644 --- a/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart +++ b/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart @@ -167,10 +167,6 @@ class _AssetInventoryFormViewState extends State { ))).then((value) { if (value != null) { _pickedAssetModel = value; - // _pickedAssetModel?.assetNumber = _scannedAssetModel?.assetNumber; - // _pickedAssetModel?.assetId = _scannedAssetModel?.assetId; - // _pickedAssetModel?.status = _scannedAssetModel?.status; - _scannedAssetModel = _scannedAssetModel?.mergeWith(_pickedAssetModel) ?? _pickedAssetModel; populateFormValues(); @@ -183,6 +179,22 @@ class _AssetInventoryFormViewState extends State { ), 12.height, ], + if (((isRegistered && widget.sessionTypeValue != 3)))...[ + AppTextFormField( + labelText: context.translation.assetNo, + backgroundColor: AppColor.fieldBgColor(context), + textAlign: TextAlign.center, + // controller: _assetNoController, + showShadow: false, + enable: true, + labelStyle: AppTextStyles.textFieldLabelStyle, + style: Theme.of(context).textTheme.titleMedium, + onChange: (value){ + _scannedAssetModel?.newAssetNumber = value; + }, + ), + 12.height, + ], AppTextFormField( labelText: context.translation.serialNo, backgroundColor: AppColor.fieldBgColor(context),