From 9f4dd0f68b9d587a26520559d03e89f8c5c1bd56 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Mon, 25 Nov 2024 14:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20PDA=E5=8E=9F=E6=9D=90?=
 =?UTF-8?q?=E6=96=99=E5=87=BA=E5=BA=93=E8=BE=93=E5=85=A5=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/jingyuan_mes/entity/device/DeviceRepair.java  | 3 ++-
 .../example/jingyuan_mes/entity/store/OutStoreSubmit.java | 8 ++++----
 app/src/main/res/layout/activity_material_pass.xml        | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

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}" />
 
         </LinearLayout>