From d72ec80f3553cc2303c16c2815d5431b42bec1eb Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Wed, 6 Nov 2024 17:01:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=9B=98=E7=82=B9int?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jingyuan_mes/entity/store/InventoryWorkBeen.java        | 6 +++---
 .../jingyuan_mes/entity/store/ReturnOutStockBeen.java       | 2 +-
 app/src/main/res/layout/item_inventory_work.xml             | 2 +-
 app/src/main/res/layout/item_return_outstock.xml            | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/jingyuan_mes/entity/store/InventoryWorkBeen.java b/app/src/main/java/com/example/jingyuan_mes/entity/store/InventoryWorkBeen.java
index 83b1adf..e7ac3c9 100644
--- a/app/src/main/java/com/example/jingyuan_mes/entity/store/InventoryWorkBeen.java
+++ b/app/src/main/java/com/example/jingyuan_mes/entity/store/InventoryWorkBeen.java
@@ -30,7 +30,7 @@ public class InventoryWorkBeen extends BaseObservable {
     private String locationCode;
     private String materialBatch;
     private String stockType;
-    private int stockId;
+    private Long stockId;
     private double stockAmount;
     private double realAmount;
     private String checkStatus;
@@ -114,11 +114,11 @@ public class InventoryWorkBeen extends BaseObservable {
         this.stockType = stockType;
     }
 
-    public int getStockId() {
+    public Long getStockId() {
         return stockId;
     }
 
-    public void setStockId(int stockId) {
+    public void setStockId(Long stockId) {
         this.stockId = stockId;
     }
 
diff --git a/app/src/main/java/com/example/jingyuan_mes/entity/store/ReturnOutStockBeen.java b/app/src/main/java/com/example/jingyuan_mes/entity/store/ReturnOutStockBeen.java
index 7243019..e9d690c 100644
--- a/app/src/main/java/com/example/jingyuan_mes/entity/store/ReturnOutStockBeen.java
+++ b/app/src/main/java/com/example/jingyuan_mes/entity/store/ReturnOutStockBeen.java
@@ -40,7 +40,7 @@ public class ReturnOutStockBeen extends BaseObservable {
         } else if (executeStatus.equals("1")) {
             return "执行中";
         } else if (executeStatus.equals("2")) {
-            return "待执完成";
+            return "执行完成";
         }
 
         return executeStatus;
diff --git a/app/src/main/res/layout/item_inventory_work.xml b/app/src/main/res/layout/item_inventory_work.xml
index 2eeb92b..66e97dd 100644
--- a/app/src/main/res/layout/item_inventory_work.xml
+++ b/app/src/main/res/layout/item_inventory_work.xml
@@ -27,7 +27,7 @@
                 style="@style/item_title_left"
                 android:layout_width="60dp"
                 android:layout_height="match_parent"
-                android:text="物料批次:" />
+                android:text="物料条码:" />
 
             <TextView
                 style="@style/item_info"
diff --git a/app/src/main/res/layout/item_return_outstock.xml b/app/src/main/res/layout/item_return_outstock.xml
index 0d8ea66..d1b4a93 100644
--- a/app/src/main/res/layout/item_return_outstock.xml
+++ b/app/src/main/res/layout/item_return_outstock.xml
@@ -39,7 +39,7 @@
                 style="@style/item_title_blue"
                 android:layout_width="70dp"
                 android:layout_height="match_parent"
-                android:text="物料编码:" />
+                android:text="物料条码:" />
 
             <TextView
                 style="@style/item_text_13"