不良附属何设置为必填项，老化改为老化试验，外观维修中不良原因增加其他输入框

app/src/main/java/com/uas/collection/fragment/BreakdownRepairFragment.java

@@ -848,6 +848,10 @@ public class BreakdownRepairFragment extends BaseFragment{
         String Qtycetwo = null;
         String ce_work_codetrim = tv_gonema_code.getText().toString().trim();
         String at_stationtrim = at_station.getText().toString().trim();
+        if (StringUtil.isEmpty(at_stationtrim)){
+            CommonUtil.toastNoRepeat(mActivity, "请输入不良归属");
+            return;
+        }
         ArrayList<StorageRechargeAloneBean> selectedItemone = myAdapterone.getSelectedItem();
         if (selectedItemone.size()==0){
 //            object_1.put("SR_BADNAMEREMARK",null);//不良现象
@@ -1373,7 +1377,7 @@ public class BreakdownRepairFragment extends BaseFragment{
         linelist.add("插件测试");
         linelist.add("线材目检");
         linelist.add("组装测试");
-        linelist.add("老化");
+        linelist.add("老化试验");
         linelist.add("包装测试");
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();

app/src/main/java/com/uas/collection/fragment/StorageRechargeListFragment.java

@@ -896,6 +896,10 @@ public class StorageRechargeListFragment extends BaseFragment{
 
         String ce_work_codetrim = tv_gonema_code.getText().toString().trim();
         String at_stationtrim = at_station.getText().toString().trim();
+        if (StringUtil.isEmpty(at_stationtrim)){
+            CommonUtil.toastNoRepeat(mActivity, "请输入不良归属");
+            return;
+        }
 
         ArrayList<StorageRechargeAloneBean> selectedItem = myAdapter.getSelectedItem();
         if (selectedItem.size()==0){
@@ -927,9 +931,19 @@ public class StorageRechargeListFragment extends BaseFragment{
             return;
         }else {
             for (int i=0;i<selectedItemtwo.size();i++){
-                input_AlonedaTwo = selectedItemtwo.get(i).getAlonedata();
+                String alonedata = selectedItemtwo.get(i).getAlonedata();
+                if (alonedata.equals("其他")){
+                    input_AlonedaTwo=selectedItem.get(i).getInputce();
+                    if (StringUtil.isEmpty(input_AlonedaTwo)){
+                        CommonUtil.toastNoRepeat(mActivity, "请填写不良原因");
+                        return;
+                    }else {
+                        input_AlonedaTwo=selectedItem.get(i).getAlonedata();
+                        object_1.put("SR_REASON",input_AlonedaTwo);
+                    }
+
+                }
             }
-            object_1.put("SR_REASON", input_AlonedaTwo);//原因
         }
 
         ArrayList<StorageRechargeAloneBean> selectAdapterQtySelectedItem = selectAdapterQty.getSelectedItem();
@@ -1355,9 +1369,10 @@ public class StorageRechargeListFragment extends BaseFragment{
         setAdaptertwo(mFeededListtwo);
         rv_two.setAdapter(myAdaptertwo);
         List<String> list=new ArrayList<>();
-        list.add("外观维修");
-        list.add("制程");
         list.add("来料");
+        list.add("制程");
+        list.add("外观维修");
+        list.add("其他");
         JSONObject jsonObject = new JSONObject();
         JSONArray jsonArray = new JSONArray();
         JSONObject object_1 = new JSONObject();
@@ -1429,9 +1444,12 @@ public class StorageRechargeListFragment extends BaseFragment{
 
             //设置条目状态
             ((   SelectAdaptertwo.ListItemViewHolder) holder).mainTitle.setText(mList.get(i).getAlonedata());
-            ((   SelectAdaptertwo.ListItemViewHolder) holder).ce_other.setVisibility(View.GONE);
             ((   SelectAdaptertwo.ListItemViewHolder) holder).ce_qty.setVisibility(View.GONE);
-
+            if (mList.get(i).getAlonedata().equals("其他")){
+                ((SelectAdaptertwo.ListItemViewHolder) holder).ce_other.setVisibility(View.VISIBLE);
+            }else {
+                ((SelectAdaptertwo.ListItemViewHolder) holder).ce_other.setVisibility(View.GONE);
+            }
 //            ((ListItemViewHolder) holder).checkBox.setChecked();
             //checkBox的监听
             ((   SelectAdaptertwo.ListItemViewHolder) holder).checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {