UAS-MES工序管理模块功能调整

app/build.gradle

@@ -16,7 +16,7 @@ android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
     defaultConfig {
-        applicationId "com.uas.gdstorage"
+        applicationId "com.uas.mes"
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
         versionCode rootProject.ext.android.versionCode

app/src/main/AndroidManifest.xml

@@ -70,7 +70,7 @@
 
         <provider xmlns:tools="http://schemas.android.com/tools"
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.uas.gdstorage.fileprovider"
+            android:authorities="com.uas.mes.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true"
             tools:replace="android:authorities">

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

@@ -14,14 +14,15 @@ import android.widget.TextView;
 import com.android.volley.toolbox.StringRequest;
 import com.uas.gdstorage.R;
 import com.uas.gdstorage.fragment.BaseFragment;
+import com.uas.gdstorage.fragment.ChargingSummaryFragment;
 import com.uas.gdstorage.fragment.GdMaterialInFragment;
-import com.uas.gdstorage.fragment.GdStaffChangeFragment;
 import com.uas.gdstorage.fragment.GdTimeReportFragment;
 import com.uas.gdstorage.fragment.GdWorkPauseFragment;
 import com.uas.gdstorage.fragment.GdWorkStartFragment;
 import com.uas.gdstorage.fragment.GdWorkSwitchFragment;
 import com.uas.gdstorage.fragment.IndexSettingFragment;
 import com.uas.gdstorage.fragment.QualityManageFragment;
+import com.uas.gdstorage.fragment.ReportDetailFragment;
 import com.uas.gdstorage.global.GloableParams;
 import com.uas.gdstorage.interfaces.BackHandlerInterface;
 import com.uas.gdstorage.tools.DataSourceManager;
@@ -77,15 +78,11 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
         if (savedInstanceState == null) {
             Bundle mbundle = new Bundle();
             switch (funName) {
-                //上料
-                case GloableParams.GRIDNAME_IN_MATERIAL:
-                    mFragment = new GdMaterialInFragment();
-                    break;
-                //工单启动
+                //工单绑定
                 case GloableParams.GRIDNAME_WORK_START:
                     mFragment = new GdWorkStartFragment();
                     break;
-                //工单暂停
+                //解除绑定
                 case GloableParams.GRIDNAME_WORK_PAUSE:
                     mFragment = new GdWorkPauseFragment();
                     break;
@@ -93,13 +90,22 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.GRIDNAME_WORK_SWITCH:
                     mFragment = new GdWorkSwitchFragment();
                     break;
-                //实时报工
+                //接料
+                case GloableParams.GRIDNAME_IN_MATERIAL:
+                    mFragment = new GdMaterialInFragment();
+                    break;
+                //报工
                 case GloableParams.GRIDNAME_TIME_REPORT:
                     mFragment = new GdTimeReportFragment();
                     break;
-                //人员换岗
-                case GloableParams.GRIDNAME_STAFF_CHANGE:
-                    mFragment = new GdStaffChangeFragment();
+                //报工明细
+                case GloableParams.GRIDNAME_TIME_REPORT_DETAIL:
+                    mFragment = new ReportDetailFragment();
+                    break;
+                //物料明细
+                case GloableParams.GRIDNAME_TIME_METRIAL_DETAIL:
+                    mFragment = new ChargingSummaryFragment();
+                    mbundle.putString(Constants.FLAG.MA_TITLE,"物料明细");
                     break;
                 case GloableParams.HOME_QUALITY_MANAGE:
                     mFragment = new QualityManageFragment();

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

@@ -126,11 +126,11 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         String itemName = (String) gridItemList.get(position).get(DataSourceManager.KEY_GRID_ITEMNAME);
         switch (itemName) {
-            case GloableParams.HOME_DISPATCH_MANAGE:
+            case GloableParams.HOME_DISPATCH_MANAGE://工序管理
                 startActivity(new Intent(HomeActivity.this, IndexActivity.class));
                 break;
-            case GloableParams.HOME_QUALITY_MANAGE:
-            case GloableParams.GRIDNAME_SETTING:
+            case GloableParams.HOME_QUALITY_MANAGE://品质管理
+            case GloableParams.GRIDNAME_SETTING://设置
                 Intent intent = new Intent(HomeActivity.this, FunctionActivity.class);
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);

app/src/main/java/com/uas/gdstorage/activity/IndexActivity.java

@@ -1,16 +1,11 @@
 package com.uas.gdstorage.activity;
 
-import android.Manifest;
 import android.app.Activity;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.BitmapDrawable;
-import android.os.Bundle;
 import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -29,7 +24,6 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
-import com.android.volley.toolbox.StringRequest;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.uas.gdstorage.R;
@@ -59,8 +53,6 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import javax.crypto.Mac;
-
 import razerdp.basepopup.BasePopupWindow;
 
 public class IndexActivity extends BaseActivity implements AdapterView.OnItemClickListener, View.OnClickListener, StaffUpPopup.OnStaffUpListener {
@@ -70,7 +62,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     private GridView menuGridView;
     private TextView actionbarTextVeiw;
     private PopupWindow mExitPopupWindow;
-    private TextView mPositionR, mFeeding, mCurDoc, mUnfinish, mEmCodeTv, mEmNameTv, mScName, mStaffTextView, mScrapTextView;
+    private TextView mPositionR, mFeeding, mCurDoc, mUnfinish, tv_pihao,
+            mEmCodeTv, mEmNameTv, mScName, mStaffTextView, mScrapTextView;
     private String sc_code = null, mStaffName, mStaffCode;
     private RefreshLayout mRefreshLayout;
     private PopupWindow editPW;
@@ -97,12 +90,13 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         menuGridView = (GridView) findViewById(R.id.grid_menu);
         mPositionR = (TextView) findViewById(R.id.index_position_resource);
         mScName = (TextView) findViewById(R.id.scname_tv);
-        mFeeding = (TextView) findViewById(R.id.index_feeding);
+      //  mFeeding = (TextView) findViewById(R.id.index_feeding);
         mCurDoc = (TextView) findViewById(R.id.index_cur_doc);
         mUnfinish = (TextView) findViewById(R.id.index_unfinish_number);
         mBackButton = findViewById(R.id.btn_actionbar_withback);
-        mStaffTextView = findViewById(R.id.index_staff_info_tv);
+      //  mStaffTextView = findViewById(R.id.index_staff_info_tv);
         mScrapTextView = findViewById(R.id.index_scrap_number);
+        tv_pihao=findViewById(R.id.tv_pihao);
 
         findViewById(R.id.index_edit).setOnClickListener(this);
         mRefreshLayout = findViewById(R.id.SmartRefreshLayout_id);
@@ -391,11 +385,11 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             CommonUtil.toastNoRepeat(this, "岗位资源数据为空");
             return;
         }
-        if (!StringUtil.isEmpty(dataObject.getString("LI_NAME"))) {
-            mFeeding.setText(dataObject.getString("LI_NAME"));
-        } else {
-            mFeeding.setText("-");
-        }
+//        if (!StringUtil.isEmpty(dataObject.getString("LI_NAME"))) {
+//            mFeeding.setText(dataObject.getString("LI_NAME"));
+//        } else {
+//            mFeeding.setText("-");
+//        }
         if (!StringUtil.isEmpty(dataObject.getString("DL_MACODE"))) {
             MACODE = dataObject.getString("DL_MACODE");
             SharedPreUtil.saveString(this, "MA_CODE", dataObject.getString("DL_MACODE"));
@@ -410,11 +404,18 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
             mUnfinish.setText("");
         }
 
-        mScrapTextView.setText(FastjsonUtil.getText(dataObject, "MA_ONLINESCRAPQTY"));
+        if (!StringUtil.isEmpty(dataObject.getString("SC_STEPCODE"))) {
+            tv_pihao.setText(dataObject.getString("SC_STEPCODE"));
+        } else {
+            tv_pihao.setText("");
+        }
 
+        mScrapTextView.setText(FastjsonUtil.getText(dataObject, "MA_ONLINESCRAPQTY"));
         mStaffName = FastjsonUtil.getText(dataObject, "UO_EMNAME");
-        mStaffCode = FastjsonUtil.getText(dataObject, "UO_EMCODE");
-        mStaffTextView.setText(mStaffName + (TextUtils.isEmpty(mStaffCode) ? "" : ("(" + mStaffCode + ")")));
+        mStaffCode = TextUtils.isEmpty(FastjsonUtil.getText(dataObject, "UO_EMCODE"))?
+                SharedPreUtil.getString(this, Constants.FLAG.CACHE_USER_EMCODE, "")
+                :FastjsonUtil.getText(dataObject, "UO_EMCODE");
+       // mStaffTextView.setText(mStaffName + (TextUtils.isEmpty(mStaffCode) ? "" : ("(" + mStaffCode + ")")));
     }
 
 
@@ -423,22 +424,8 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
         super.onResume();
         mEmCodeTv.setText("(" + SharedPreUtil.getString(this, Constants.FLAG.CACHE_USER_EMCODE, "-") + ")");
         mEmNameTv.setText(SharedPreUtil.getString(this, Constants.FLAG.CACHE_USER_EMNAME, "-"));
-       /* Intent intent = getIntent();
-        boolean needClear = intent.getBooleanExtra(Constants.FLAG.NEED_CLEAR_SCCODE,false);
-        String fromSc_Code = intent.getStringExtra(Constants.FLAG.SC_CODE);
-        LogUtil.i("getDevicelineneedClear",needClear+"");
-        LogUtil.i("getDevicelinefromSc_Code",fromSc_Code+"");
-        if (!StringUtil.isEmpty(fromSc_Code) && !needClear){
-            getDeviceline(fromSc_Code);
-        }else if (!StringUtil.isEmpty(fromSc_Code) && needClear){
-            sc_code = null;
-            mPositionR.setText("");
-            mFeeding.setText("");
-            mCurDoc.setText("");
-            mUnfinish.setText("");
-        }else {
-            return;
-        }*/
+        //新增---给上线人员设置默认值
+        mStaffCode =SharedPreUtil.getString(this, Constants.FLAG.CACHE_USER_EMCODE, "");
     }
 
     @Override
@@ -466,60 +453,34 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         String itemName = (String) gridItemList.get(position).get(DataSourceManager.KEY_GRID_ITEMNAME);
         //岗位
-        String station = mPositionR.getText().toString().trim();
+        String station = mPositionR.getText().toString().trim();//岗位资源
         if (StringUtil.isEmpty(station)) {
-            if (GloableParams.GRIDNAME_STAFF_CHANGE.equals(itemName)) {
-                goFragment(position);
-            } else {
-                CommonUtil.toastNoRepeat(this, "请先采集岗位资源");
-                return;
-            }
+            CommonUtil.toastNoRepeat(this, "请先采集岗位资源");
+            return;
         } else {
-            if (GloableParams.GRIDNAME_STAFF_UP.equals(itemName)) {
-                if (!TextUtils.isEmpty(mStaffCode)) {
-                    CommonUtil.toastNoRepeat(this, "请先将当前上线人员下线");
-                } else {
-                    mStaffUpPopup.showPopupWindow();
-                }
-            } else if (GloableParams.GRIDNAME_STAFF_DOWN.equals(itemName)) {
-                if (TextUtils.isEmpty(mStaffCode)) {
-                    CommonUtil.toastNoRepeat(this, "当前无上线人员");
-                } else {
-                    new AlertDialog.Builder(this)
-                            .setTitle("提示")
-                            .setMessage("确认将当前上线人员：" + mStaffName + "  下线？")
-                            .setNegativeButton(R.string.cancel, null)
-                            .setPositiveButton(R.string.confirm, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    staffDown();
-                                }
-                            }).show();
-                }
+            //工单暂停,工单切换,实时报工
+            if (TextUtils.isEmpty(mStaffCode) && (GloableParams.GRIDNAME_WORK_PAUSE.equals(itemName)
+                    || GloableParams.GRIDNAME_WORK_SWITCH.equals(itemName)
+                    || GloableParams.GRIDNAME_TIME_REPORT.equals(itemName)
+                    || GloableParams.GRIDNAME_TIME_REPORT_DETAIL.equals(itemName))) {
+                CommonUtil.toastNoRepeat(this, "当前没有上线人员，请先进行人员上线");
             } else {
-                if (TextUtils.isEmpty(mStaffCode) && (GloableParams.GRIDNAME_WORK_PAUSE.equals(itemName)
-                        || GloableParams.GRIDNAME_WORK_SWITCH.equals(itemName)
-                        || GloableParams.GRIDNAME_TIME_REPORT.equals(itemName))) {
-                    CommonUtil.toastNoRepeat(this, "当前没有上线人员，请先进行人员上线");
+                //工单号为空，启动工单
+                String workOrder = mCurDoc.getText().toString().trim();
+                if (StringUtil.isEmpty(workOrder)) {
+                    //工单启动，人员换岗
+                    if (GloableParams.GRIDNAME_WORK_START.equals(itemName)) {
+                        goFragment(position);
+                    } else {
+                        CommonUtil.toastNoRepeat(this, "暂无在线工单，可点击工单启动进行操作");
+                    }
                 } else {
-                    //工单
-                    String workOrder = mCurDoc.getText().toString().trim();
-                    if (StringUtil.isEmpty(workOrder)) {
-                        if (GloableParams.GRIDNAME_WORK_START.equals(itemName)
-                                || GloableParams.GRIDNAME_STAFF_CHANGE.equals(itemName)) {
-                            goFragment(position);
-                        } else {
-                            CommonUtil.toastNoRepeat(this, "暂无在线工单，可点击工单启动进行操作");
-                        }
+                    if (GloableParams.GRIDNAME_WORK_START.equals(itemName)) {//工单启动
+                        CommonUtil.toastNoRepeat(this, "已有在线工单不需要进行工单启动");
                     } else {
-                        if (GloableParams.GRIDNAME_WORK_START.equals(itemName)) {
-                            CommonUtil.toastNoRepeat(this, "已有在线工单不需要进行工单启动");
-                        } else {
-                            goFragment(position);
-                        }
+                        goFragment(position);
                     }
                 }
-
             }
         }
 

app/src/main/java/com/uas/gdstorage/fragment/ChargingSummaryFragment.java

@@ -31,6 +31,7 @@ public class ChargingSummaryFragment extends BaseFragment {
     private ChargingSummaryAdapter mChargingSummaryAdapter;
     private List<ChargingSummaryBean> mChargingSummaryBeans;
     private String mSccode;
+    private String title;
 
     @Override
     protected int getLayout() {
@@ -44,6 +45,8 @@ public class ChargingSummaryFragment extends BaseFragment {
         Bundle arguments = getArguments();
         if (arguments != null) {
             mSccode = arguments.getString(Constants.FLAG.SC_CODE, "");
+            title=arguments.getString(Constants.FLAG.MA_TITLE,"上料汇总");
+            setTitle(title);
         }
         mRefreshLayout = root.findViewById(R.id.charging_summary_srl);
         mRecyclerView = root.findViewById(R.id.charging_summary_rv);

app/src/main/java/com/uas/gdstorage/fragment/ReportDetailFragment.java

@@ -0,0 +1,50 @@
+package com.uas.gdstorage.fragment;
+
+import android.view.KeyEvent;
+import android.view.View;
+import com.uas.gdstorage.R;
+import com.uas.gdstorage.activity.FunctionActivity;
+import com.uas.gdstorage.util.LogUtil;
+
+public class ReportDetailFragment extends BaseFragment {
+
+    private Boolean canReturn = true;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_report_detail;
+    }
+
+    @Override
+    protected void initViews() {
+        ((FunctionActivity) getActivity()).setTitle("报工明细");
+    }
+    @Override
+    protected void initEvents() {
+        mActivity.findViewById(R.id.btn_actionbar_withback).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                LogUtil.i(TAG,"按了左上角返回键");
+                if(canReturn){
+                    getActivity().finish();
+                }
+                progressDialog.dismiss();
+            }
+        });
+
+    }
+
+    @Override
+    protected void initDatas() {
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

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

@@ -718,7 +718,7 @@ public class GloableParams {
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
     //home主页面
-    public static final String HOME_DISPATCH_MANAGE = "派工管理";
+    public static final String HOME_DISPATCH_MANAGE = "工序管理";
     public static final String HOME_QUALITY_MANAGE = "品质管理";
     public static final String GRIDNAME_SETTING = "设置";
     public static String[] homeMenuNames = {HOME_DISPATCH_MANAGE, HOME_QUALITY_MANAGE,GRIDNAME_SETTING};
@@ -726,22 +726,24 @@ public class GloableParams {
             R.drawable.ic_quality_manage,R.drawable.mainmenu_usersetting};
 
     //index界面
-    public static final String GRIDNAME_IN_MATERIAL = "上料";
-    public static final String GRIDNAME_WORK_START = "工单启动";
-    public static final String GRIDNAME_WORK_PAUSE = "工单暂停";
+
+    public static final String GRIDNAME_WORK_START = "工单绑定";
+    public static final String GRIDNAME_WORK_PAUSE = "解除绑定";
     public static final String GRIDNAME_WORK_SWITCH = "工单切换";
-    public static final String GRIDNAME_TIME_REPORT = "实时报工";
-    public static final String GRIDNAME_STAFF_CHANGE = "人员换岗";
-    public static final String GRIDNAME_STAFF_UP = "人员上线";
-    public static final String GRIDNAME_STAFF_DOWN = "人员下线";
-    public static String[] indexMainGridNames = {GRIDNAME_IN_MATERIAL, GRIDNAME_WORK_START,
-            GRIDNAME_WORK_PAUSE, GRIDNAME_WORK_SWITCH, GRIDNAME_TIME_REPORT, GRIDNAME_STAFF_CHANGE
-            , GRIDNAME_STAFF_UP, GRIDNAME_STAFF_DOWN};
+    public static final String GRIDNAME_IN_MATERIAL = "接料";
+    public static final String GRIDNAME_TIME_REPORT = "报工";
+    public static final String GRIDNAME_TIME_REPORT_DETAIL = "报工明细";
+    public static final String GRIDNAME_TIME_METRIAL_DETAIL = "物料明细";
+   // public static final String GRIDNAME_STAFF_CHANGE = "人员换岗";
+    //public static final String GRIDNAME_STAFF_UP = "人员上线";
+  //  public static final String GRIDNAME_STAFF_DOWN = "人员下线";
+    public static String[] indexMainGridNames = {GRIDNAME_WORK_START,
+            GRIDNAME_WORK_PAUSE, GRIDNAME_WORK_SWITCH, GRIDNAME_IN_MATERIAL, GRIDNAME_TIME_REPORT,
+           GRIDNAME_TIME_REPORT_DETAIL,GRIDNAME_TIME_METRIAL_DETAIL};
 
-    public static int[] indexMainGridImgs = {R.drawable.feeded,
-            R.drawable.start, R.drawable.pause, R.drawable.swich
-            , R.drawable.report, R.drawable.staffchange
-            , R.drawable.ic_staff_up, R.drawable.ic_staff_down};
+    public static int[] indexMainGridImgs = {R.drawable.start, R.drawable.pause, R.drawable.swich,
+            R.drawable.feeded, R.drawable.report,
+            R.drawable.ic_staff_up, R.drawable.ic_staff_down};
 
     //INDEX:出入库管理Index
     public static final String GRIDNAME_CODEBAR_COLLECT = "入库";

app/src/main/java/com/uas/gdstorage/util/Constants.java

@@ -214,6 +214,7 @@ public interface Constants {
         String SC_CODE = "PDA_GD_SC_CODE";
         String MA_CODE = "PDA_GD_MA_CODE";
         String NEED_CLEAR_SCCODE = "NEED_CLEAR_SCCODE";
+        String MA_TITLE = "ma_title";
 
         //报工单位
         String REPORT_UNIT = "cache_report_unit";

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

@@ -8,10 +8,6 @@
     android:focusableInTouchMode="true">
 
 
-    <include
-        android:id="@+id/include_menuactionbar"
-        layout="@layout/index_actionbar" />
-
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:id="@+id/SmartRefreshLayout_id"
         android:layout_width="match_parent"
@@ -19,84 +15,90 @@
         android:layout_below="@id/include_menuactionbar"
         android:layout_centerInParent="true">
 
-        <com.scwang.smartrefresh.layout.header.ClassicsHeader
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:srlAccentColor="@android:color/darker_gray" />
-
         <android.support.v4.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
 
                     <LinearLayout
-                        android:layout_width="0dp"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="7"
-                        android:orientation="vertical"
-                        android:padding="8dp">
-
+                        android:gravity="center_vertical">
                         <LinearLayout
-                            android:layout_width="match_parent"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:gravity="center_vertical"
-                            android:orientation="horizontal">
+                            android:layout_weight="1"
+                            android:orientation="vertical"
+                            android:layout_marginLeft="12dp"
+                            android:padding="8dp">
 
-                            <TextView
-                                android:id="@+id/em_name_tv"
-                                android:layout_width="wrap_content"
+                            <LinearLayout
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:textColor="#333333" />
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
 
-                            <TextView
-                                android:id="@+id/em_code_tv"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="10dp"
-                                android:textColor="#333333" />
-                        </LinearLayout>
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="账号:"
+                                    android:textColor="#333333"
+                                    android:textSize="12sp" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp">
+                                <TextView
+                                    android:id="@+id/em_name_tv"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:textColor="#333333"
+                                    android:textSize="12sp"
+                                    tools:text="吴雨潇" />
+
+                                <TextView
+                                    android:id="@+id/em_code_tv"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginLeft="10dp"
+                                    android:textColor="#333333"
+                                    android:textSize="12sp" />
 
-                            <TextView
-                                style="@style/captiontext"
-                                android:text="上线人员:" />
+                            </LinearLayout>
 
-                            <TextView
-                                android:id="@+id/index_staff_info_tv"
-                                style="@style/valuetext" />
                         </LinearLayout>
-
                         <LinearLayout
-                            android:layout_width="match_parent"
+                            android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:orientation="horizontal">
 
+                            android:layout_weight="1"
+                            android:orientation="horizontal">
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="4dp">
+                                android:layout_marginTop="4dp"
+                                android:gravity="center_vertical"
+                                >
 
                                 <TextView
                                     style="@style/captiontext"
-                                    android:text="岗位:" />
+                                    android:text="岗位:"
+                                    android:textColor="#333333"
+                                    android:textSize="12sp" />
 
                                 <TextView
                                     android:id="@+id/index_position_resource"
                                     style="@style/valuetext"
-                                    android:layout_width="wrap_content" />
+                                    android:layout_width="wrap_content"
+                                    android:textColor="#333333"
+                                    android:textSize="12sp"
+                                    tools:text="3AAA" />
 
                                 <TextView
                                     android:id="@+id/scname_tv"
@@ -105,79 +107,94 @@
                                     android:paddingLeft="10dp" />
                             </LinearLayout>
 
-
                         </LinearLayout>
+                        <ImageView
+                            android:id="@+id/index_edit"
+                            android:layout_width="20dp"
+                            android:layout_height="24dp"
+                            android:src="@drawable/edit_easyicon"
+                            android:layout_marginRight="10dp"/>
+                    </LinearLayout>
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp">
-
-                            <TextView
-                                style="@style/captiontext"
-                                android:text="线别:" />
 
-                            <TextView
-                                android:id="@+id/index_feeding"
-                                style="@style/valuetext" />
-                        </LinearLayout>
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp">
+                </LinearLayout>
 
-                            <TextView
-                                style="@style/captiontext"
-                                android:text="工单:" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
 
-                            <TextView
-                                android:id="@+id/index_cur_doc"
-                                style="@style/valuetext" />
-                        </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:layout_weight="1">
 
+                        <TextView
+                            style="@style/captiontext"
+                            android:layout_width="wrap_content"
+                            android:text="工单:" />
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp">
-
-                            <TextView
-                                style="@style/captiontext"
-                                android:text="未完数：" />
-
-                            <TextView
-                                android:id="@+id/index_unfinish_number"
-                                style="@style/valuetext"
-                                android:layout_width="0dp"
-                                android:layout_weight="1" />
-
-                            <TextView
-                                style="@style/captiontext"
-                                android:text="报废数：" />
-
-                            <TextView
-                                android:id="@+id/index_scrap_number"
-                                style="@style/valuetext"
-                                android:layout_width="0dp"
-                                android:layout_weight="1" />
-                        </LinearLayout>
+                        <TextView
+                            android:id="@+id/index_cur_doc"
+                            style="@style/valuetext" />
                     </LinearLayout>
 
                     <LinearLayout
-                        android:id="@+id/index_edit"
-                        android:layout_width="50dp"
-                        android:layout_height="80dp"
-                        android:layout_marginTop="50dp">
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:layout_weight="1">
 
-                        <ImageView
-                            android:layout_width="20dp"
-                            android:layout_height="24dp"
-                            android:src="@drawable/edit_easyicon" />
+                        <TextView
+                            style="@style/captiontext"
+                            android:text="批号:" />
+
+                        <TextView
+                            android:id="@+id/tv_pihao"
+                            style="@style/valuetext" />
                     </LinearLayout>
+                    <View
+                        android:layout_width="20dp"
+                        android:layout_height="wrap_content"/>
 
                 </LinearLayout>
 
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp">
+
+                    <TextView
+                        style="@style/captiontext"
+                        android:layout_width="wrap_content"
+                        android:text="未完数：" />
+
+                    <TextView
+                        android:id="@+id/index_unfinish_number"
+                        style="@style/valuetext"
+                        android:layout_width="0dp"
+                        android:layout_weight="1" />
+
+                    <TextView
+                        style="@style/captiontext"
+                        android:text="报废数：" />
+
+                    <TextView
+                        android:id="@+id/index_scrap_number"
+                        style="@style/valuetext"
+                        android:layout_width="0dp"
+                        android:layout_weight="1" />
+                    <View
+                        android:layout_width="20dp"
+                        android:layout_height="wrap_content"/>
+                </LinearLayout>
+
                 <com.uas.gdstorage.view.MyGridView
                     android:id="@+id/grid_menu"
                     style="@style/MenuGridViewStyle"
@@ -185,11 +202,21 @@
 
             </LinearLayout>
 
+
         </android.support.v4.widget.NestedScrollView>
 
         <com.scwang.smartrefresh.layout.footer.ClassicsFooter
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:srlAccentColor="@android:color/darker_gray" />
+
+        <com.scwang.smartrefresh.layout.header.ClassicsHeader
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:srlAccentColor="@android:color/darker_gray" />
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+
+    <include
+        android:id="@+id/include_menuactionbar"
+        layout="@layout/index_actionbar" />
 </RelativeLayout>

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

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="8dp">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="7"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="12dp">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:id="@+id/em_name_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="#333333"
+                        />
+                    <TextView
+                        android:id="@+id/em_code_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="#333333"
+                        android:layout_marginLeft="10dp"
+                        />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="10dp">
+
+                        <TextView
+                            android:text="岗位："
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            />
+                        <TextView
+                            android:id="@+id/ol_resource_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:text="CC"
+                            />
+                        <TextView
+                            android:text="非上料的岗位资源名称CCCCCCCCCCCCCCCC"
+                            android:id="@+id/scname_tv"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="#333333"
+                            android:layout_marginLeft="10dp"/>
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginTop="10dp">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="未完数："
+                        android:textColor="#333333" />
+
+                    <TextView
+                        android:id="@+id/unfinish_number_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="#333333" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="14dp"
+            android:layout_marginBottom="4dp"
+            android:orientation="horizontal">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:width="80dp"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="账号"
+                android:textColor="@color/red"
+                android:textSize="14sp" />
+
+            <com.uas.gdstorage.view.ClearableEditText
+                android:id="@+id/account_et"
+                style="@style/EditTextStyle"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:hint="请输入"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:orientation="horizontal">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:width="80dp"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="密码"
+                android:textColor="@color/red"
+                android:textSize="14sp" />
+
+            <com.uas.gdstorage.view.ClearableEditText
+                android:id="@+id/password_et"
+                style="@style/EditTextStyle"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:hint="请输入"
+                android:textColor="@color/black"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <CheckBox
+            android:id="@+id/ischecked_ck"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:text="切换人员岗位资源不变"
+            android:checked="false"
+            />
+
+        <Button
+            android:id="@+id/surechange_brn"
+            style="@style/ButtonStyle"
+            android:text="确认切换人员" />
+    </LinearLayout>
+</LinearLayout>

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

@@ -1,6 +1,6 @@
 <resources>
-    <string name="app_name">高登制程</string>
-    <string name="app_name_test">高登制程</string>
+    <string name="app_name">UAS-MES</string>
+    <string name="app_name_test">UAS-MES</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
     <string name="title_activity_connect_server_fragment">ConnectServerFragment</string>