diff --git a/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java b/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java index d36cc86..727c306 100644 --- a/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java +++ b/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java @@ -6,6 +6,8 @@ import android.widget.AdapterView; import androidx.databinding.BaseObservable; +import com.example.jingyuan_mes.uitls.SharedPreferencesUtils; + import java.util.ArrayList; import java.util.List; @@ -505,5 +507,4 @@ public class DeviceRepair extends BaseObservable { } - } diff --git a/app/src/main/java/com/example/jingyuan_mes/entity/store/OutStoreSubmit.java b/app/src/main/java/com/example/jingyuan_mes/entity/store/OutStoreSubmit.java index a0ace7b..a307239 100644 --- a/app/src/main/java/com/example/jingyuan_mes/entity/store/OutStoreSubmit.java +++ b/app/src/main/java/com/example/jingyuan_mes/entity/store/OutStoreSubmit.java @@ -17,7 +17,7 @@ public class OutStoreSubmit extends BaseObservable { private String locationCode; private String searchText; - private int outstockAmount = 1; + private String outstockAmount = "1"; private String instockBatch; private Long rawOutstockDetailId; @@ -38,11 +38,11 @@ public class OutStoreSubmit extends BaseObservable { notifyChange(); } - public int getOutstockAmount() { + public String getOutstockAmount() { return outstockAmount; } - public void setOutstockAmount(int outstockAmount) { + public void setOutstockAmount(String outstockAmount) { this.outstockAmount = outstockAmount; notifyChange(); } @@ -66,7 +66,7 @@ public class OutStoreSubmit extends BaseObservable { public void subClear() { locationCode = null; - outstockAmount = 1; + outstockAmount = "1"; instockBatch = null; notifyChange(); } diff --git a/app/src/main/res/layout/activity_material_pass.xml b/app/src/main/res/layout/activity_material_pass.xml index c9cfb14..65521aa 100644 --- a/app/src/main/res/layout/activity_material_pass.xml +++ b/app/src/main/res/layout/activity_material_pass.xml @@ -114,7 +114,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:inputType="numberDecimal" - android:text='@={vm.outstockAmount + ""}' /> + android:text="@={vm.outstockAmount}" />