|
|
|
@ -167,10 +167,6 @@ class _AssetInventoryFormViewState extends State<AssetInventoryFormView> {
|
|
|
|
))).then((value) {
|
|
|
|
))).then((value) {
|
|
|
|
if (value != null) {
|
|
|
|
if (value != null) {
|
|
|
|
_pickedAssetModel = value;
|
|
|
|
_pickedAssetModel = value;
|
|
|
|
// _pickedAssetModel?.assetNumber = _scannedAssetModel?.assetNumber;
|
|
|
|
|
|
|
|
// _pickedAssetModel?.assetId = _scannedAssetModel?.assetId;
|
|
|
|
|
|
|
|
// _pickedAssetModel?.status = _scannedAssetModel?.status;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_scannedAssetModel = _scannedAssetModel?.mergeWith(_pickedAssetModel) ?? _pickedAssetModel;
|
|
|
|
_scannedAssetModel = _scannedAssetModel?.mergeWith(_pickedAssetModel) ?? _pickedAssetModel;
|
|
|
|
|
|
|
|
|
|
|
|
populateFormValues();
|
|
|
|
populateFormValues();
|
|
|
|
@ -183,6 +179,22 @@ class _AssetInventoryFormViewState extends State<AssetInventoryFormView> {
|
|
|
|
),
|
|
|
|
),
|
|
|
|
12.height,
|
|
|
|
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(
|
|
|
|
AppTextFormField(
|
|
|
|
labelText: context.translation.serialNo,
|
|
|
|
labelText: context.translation.serialNo,
|
|
|
|
backgroundColor: AppColor.fieldBgColor(context),
|
|
|
|
backgroundColor: AppColor.fieldBgColor(context),
|
|
|
|
|