Merge remote-tracking branch 'origin/main_design2.1' into main_design2.1

main_design2.1
Sikander Saleem 2 years ago
commit 865a2197ad

@ -28,6 +28,8 @@ class AssetSearch {
this.tagCode, this.tagCode,
this.assetGroupName, this.assetGroupName,
this.assetGroup, this.assetGroup,
this.oracleCodeTypeId,
this.oracleCodeValue
}); });
AssetSearch.fromJson(dynamic json) { AssetSearch.fromJson(dynamic json) {
@ -57,6 +59,8 @@ class AssetSearch {
tagCode = json['tagCode']; tagCode = json['tagCode'];
assetGroupName = json['assetGroupName']; assetGroupName = json['assetGroupName'];
assetGroup = json['assetGroup'] != null ? Lookup.fromJson(json['assetGroup']) : null; assetGroup = json['assetGroup'] != null ? Lookup.fromJson(json['assetGroup']) : null;
oracleCodeTypeId=json['assetOracleCodeTypeId'];
oracleCodeValue=json['assetOracleCodeValue'];
} }
String code; String code;
@ -85,6 +89,8 @@ class AssetSearch {
String tagCode; String tagCode;
String assetGroupName; String assetGroupName;
Lookup assetGroup; Lookup assetGroup;
String oracleCodeValue;
int oracleCodeTypeId;
AssetSearch copyWith({ AssetSearch copyWith({
String code, String code,
@ -113,6 +119,8 @@ class AssetSearch {
String tagCode, String tagCode,
String assetGroupName, String assetGroupName,
Lookup assetGroup, Lookup assetGroup,
String oracleCodeValue,
int oracleCodeTypeId
}) => }) =>
AssetSearch( AssetSearch(
code: code ?? this.code, code: code ?? this.code,
@ -141,6 +149,8 @@ class AssetSearch {
tagCode: tagCode ?? this.tagCode, tagCode: tagCode ?? this.tagCode,
assetGroupName: assetGroupName ?? this.assetGroupName, assetGroupName: assetGroupName ?? this.assetGroupName,
assetGroup: assetGroup ?? this.assetGroup, assetGroup: assetGroup ?? this.assetGroup,
oracleCodeValue: oracleCodeValue ?? this.oracleCodeValue,
oracleCodeTypeId: oracleCodeTypeId ?? this.oracleCodeTypeId
); );
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
@ -183,6 +193,8 @@ class AssetSearch {
if (assetGroup != null) { if (assetGroup != null) {
map['assetGroup'] = assetGroup.toJson(); map['assetGroup'] = assetGroup.toJson();
} }
if (oracleCodeValue != null && oracleCodeValue.isNotEmpty) map['assetOracleCodeValue'] = oracleCodeValue;
if (oracleCodeTypeId != null) map['assetOracleCodeTypeId'] = oracleCodeTypeId;
return map; return map;
} }
} }

@ -178,6 +178,10 @@ class _SearchAssetPageState extends State<SearchAssetPage> {
case 1: case 1:
search.assetNo = value; search.assetNo = value;
break; break;
case 2:
search.oracleCodeValue = value;
search.oracleCodeTypeId = 412;
break;
case 3: case 3:
search.assetSerialNumber = value; search.assetSerialNumber = value;
break; break;

@ -49,7 +49,8 @@ class _AssetScanQrState extends State<AssetScanQr> {
} }
_pickManually() async { _pickManually() async {
await Navigator.push(context, MaterialPageRoute(builder: (context) => const SearchAssetPage())); _controller?.pauseCamera();
await Navigator.push(context, MaterialPageRoute(builder: (context) => const SearchAssetPage())).then((value) => _controller?.resumeCamera());
} }
_getDevice(String result, {bool isQr = false}) async { _getDevice(String result, {bool isQr = false}) async {
@ -79,7 +80,9 @@ class _AssetScanQrState extends State<AssetScanQr> {
if (!_scanDone) { if (!_scanDone) {
_scanDone = true; _scanDone = true;
final result = await _getDevice(scanData.code, isQr: true); final result = await _getDevice(scanData.code, isQr: true);
Navigator.of(context).pop(result[0]); if(result.isNotEmpty) {
Navigator.of(context).pop(result[0]);
}
} }
}); });
}, },

Loading…
Cancel
Save