diff --git a/app/src/main/java/com/bonait/bnframework/business/OrderServer.java b/app/src/main/java/com/bonait/bnframework/business/OrderServer.java index faf7177a..b90d8da3 100644 --- a/app/src/main/java/com/bonait/bnframework/business/OrderServer.java +++ b/app/src/main/java/com/bonait/bnframework/business/OrderServer.java @@ -245,7 +245,7 @@ public class OrderServer { goodx.userID = ConfigName.getInstance().user.userID; goodx.foreignKeyRe=item.ForeignKeyRe; goodx.goodtype=item.TypeId; - goodx.materialids=item.materialids; + goodx.materialids=item.DefaultMate; QueryDB.AddGoods(goodx); k++; } diff --git a/app/src/main/java/com/bonait/bnframework/common/helper/mode/BPA_GoodsInfo.java b/app/src/main/java/com/bonait/bnframework/common/helper/mode/BPA_GoodsInfo.java index 5335f463..8bc64589 100644 --- a/app/src/main/java/com/bonait/bnframework/common/helper/mode/BPA_GoodsInfo.java +++ b/app/src/main/java/com/bonait/bnframework/common/helper/mode/BPA_GoodsInfo.java @@ -51,5 +51,5 @@ public class BPA_GoodsInfo { public String Design;//做法 public String TypeId;//小类id - public String materialids;//默认物料集合 + public String DefaultMate;//默认物料集合 } diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/liaochang_adapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/liaochang_adapter.java index bf217a5d..35759d3c 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/liaochang_adapter.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/liaochang_adapter.java @@ -11,6 +11,7 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.EditText; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; @@ -70,16 +71,16 @@ public class liaochang_adapter extends RecyclerView.Adapter + android:src="@mipmap/newsilos"/> @@ -47,6 +47,22 @@ android:text="30%" android:textSize="24dp" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_she_zhi.xml b/app/src/main/res/layout/fragment_she_zhi.xml index 3898c918..19884385 100644 --- a/app/src/main/res/layout/fragment_she_zhi.xml +++ b/app/src/main/res/layout/fragment_she_zhi.xml @@ -20,12 +20,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxxhdpi/newsilos.png b/app/src/main/res/mipmap-xxxhdpi/newsilos.png new file mode 100644 index 00000000..ca60719b Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/newsilos.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/silos1.png b/app/src/main/res/mipmap-xxxhdpi/silos1.png new file mode 100644 index 00000000..1fe08a31 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/silos1.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/silos2.png b/app/src/main/res/mipmap-xxxhdpi/silos2.png new file mode 100644 index 00000000..28b6679c Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/silos2.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/silos3.png b/app/src/main/res/mipmap-xxxhdpi/silos3.png new file mode 100644 index 00000000..38967a87 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/silos3.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/silos4.png b/app/src/main/res/mipmap-xxxhdpi/silos4.png new file mode 100644 index 00000000..30f79ed3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/silos4.png differ