From fab4355c84b40c15591b287dcd8aabede1207f10 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Thu, 31 Oct 2024 16:13:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=88=90=E5=93=81?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/store/ProductStock.java            |  9 +++++++++
 .../res/layout/item_product_out_apply.xml     | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/app/src/main/java/com/example/jingyuan_mes/entity/store/ProductStock.java b/app/src/main/java/com/example/jingyuan_mes/entity/store/ProductStock.java
index ccb5490..8d75991 100644
--- a/app/src/main/java/com/example/jingyuan_mes/entity/store/ProductStock.java
+++ b/app/src/main/java/com/example/jingyuan_mes/entity/store/ProductStock.java
@@ -16,6 +16,7 @@ public class ProductStock extends BaseObservable {
     private Long productId;
     private String materialCode;
     private String materialName;
+    private String materialSpec;
     /**
      * 订单数量
      */
@@ -41,6 +42,14 @@ public class ProductStock extends BaseObservable {
 
     private int saleOrderId;
 
+    public String getMaterialSpec() {
+        return materialSpec;
+    }
+
+    public void setMaterialSpec(String materialSpec) {
+        this.materialSpec = materialSpec;
+    }
+
     public int getSaleOrderId() {
         return saleOrderId;
     }
diff --git a/app/src/main/res/layout/item_product_out_apply.xml b/app/src/main/res/layout/item_product_out_apply.xml
index 76f9673..8f4df9e 100644
--- a/app/src/main/res/layout/item_product_out_apply.xml
+++ b/app/src/main/res/layout/item_product_out_apply.xml
@@ -53,6 +53,25 @@
                 android:text='@{vm.materialName}' />
 
         </LinearLayout>
+         <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="35dp">
+
+            <TextView
+                style="@style/item_title_left"
+                android:layout_width="180dp"
+                android:layout_height="match_parent"
+                android:text="规格:" />
+
+            <TextView
+                style="@style/text_info"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+
+                android:text='@{vm.materialSpec}' />
+
+        </LinearLayout>
+
    <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="35dp">