增加设备状态变更界面，领用转移界面选择线别放大镜列表更改UI显示

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

@@ -17,6 +17,7 @@ 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;
 import com.uas.rd_equipment.fragment.MaterialAndToolingReturnFragment;
@@ -117,6 +118,9 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.PRODUCTION_REMOULD_RETURN://物料工装归还
                     mFragment = new MaterialAndToolingReturnFragment();
                     break;
+                case GloableParams.PRODUCTION_REMOULD_CHANGE://设备状态变更
+                    mFragment = new DeviceStatusChangeFragment();
+                    break;
                 case GloableParams.GRIDNAME_SETTING://设置
                     mFragment = new IndexSettingFragment();
 //                    mFragment = new CwShiFragment();

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

@@ -348,6 +348,10 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);
                 break;
+            case GloableParams.PRODUCTION_REMOULD_CHANGE://设备状态变更
+                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
+                startActivity(intent);
+                break;
             case GloableParams.GRIDNAME_SETTING://设置
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);

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

@@ -108,6 +108,8 @@ public class DeliveryForRepairFragment extends BaseFragment implements OnColumnI
     private String pr_code;
     private String pr_detail;
     private String pr_spec;
+    private TextView tv_fault_phenomenon;
+    private String dc_reasonanalyse;
 
     @Override
     protected int getLayout() {
@@ -136,6 +138,7 @@ public class DeliveryForRepairFragment extends BaseFragment implements OnColumnI
         btn_confirm_repair = root.findViewById(R.id.btn_confirm_repair);
         tv_add = root.findViewById(R.id.tv_add);
         mSmartTable = root.findViewById(R.id.jlt_storage_in_filter_list_st);
+        tv_fault_phenomenon = root.findViewById(R.id.tv_fault_phenomenon);
 
 
 
@@ -466,8 +469,8 @@ public class DeliveryForRepairFragment extends BaseFragment implements OnColumnI
                 .method(Request.Method.GET)
                 .addParam("caller", "DeviceChange!Repair")
                 .addParam("de_code", de_code)//设备编号
+                .tag(TAG + "getShopPlan")
                 .build(), new HttpCallback() {
-
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
@@ -481,12 +484,15 @@ public class DeliveryForRepairFragment extends BaseFragment implements OnColumnI
                 dc_reason = FastjsonUtil.getText(dataObject, "dc_reason");
                 dc_remark = FastjsonUtil.getText(dataObject, "dc_remark");
                 dc_id = FastjsonUtil.getText(dataObject, "dc_id");
+                dc_reasonanalyse = FastjsonUtil.getText(dataObject, "dc_reasonanalyse");
 
                 tv_de_code.setText(""+ dc_code);
                 tv_dc_emname.setText(""+ dc_emname);
                 tv_dc_devcode.setText(""+ dc_devcode);
                 tv_de_name.setText(""+de_name);
-                index_position_malfunction.setText(""+ dc_reason);
+//                tv_fault_phenomenon.setText(""+ dc_reason);
+                tv_fault_phenomenon.setText(""+ dc_reason);
+                index_position_malfunction.setText(""+dc_reasonanalyse);
                 index_position_resource.setText(""+ dc_remark);
 
                 index_position_malfunction.requestFocus();

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

@@ -0,0 +1,345 @@
+package com.uas.rd_equipment.fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.uas.rd_equipment.R;
+import com.uas.rd_equipment.activity.FunctionActivity;
+import com.uas.rd_equipment.camera.CaptureActivity;
+import com.uas.rd_equipment.camera.CodeUtils;
+import com.uas.rd_equipment.global.GloableParams;
+import com.uas.rd_equipment.tools.SharedPreUtil;
+import com.uas.rd_equipment.util.CameraUtil;
+import com.uas.rd_equipment.util.CommonUtil;
+import com.uas.rd_equipment.util.Constants;
+import com.uas.rd_equipment.util.FastjsonUtil;
+import com.uas.rd_equipment.util.HttpCallback;
+import com.uas.rd_equipment.util.HttpParams;
+import com.uas.rd_equipment.util.StringUtil;
+import com.uas.rd_equipment.util.VollyRequest;
+import com.uas.rd_equipment.view.ClearableEditText;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by cjh-sail on 2023-02-01
+ */
+public class DeviceStatusChangeFragment extends BaseFragment  implements AdapterView.OnItemSelectedListener{
+
+
+    private Spinner spinner;
+    private ArrayAdapter adapter;
+    private String dc_code;
+    private String dc_emname;
+    private String dc_devcode;
+    private String de_name;
+    private String dc_reason;
+    private String dc_remark;
+    private String dc_id;
+    private String maintenanceType;
+    private static final int SCAN_BARCODE_CODE = 111;
+    private ClearableEditText ce_de_code;
+    private ImageView storage_recharge_scan_iv;
+    private String de_code;
+    private int mFocusId;
+    private Button btn_commit;
+    private TextView tv_prompt;
+    private List<String> linecodeBeanList;
+    private TextView tv_de_code;
+    private TextView tv_de_name;
+    private TextView tv_de_spec;
+    private TextView tv_de_currentcentername;
+    private TextView tv_de_currentlinecode;
+    private TextView tv_de_lefttime;
+    private TextView tv_de_manageman;
+    private TextView de_managemantel;
+    private TextView tv_de_vendor;
+    private TextView tv_de_contact;
+    private TextView tv_de_telvendor;
+    private String de_runstatus;
+    private TextView tv_de_status;
+    private ClearableEditText cle_change;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_devicestatuschange;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle(getString(R.string.title_storage_CHANGE));
+
+        spinner = root.findViewById(R.id.spinner02);
+        ce_de_code = root.findViewById(R.id.ce_de_code);
+        storage_recharge_scan_iv = root.findViewById(R.id.storage_recharge_scan_iv);
+        btn_commit = root.findViewById(R.id.btn_commit);
+        tv_prompt = root.findViewById(R.id.tv_prompt);
+        tv_de_code = root.findViewById(R.id.tv_de_code);
+        tv_de_name = root.findViewById(R.id.tv_de_name);
+        tv_de_spec = root.findViewById(R.id.tv_de_spec);
+        tv_de_currentcentername = root.findViewById(R.id.tv_de_currentcentername);
+        tv_de_currentlinecode = root.findViewById(R.id.tv_de_currentlinecode);
+        tv_de_lefttime = root.findViewById(R.id.tv_de_lefttime);
+        tv_de_manageman = root.findViewById(R.id.tv_de_manageman);
+        de_managemantel = root.findViewById(R.id.de_managemantel);
+        tv_de_vendor = root.findViewById(R.id.tv_de_vendor);
+        tv_de_contact = root.findViewById(R.id.tv_de_contact);
+        tv_de_telvendor = root.findViewById(R.id.tv_de_telvendor);
+        tv_de_status = root.findViewById(R.id.tv_de_status);
+        cle_change = root.findViewById(R.id.cle_change);
+
+
+
+
+        spinner.setOnItemSelectedListener(this);
+        ce_de_code.requestFocus();
+    }
+
+    @Override
+    protected void initEvents() {
+        ce_de_code.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String va_code = ce_de_code.getText().toString().trim();
+                    getNewData(va_code);
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        storage_recharge_scan_iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ce_de_code.requestFocus();
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                        SharedPreUtil.saveString(mActivity, Constants.STORAGEERECHADD, "NO");
+                    } else {
+                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+            }
+        });
+
+
+    }
+
+    @Override
+    protected void initDatas() {
+        linecodeBeanList = new ArrayList<>();
+        linecodeBeanList.add("待使用");
+        linecodeBeanList.add("使用中");
+        linecodeBeanList.add("停用中");
+        linecodeBeanList.add("封存中");
+
+        adapter = new ArrayAdapter(mActivity,R.layout.item_sapinnerstr, R.id.text_spinner, linecodeBeanList);
+
+        spinner.setAdapter(adapter);
+
+        spinner.setVisibility(View.VISIBLE);
+        btn_commit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getNewCommitData();
+            }
+        });
+
+    }
+
+
+
+
+
+
+
+    //提交保存
+    public void getNewCommitData(){
+        if (cle_change.getText().toString().trim().isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请填写变更说明");
+            return;
+        }
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ASTATIONTHE_SELECT_DEVICESTATUSCHANGE)
+                .method(Request.Method.GET)
+                .addParam("de_code",ce_de_code.getText().toString().trim())//de_code
+                .addParam("de_runstatus",maintenanceType)//maintenanceType
+                .addParam("dc_remark",cle_change.getText().toString().trim())
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                tv_prompt.setVisibility(View.VISIBLE);
+                tv_prompt.setTextColor(Color.GREEN);
+                tv_prompt.setText("提交成功");
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
+
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                tv_prompt.setVisibility(View.VISIBLE);
+                tv_prompt.setTextColor(Color.RED);
+                tv_prompt.setText(failStr);
+                ce_de_code.setText("");
+                ce_de_code.requestFocus();
+//                CommonUtil.toastNoRepeat(mActivity, failStr);
+
+            }
+        });
+    }
+
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        maintenanceType=linecodeBeanList.get(position);
+        if (maintenanceType.equals("待使用")){
+            maintenanceType="UNUSED";
+        }else if (maintenanceType.equals("使用中")){
+            maintenanceType="USING";
+        }else if (maintenanceType.equals("停用中")){
+            maintenanceType="STOP";
+        }else if (maintenanceType.equals("封存中")){
+            maintenanceType="SEALED";
+        }else {
+            maintenanceType="";
+        }
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (hidden) {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        } else {
+            FunctionActivity.setTitle(getString(R.string.title_storage_CHANGE));
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        }
+    }
+    public void getNewData(String de_codes){
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ASTATIONTHE_SWEEP_DATA)
+                .method(Request.Method.GET)
+                .addParam("de_code", de_codes)
+                .addParam("checkdevice","nocheck")
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+                String result = o.toString();
+                JSONObject resultObject = JSON.parseObject(result);
+                JSONObject dataObject = resultObject.getJSONObject("device");
+                String de_code1 = FastjsonUtil.getText(dataObject, "DE_CODE");
+                String de_name1 = FastjsonUtil.getText(dataObject, "DE_NAME");
+                de_code = de_code1;
+                de_name=de_name1;
+
+                tv_de_code.setText(FastjsonUtil.getText(dataObject, "DE_CODE"));
+                tv_de_vendor.setText(FastjsonUtil.getText(dataObject, "DE_VENDOR"));
+                tv_de_name.setText(FastjsonUtil.getText(dataObject, "DE_NAME"));
+                tv_de_spec.setText(FastjsonUtil.getText(dataObject, "DE_SPEC"));
+                tv_de_currentcentername.setText(FastjsonUtil.getText(dataObject, "DE_CURRENTCENTERCODE"));
+                tv_de_contact.setText(FastjsonUtil.getText(dataObject, "DE_CONTACT"));
+                tv_de_telvendor.setText(FastjsonUtil.getText(dataObject, "DE_TELVENDOR"));
+                tv_de_currentlinecode.setText(FastjsonUtil.getText(dataObject, "DE_CURRENTLINECODE"));
+                tv_de_lefttime.setText(FastjsonUtil.getText(dataObject, "DE_LEFTTIME"));
+                tv_de_manageman.setText(FastjsonUtil.getText(dataObject, "DE_MANAGEMAN"));
+                de_managemantel.setText(FastjsonUtil.getText(dataObject, "DE_MANAGEPHONE"));
+                de_runstatus = FastjsonUtil.getText(dataObject, "DE_RUNSTATUS");//状态
+                if (!StringUtil.isEmpty(de_runstatus)){
+                    if (de_runstatus.equals("UNUSED")){
+                        tv_de_status.setText("待使用");
+                    }else if (de_runstatus.equals("USING")){
+                        tv_de_status.setText("使用中");
+                    }else if (de_runstatus.equals("BREAKING")){
+                        tv_de_status.setText("维修中");
+                    }else if (de_runstatus.equals("CONIFRMBREAKING")){
+                        tv_de_status.setText("故障待确认");
+                    }else if (de_runstatus.equals("CONFIRMREPAIR")){
+                        tv_de_status.setText("维修待确认");
+                    }else if (de_runstatus.equals("REVIEW")){
+                        tv_de_status.setText("待评审");
+                    }else if (de_runstatus.equals("SCRAP")){
+                        tv_de_status.setText("已报废");
+                    }else if (de_runstatus.equals("UNTALLY")){
+                        tv_de_status.setText("待点检");
+                    }else if (de_runstatus.equals("STOP")){
+                        tv_de_status.setText("停用中");
+                    }else if (de_runstatus.equals("SEALED")){
+                        tv_de_status.setText("封存中");
+                    }
+                }
+
+
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+
+            }
+        });
+    }
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.ce_de_code) {
+                    ce_de_code.setText(result);
+                    ce_de_code.setSelection(result.length());
+                    getNewData(result);
+                }
+            }
+        }
+    }
+
+}

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

@@ -856,8 +856,7 @@ public class RequisitionTransferFragment extends BaseFragment{
         }
         @Override
         protected void convert(BaseViewHolder helper, RequisitionTransferBean item) {
-            helper.setText(R.id.macode_ip__Tv,item.getWS_CENTERCODE()+"-"+item.getWS_CENTERNAME()+"-"+item.getWS_WORKSHOP()
-                    +"-"+item.getWS_LINECODE()
+            helper.setText(R.id.macode_ip__Tv,item.getWS_LINECODE()
                     +"-"+item.getWS_LINENAME());
             LinearLayout line_true = helper.itemView.findViewById(R.id.line_true);
             if (item.getChecked()) {

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

@@ -356,9 +356,6 @@ public class StorageRechargeListFragment extends BaseFragment implements OnColum
                 if (!mi_ishalfmonth_user.isEmpty()){
                     linecodeBeanList.add(mi_ishalfmonth_user);
                 }
-                for (int i=0;i<linecodeBeanList.size();i++){
-                    Log.e("linecodeBeanList==",linecodeBeanList.get(i)+"");
-                }
 
 //                m = new String[]{mi_tally,mi_isday,mi_isweek,mi_ismonth,mi_year,mi_isseason,mi_calibration,mi_ishalfmonth_user};
 

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

@@ -344,6 +344,7 @@ public class GloableParams {
     public static String ASTATIONTHE_SELECT_RETURNMAKEBOM;
     public static String ASTATIONTHE_SELECT_POST;
     public static String ASTATIONTHE_SELECT_FUZZYSEARCHPRODUCTS;
+    public static String ASTATIONTHE_SELECT_DEVICESTATUSCHANGE;
 
     /**
      * 新版设备管理
@@ -375,6 +376,8 @@ public class GloableParams {
     public static String ADDRESSTAIL_GET_POST="/oa/device/postdc.action";
     //查询配件信息
     public static String ADDRESSTAIL_GET_FUZZYSEARCHPRODUCTS="/api/pda/smt/fuzzySearchProducts.action";
+    //设备状态变更
+    public static String ADDRESSTAIL_GET_DEVICESTATUSCHANGE="/oa/device/changeStatus.action";
 
     //扫描人员编号
     public static String ADDRESSTAIL_GET_GETEMNAME="/oa/device/getEmname.action";
@@ -1000,6 +1003,7 @@ public class GloableParams {
     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 GRIDNAME_SETTING = "设置";
 //    public static final String QUERYSTATIONINFORMATION = "过站信息";
     public static String[] homeMenuNames = {
@@ -1013,7 +1017,8 @@ public class GloableParams {
             PRODUCTION_REMOULD_GRAN,
 //        PRODUCTION_REMOULD_PROGRAMSELECT,
         PRODUCTION_REMOULD_RETURN,
-            GRIDNAME_SETTING
+        PRODUCTION_REMOULD_CHANGE,
+        GRIDNAME_SETTING
     };
     public static int[] homeMenuIcons = {
             R.drawable.ic_device_scan,
@@ -1026,6 +1031,7 @@ public class GloableParams {
             R.drawable.iv_grant,
 //            R.drawable.iv_problem,
             R.drawable.iv_return,
+            R.drawable.iv_status,
             R.drawable.mainmenu_usersetting
     };
 
@@ -1546,5 +1552,6 @@ public class GloableParams {
         GloableParams.ASTATIONTHE_SELECT_RETURNMAKEBOM = uriHead + GloableParams.ADDRESSTAIL_GET_RETURNMAKEBOM;
         GloableParams.ASTATIONTHE_SELECT_POST = uriHead + GloableParams.ADDRESSTAIL_GET_POST;
         GloableParams.ASTATIONTHE_SELECT_FUZZYSEARCHPRODUCTS = uriHead + GloableParams.ADDRESSTAIL_GET_FUZZYSEARCHPRODUCTS;
+        GloableParams.ASTATIONTHE_SELECT_DEVICESTATUSCHANGE = uriHead + GloableParams.ADDRESSTAIL_GET_DEVICESTATUSCHANGE;
     }
 }

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

@@ -62,6 +62,7 @@
                         android:text="送修单号:"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:textSize="@dimen/space_top_line_15"
                         android:textColor="@color/black">
                     </TextView>
                     <TextView
@@ -69,6 +70,7 @@
                         android:text=""
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:textSize="@dimen/space_top_line_15"
                         android:textColor="@color/blue">
                     </TextView>
 
@@ -82,11 +84,13 @@
                         android:text="送修人员:"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:textSize="@dimen/space_top_line_15"
                         android:textColor="@color/black">
                     </TextView>
                     <TextView
                         android:id="@+id/tv_dc_emname"
                         android:text=""
+                        android:textSize="@dimen/space_top_line_15"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@color/blue">
@@ -143,6 +147,27 @@
                     android:textColor="@color/blue">
                 </TextView>
             </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:text="故障现象:"
+                    android:layout_marginLeft="15dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="@dimen/space_top_line_15"
+                    android:textColor="@color/black">
+                </TextView>
+                <TextView
+                    android:id="@+id/tv_fault_phenomenon"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="@dimen/space_top_line_15"
+                    android:textColor="@color/blue">
+                </TextView>
+            </LinearLayout>
+
             <LinearLayout
                 android:visibility="gone"
                 android:layout_marginLeft="15dp"

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

@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginLeft="15dp"
+            android:layout_marginRight="15dp"
+            android:background="@drawable/bg_line_edittext">
+
+            <com.uas.rd_equipment.view.ClearableEditText
+                android:id="@+id/ce_de_code"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@null"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请采集设备编号"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
+
+            <ImageView
+                android:id="@+id/storage_recharge_scan_iv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginRight="10dp"
+                android:clickable="false"
+                android:src="@drawable/ic_edittext_scan" />
+        </LinearLayout>
+        <TableLayout
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginTop="7dp">
+                <TextView
+                    android:text="编号："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_de_code"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </TableRow>
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10">
+                <TextView
+                    android:text="名称："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_de_name"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </TableRow>
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10">
+                <TextView
+                    android:text="规格："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_de_spec"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </TableRow>
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10">
+                <TextView
+                    android:text="使用部门："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_de_currentcentername"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </TableRow>
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10">
+                <TextView
+                    android:text="使用线体："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_de_currentlinecode"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </TableRow>
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10">
+                <TextView
+                    android:text="寿命剩余(天)："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_de_lefttime"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </TableRow>
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10">
+                <TextView
+                    android:text="管理人员："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"
+                    />
+                <TextView
+                    android:id="@+id/tv_de_manageman"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </TableRow>
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10">
+                <TextView
+                    android:text="管理人员电话："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/de_managemantel"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </TableRow>
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10">
+                <TextView
+                    android:text="设备厂商："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_de_vendor"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </TableRow>
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10">
+                <TextView
+                    android:text="厂商人员："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_de_contact"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </TableRow>
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10">
+                <TextView
+                    android:text="厂商电话："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_de_telvendor"
+                    android:text=""
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </TableRow>
+            <TableRow
+                android:layout_marginLeft="@dimen/dp_10">
+                <TextView
+                    android:text="状态："
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="right"
+                    android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_de_status"
+                    android:text=""
+                    android:textColor="@color/blue"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"/>
+            </TableRow>
+        </TableLayout>
+
+        <LinearLayout
+            android:layout_marginLeft="15dp"
+            android:layout_marginTop="15dp"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="变更状态："
+                android:textColor="@color/black">
+            </TextView>
+            <LinearLayout
+                android:background="@drawable/bg_edittext_black"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="14dp">
+                <Spinner
+                    android:id="@+id/spinner02"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+                </Spinner>
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_marginLeft="15dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="15dp"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="变更说明："
+                android:textColor="@color/black">
+            </TextView>
+
+            <com.uas.rd_equipment.view.ClearableEditText
+                android:id="@+id/cle_change"
+                style="@style/EditTextStyle"
+                android:layout_marginLeft="14dp"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint=""
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+
+
+    <LinearLayout
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/tv_prompt"
+            android:text=""
+            android:layout_marginLeft="15dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+        </TextView>
+        <LinearLayout
+            android:background="@color/white"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/textsize_20">
+            <Button
+                android:id="@+id/btn_commit"
+                android:layout_width="150dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:background="@drawable/bg_button"
+                android:layout_gravity="center"
+                android:text="提交"
+                android:textColor="@color/white">
+            </Button>
+        </LinearLayout>
+    </LinearLayout>
+
+
+</RelativeLayout>

app/src/main/res/values/strings.xml

@@ -319,6 +319,7 @@
     <string name="title_problem_detection">问题缉查</string>
     <string name="title_requisition_transfer">领用转移</string>
     <string name="title_storage_deliveryforrepair">维修与确认</string>
+    <string name="title_storage_CHANGE">设备状态变更</string>
     <string name="title_storage_remould">设备改造</string>
     <string name="material_storage">材料入库</string>
     <string name="finished_goods_storage">成品入库</string>