入库详情与出库详情增加栈板号选项功能

app/src/main/java/com/uas/uas_mes_ztrh/fragment/NewBePutInStorageOrderDetailFragment.java

@@ -56,6 +56,7 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
     private TextView tv_hint;
     private TextView tv_qty;
     private RadioGroup radiogroup1;
+    private RadioButton radiobutton0;
     private RadioButton radiobutton1;
     private RadioButton radiobutton2;
 
@@ -76,6 +77,7 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
         tv_qty = root.findViewById(R.id.tv_qty);
 
         radiogroup1 = root.findViewById(R.id.radiogroup1);
+        radiobutton0 = root.findViewById(R.id.radiobutton0);
         radiobutton1 = root.findViewById(R.id.radiobutton1);
         radiobutton2 = root.findViewById(R.id.radiobutton2);
         radiobutton1.setChecked(true);
@@ -212,7 +214,9 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
 
     public void getmakeInWarhouse(String input){
         String text_radiobutton = null;
-        if (radiobutton1.isChecked()==true){
+        if (radiobutton0.isChecked()==true){
+            text_radiobutton="PALLTE";
+        }else if (radiobutton1.isChecked()==true){
             text_radiobutton="BOX";
         }else if (radiobutton2.isChecked()==true){
             text_radiobutton="SN";

app/src/main/java/com/uas/uas_mes_ztrh/fragment/NewOutboundDeliveryorderDetailFragment.java

@@ -56,6 +56,7 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
     private TextView tv_productdetails;
     private TextView tv_hint;
     private RadioGroup radiogroup1;
+    private RadioButton radiobutton0;
     private RadioButton radiobutton1;
     private RadioButton radiobutton2;
     private TextView tv_qty;
@@ -75,6 +76,7 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
         tv_productdetails = root.findViewById(R.id.tv_productdetails);
         tv_hint = root.findViewById(R.id.tv_hint);
         radiogroup1 = root.findViewById(R.id.radiogroup1);
+        radiobutton0 = root.findViewById(R.id.radiobutton0);
         radiobutton1 = root.findViewById(R.id.radiobutton1);
         radiobutton2 = root.findViewById(R.id.radiobutton2);
         tv_qty = root.findViewById(R.id.tv_qty);
@@ -217,7 +219,9 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
 
     public void getmakeInWarhouse(String input){
         String text_radiobutton = null;
-        if (radiobutton1.isChecked()==true){
+        if (radiobutton0.isChecked()==true){
+            text_radiobutton="PALLTE";
+        }else if (radiobutton1.isChecked()==true){
             text_radiobutton="BOX";
         }else if (radiobutton2.isChecked()==true){
             text_radiobutton="SN";

app/src/main/res/layout/newbeputinstorageorderdetail_fragment.xml

@@ -70,10 +70,17 @@
             android:layout_width="match_parent"
             android:orientation="horizontal">
 
+            <RadioButton
+                android:id="@+id/radiobutton0"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="栈板号" />
+
             <RadioButton
                 android:id="@+id/radiobutton1"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
+                android:layout_marginLeft="@dimen/textsize_20"
                 android:text="箱号" />
 
             <RadioButton

app/src/main/res/layout/newoutbounddeliveryorderdetail_fragment.xml

@@ -3,85 +3,95 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
+
     <LinearLayout
-        android:layout_marginTop="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_10"
         android:layout_marginRight="@dimen/dp_10"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:orientation="horizontal">
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
-            android:textColor="@color/black"
-            android:text="单号：">
-        </TextView>
+            android:text="单号："
+            android:textColor="@color/black"></TextView>
+
         <TextView
-            android:layout_marginLeft="5dp"
             android:id="@+id/tv_pi_inoutno"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:layout_gravity="center"
-            android:gravity="left"
-            android:textColor="@color/black"
+            android:layout_marginLeft="5dp"
             android:layout_marginRight="@dimen/space_left_5"
-            android:text="">
-        </TextView>
+            android:layout_weight="1"
+            android:gravity="left"
+            android:text=""
+            android:textColor="@color/black"></TextView>
+
         <TextView
             android:id="@+id/tv_productdetails"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@color/gray_light"
             android:padding="5dp"
-            android:text="产品明细">
-        </TextView>
+            android:text="产品明细"></TextView>
     </LinearLayout>
+
     <TextView
         android:id="@+id/tv_qty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/black"
         android:layout_marginLeft="@dimen/dp_10"
-        android:text="">
-    </TextView>
+        android:text=""
+        android:textColor="@color/black"></TextView>
 
     <com.bin.david.form.core.SmartTable
-        android:layout_marginTop="@dimen/dp_10"
         android:id="@+id/jlt_storage_in_filter_list_st"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/dp_10"
         android:layout_marginBottom="@dimen/dp_10"
         android:layout_weight="1" />
+
     <TextView
         android:id="@+id/tv_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="5dp"
-        android:text="">
-    </TextView>
+        android:text=""></TextView>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <RadioGroup
             android:id="@+id/radiogroup1"
-            android:layout_height="wrap_content"
             android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="horizontal">
 
             <RadioButton
-                android:id="@+id/radiobutton1"
+                android:id="@+id/radiobutton0"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
+                android:text="栈板号" />
+
+            <RadioButton
+                android:id="@+id/radiobutton1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/textsize_20"
                 android:text="箱号" />
 
             <RadioButton
                 android:id="@+id/radiobutton2"
-                android:layout_marginLeft="@dimen/textsize_20"
-                android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/textsize_20"
                 android:text="单台序列号" />
 
         </RadioGroup>
@@ -100,21 +110,18 @@
             android:layout_weight="1"
             android:background="@drawable/bg_line_edittext"
             android:focusable="true"
-            android:selectAllOnFocus="true"
             android:hint="请采集条码号/二维码"
             android:imeOptions="actionSend"
-            android:textColor="@color/black"
-            />
+            android:selectAllOnFocus="true"
+            android:textColor="@color/black" />
+
         <CheckBox
             android:id="@+id/ck_cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/dp_10"
-            android:text="取消">
-        </CheckBox>
+            android:text="取消"></CheckBox>
     </LinearLayout>
 
 
-
-
 </LinearLayout>

build.gradle

@@ -50,8 +50,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 1,
-            versionName      : "v1.0.1"
+            versionCode      : 2,
+            versionName      : "v1.0.2"
     ]
 
     depsVersion = [