去除物料发放以及界面，更改界面UI，修改界面入口顺序

app/src/main/java/com/uas/rd_equipment/activity/FunctionActivity.java

@@ -13,10 +13,10 @@ import android.widget.TextView;
 
 import com.android.volley.toolbox.StringRequest;
 import com.uas.rd_equipment.R;
+import com.uas.rd_equipment.fragment.AddEquipmentGrantFragment;
 import com.uas.rd_equipment.fragment.BaseFragment;
 import com.uas.rd_equipment.fragment.BreakdownRepairFragment;
 import com.uas.rd_equipment.fragment.DeliveryForRepairFragment;
-import com.uas.rd_equipment.fragment.DeviceProvisioningListFragment;
 import com.uas.rd_equipment.fragment.DeviceStatusChangeFragment;
 import com.uas.rd_equipment.fragment.IndexSettingFragment;
 import com.uas.rd_equipment.fragment.MaintenanceManagementListFragment;
@@ -110,7 +110,7 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                     mFragment = new RemouIdRepairFragment();
                     break;
                 case GloableParams.PRODUCTION_REMOULD_GRAN://物料工装发放
-                    mFragment = new DeviceProvisioningListFragment();
+                    mFragment = new AddEquipmentGrantFragment();
                     break;
                 case GloableParams.PRODUCTION_REMOULD_PROGRAMSELECT://问题缉查列表
                     mFragment = new ProblemDetectionListFragment();

app/src/main/java/com/uas/rd_equipment/fragment/AddEquipmentGrantFragment.java

@@ -610,7 +610,7 @@ public class AddEquipmentGrantFragment extends BaseFragment implements OnColumnI
                         bean.setPR_DETAIL(data.getString("PR_DETAIL"));
                         bean.setMA_WCCODE(data.getString("MA_WCCODE"));
                         tv_pr_code.setText(""+data.getString("PR_CODE"));
-                        tv_pr_detail.setText("产品名称  "+data.getString("PR_DETAIL"));
+                        tv_pr_detail.setText(""+data.getString("PR_DETAIL"));
                         work_code_code.setText(""+data.getString("MA_CODE"));
                         linecodeBeanList.add(bean);
                         CommonUtil.setSpinnerItemSelectedByValue(masterSpinner, data.getString("MA_WCCODE"));

app/src/main/java/com/uas/rd_equipment/fragment/ProduceMassageBindingFragment.java

@@ -639,7 +639,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
                         bean.setPR_DETAIL(data.getString("PR_DETAIL"));
                         bean.setMA_WCCODE(data.getString("MA_WCCODE"));
                         tv_pr_code.setText(""+data.getString("PR_CODE"));
-                        tv_pr_detail.setText("产品名称  "+data.getString("PR_DETAIL"));
+                        tv_pr_detail.setText(""+data.getString("PR_DETAIL"));
                         work_code_code.setText(""+data.getString("MA_CODE"));
                         linecodeBeanList.add(bean);
                         CommonUtil.setSpinnerItemSelectedByValue(masterSpinner, data.getString("MA_WCCODE"));
@@ -1029,7 +1029,7 @@ public class ProduceMassageBindingFragment extends BaseFragment implements OnCol
             public void onClick(View v) {
                 et_linecode_smts.setText(ma_code);
                 tv_pr_code.setText(""+adapterpr_code);
-                tv_pr_detail.setText("产品名称  "+adapterpr_detail);
+                tv_pr_detail.setText(""+adapterpr_detail);
                 getDatalistCodes(ce_resources.getText().toString().trim(),work_code_code.getText().toString().trim());
                 closeListPopupWindow();
             }

app/src/main/java/com/uas/rd_equipment/global/GloableParams.java

@@ -997,13 +997,17 @@ public class GloableParams {
     public static final String HOME_QUALITY_MANAGE = "养护管理";
     public static final String TEXT_FAULT_INSPECTION = "送修与确认";
     public static final String TEXT_DEVICE_REPAIR = "维修与确认";
-    public static final String TEXT_REQUISITION_TRANSFER = "领用转移";
-    public static final String PRODUCTION_INFORMATION_UNIT = "生产信息绑定";
     public static final String PRODUCTION_REMOULD_UNIT = "设备改造";
+    public static final String PRODUCTION_REMOULD_CHANGE = "设备状态变更";
+    public static final String TEXT_REQUISITION_TRANSFER = "领用转移";
     public static final String PRODUCTION_REMOULD_GRAN = "物料工装发放";
-    public static final String PRODUCTION_REMOULD_PROGRAMSELECT = "问题缉查";
     public static final String PRODUCTION_REMOULD_RETURN = "物料工装归还";
-    public static final String PRODUCTION_REMOULD_CHANGE = "设备状态变更";
+    public static final String PRODUCTION_INFORMATION_UNIT = "生产信息绑定";
+
+
+    public static final String PRODUCTION_REMOULD_PROGRAMSELECT = "问题缉查";
+
+
     public static final String GRIDNAME_SETTING = "设置";
 //    public static final String QUERYSTATIONINFORMATION = "过站信息";
     public static String[] homeMenuNames = {
@@ -1011,13 +1015,15 @@ public class GloableParams {
             HOME_QUALITY_MANAGE,
             TEXT_FAULT_INSPECTION,
             TEXT_DEVICE_REPAIR,
-            TEXT_REQUISITION_TRANSFER,
-            PRODUCTION_INFORMATION_UNIT,
             PRODUCTION_REMOULD_UNIT,
+            PRODUCTION_REMOULD_CHANGE,
+            TEXT_REQUISITION_TRANSFER,
             PRODUCTION_REMOULD_GRAN,
-//        PRODUCTION_REMOULD_PROGRAMSELECT,
         PRODUCTION_REMOULD_RETURN,
-        PRODUCTION_REMOULD_CHANGE,
+        PRODUCTION_INFORMATION_UNIT,
+//        PRODUCTION_REMOULD_PROGRAMSELECT,
+
+
         GRIDNAME_SETTING
     };
     public static int[] homeMenuIcons = {
@@ -1025,13 +1031,13 @@ public class GloableParams {
             R.drawable.ic_maintain_manage,
             R.drawable.ic_fault_check,
             R.drawable.ic_device_repair,
-            R.drawable.pause,
-            R.drawable.information,
             R.drawable.remould,
+            R.drawable.iv_status,
+            R.drawable.pause,
             R.drawable.iv_grant,
-//            R.drawable.iv_problem,
             R.drawable.iv_return,
-            R.drawable.iv_status,
+//            R.drawable.iv_problem,
+            R.drawable.information,
             R.drawable.mainmenu_usersetting
     };
 

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

@@ -82,7 +82,7 @@
                 android:text=""
                 android:gravity="center"
                 android:layout_gravity="center"
-                android:textColor="@color/black">
+                android:textColor="@color/blue">
             </TextView>
 
         </LinearLayout>
@@ -156,18 +156,17 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             <LinearLayout
-                android:layout_gravity="bottom"
+                android:layout_gravity="center"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1.5"
-                android:layout_marginLeft="@dimen/textsize_20">
+                android:layout_weight="1"
+                android:layout_marginTop="2dp"
+                android:layout_marginLeft="15dp">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="工单号  "
-                    android:scrollbarSize="16sp"
+                    android:text="计划单号  "
                     android:gravity="center"
-                    android:textSize="16sp"
                     android:layout_gravity="center"
                     android:textColor="@color/black">
                 </TextView>
@@ -180,37 +179,10 @@
                     android:gravity="center"
                     android:textSize="16sp"
                     android:layout_gravity="center"
-                    android:textColor="@color/black">
+                    android:textColor="@color/blue">
                 </TextView>
             </LinearLayout>
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-                <TextView
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="工段"
-                    android:textSize="16sp"
-                    android:gravity="center"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="2dp"
-                    android:textColor="@color/black">
-                </TextView>
-                <Spinner
-                    android:id="@+id/sp_login"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_marginRight="@dimen/dp_10"
-                    style="@style/SpinnerStyle"
-                    android:layout_height="30dp"
-                    android:layout_marginTop="0dp"
-                    android:padding="0dp"
-                    android:gravity="center"
-                    android:paddingLeft="0dp"
-                    android:layout_gravity="top"
-                    android:background="@drawable/bg_spinner" />
-            </LinearLayout>
+
         </LinearLayout>
         <LinearLayout
             android:layout_marginTop="5dp"
@@ -222,7 +194,7 @@
                 android:layout_width="match_parent"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/textsize_20"
+                android:layout_marginLeft="15dp"
                 android:layout_gravity="center">
                 <TextView
                     android:layout_width="wrap_content"
@@ -238,30 +210,73 @@
                     android:layout_height="wrap_content"
                     android:text=""
                     android:gravity="center"
+                    android:textSize="16sp"
                     android:layout_gravity="center"
-                    android:textColor="@color/black">
+                    android:textColor="@color/blue">
                 </TextView>
 
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/tv_pr_detail"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="产品名称"
-                android:gravity="left"
-                android:layout_gravity="center"
-                android:textColor="@color/black">
-            </TextView>
+
         </LinearLayout>
         <LinearLayout
-            android:layout_marginLeft="15dp"
-            android:layout_marginTop="7dp"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
+            android:layout_gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginTop="2dp">
+            <LinearLayout
+                android:layout_gravity="center"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginTop="2dp"
+                android:layout_marginLeft="15dp">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="产品名称  "
+                    android:gravity="left"
+                    android:textColor="@color/black">
+                </TextView>
+                <TextView
+                    android:id="@+id/tv_pr_detail"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:gravity="left"
+                    android:textSize="16sp"
+                    android:textColor="@color/blue">
+                </TextView>
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+                <TextView
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="工段"
+                    android:textSize="16sp"
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="2dp"
+                    android:textColor="@color/black">
+                </TextView>
+                <Spinner
+                    android:id="@+id/sp_login"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginRight="@dimen/dp_10"
+                    style="@style/SpinnerStyle"
+                    android:layout_height="30dp"
+                    android:layout_marginTop="0dp"
+                    android:padding="0dp"
+                    android:gravity="center"
+                    android:paddingLeft="0dp"
+                    android:layout_gravity="top"
+                    android:background="@drawable/bg_spinner" />
+            </LinearLayout>
 
         </LinearLayout>
 

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

@@ -12,5 +12,5 @@
         android:layout_marginBottom="5dp"
         android:layout_marginTop="5dp"
         android:gravity="left"
-        android:textColor="@color/black"/>
+        android:textColor="@color/blue"/>
 </LinearLayout>

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

@@ -124,8 +124,6 @@
 
 
         </TableRow>
-
-
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
@@ -136,14 +134,12 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:layout_marginTop="2dp"
-                android:layout_marginLeft="@dimen/textsize_20">
+                android:layout_marginLeft="15dp">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="工单号  "
-                    android:scrollbarSize="16sp"
+                    android:text="计划单号  "
                     android:gravity="center"
-                    android:textSize="16sp"
                     android:layout_gravity="center"
                     android:textColor="@color/black">
                 </TextView>
@@ -156,37 +152,10 @@
                     android:gravity="center"
                     android:textSize="16sp"
                     android:layout_gravity="center"
-                    android:textColor="@color/black">
+                    android:textColor="@color/blue">
                 </TextView>
             </LinearLayout>
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1">
-                <TextView
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="工段"
-                    android:textSize="16sp"
-                    android:gravity="center"
-                    android:layout_gravity="center"
-                    android:layout_marginTop="2dp"
-                    android:textColor="@color/black">
-                </TextView>
-                <Spinner
-                    android:id="@+id/sp_login"
-                    android:layout_marginLeft="@dimen/dp_10"
-                    android:layout_marginRight="@dimen/dp_10"
-                    style="@style/SpinnerStyle"
-                    android:layout_height="30dp"
-                    android:layout_marginTop="0dp"
-                    android:padding="0dp"
-                    android:gravity="center"
-                    android:paddingLeft="0dp"
-                    android:layout_gravity="top"
-                    android:background="@drawable/bg_spinner" />
-            </LinearLayout>
+
         </LinearLayout>
         <LinearLayout
             android:layout_marginTop="5dp"
@@ -198,14 +167,13 @@
                 android:layout_width="match_parent"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/textsize_20"
+                android:layout_marginLeft="15dp"
                 android:layout_gravity="center">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="产品编号  "
                     android:gravity="center"
-                    android:textSize="16sp"
                     android:layout_gravity="center"
                     android:textColor="@color/black">
                 </TextView>
@@ -217,32 +185,75 @@
                     android:gravity="center"
                     android:textSize="16sp"
                     android:layout_gravity="center"
-                    android:textColor="@color/black">
+                    android:textColor="@color/blue">
                 </TextView>
 
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/tv_pr_detail"
-                android:layout_width="match_parent"
+
+        </LinearLayout>
+        <LinearLayout
+            android:layout_gravity="center"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginTop="2dp">
+            <LinearLayout
+                android:layout_gravity="center"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="产品名称"
-                android:gravity="left"
-                android:textSize="16sp"
-                android:layout_gravity="center"
-                android:textColor="@color/black">
-            </TextView>
+                android:layout_marginTop="2dp"
+                android:layout_marginLeft="15dp">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="产品名称  "
+                    android:gravity="left"
+                    android:textColor="@color/black">
+                </TextView>
+                <TextView
+                    android:id="@+id/tv_pr_detail"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:gravity="left"
+                    android:textSize="16sp"
+                    android:textColor="@color/blue">
+                </TextView>
+            </LinearLayout>
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+                <TextView
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="工段"
+                    android:textSize="16sp"
+                    android:gravity="center"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="2dp"
+                    android:textColor="@color/black">
+                </TextView>
+                <Spinner
+                    android:id="@+id/sp_login"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginRight="@dimen/dp_10"
+                    style="@style/SpinnerStyle"
+                    android:layout_height="30dp"
+                    android:layout_marginTop="0dp"
+                    android:padding="0dp"
+                    android:gravity="center"
+                    android:paddingLeft="0dp"
+                    android:layout_gravity="top"
+                    android:background="@drawable/bg_spinner" />
+            </LinearLayout>
+
         </LinearLayout>
-        <LinearLayout
-            android:layout_marginLeft="15dp"
-            android:layout_marginTop="7dp"
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
 
 
-        </LinearLayout>
 
 
         <TableRow