1.仓库 详情

2.//TODO erp用户激活，忘记密码测试，产品下单还差附件，bat，mes，消息，我的，刷新token

app/src/main/AndroidManifest.xml

@@ -488,6 +488,30 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.work.WorkWarehouseStockFlowDetailActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="流水详情"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.work.WorkWarehouseStockDetailFlowActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="库存数量明细流水"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.work.WorkWarehouseStockDetailFlowDetailActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:label="流水详情"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

app/src/main/java/com/wd/workoffice/bean/StockFlowBean.java

@@ -138,13 +138,22 @@ public class StockFlowBean {
         private String optComment;
         private Object commenceFromId;
         private Object createdType;
-        private Object originStockName;
+        private String originStockName;
         private String targetStockName;
         private String productName;
         private String optUserName;
         private String typeName;
         private String stockEventName;
         private String orderEventName;
+        private String remark;
+
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
 
         public int getCreatedBy() {
             return createdBy;
@@ -322,11 +331,11 @@ public class StockFlowBean {
             this.createdType = createdType;
         }
 
-        public Object getOriginStockName() {
+        public String getOriginStockName() {
             return originStockName;
         }
 
-        public void setOriginStockName(Object originStockName) {
+        public void setOriginStockName(String originStockName) {
             this.originStockName = originStockName;
         }
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockActivity.java

@@ -144,7 +144,6 @@ public class WorkWarehouseStockActivity extends WorkToolBarActivity {
                         break;
                     case R.id.tv_flow:
                         startActivity(WorkWarehouseStockFlowActivity.class,"id",dataList.get(position).getId()+"");
-
                         break;
                 }
             }

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockDetailActivity.java

 package com.wd.workoffice.ui.activity.bat.work;
 
-import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -9,19 +8,14 @@ import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
-import com.wd.workoffice.WarehouseStockBean;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.InStockBean;
 import com.wd.workoffice.bean.StockDetailBean;
 import com.wd.workoffice.bean.listener.OneMenuClickListener;
-import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.WorkInStockAdapter;
 import com.wd.workoffice.ui.adapter.WorkStockDetailAdapter;
 import com.wd.workoffice.util.WorkUtils;
-import com.wd.workoffice.util.ddmfilter.InSotckFilterData;
 import com.wd.workoffice.util.ddmfilter.StockDetailFilterData;
 import com.wd.workoffice.widget.DropDownMenu;
 
@@ -136,7 +130,7 @@ public class WorkWarehouseStockDetailActivity extends WorkToolBarActivity {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(WorkProDetailActivity.class, "pro", JSON.toJSONString(dataList.get(position)));
+                startActivity(WorkWarehouseStockDetailFlowActivity.class, "id", dataList.get(position).getId()+"");
             }
         });
     }

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockDetailFlowActivity.java

+package com.wd.workoffice.ui.activity.bat.work;
+
+import android.view.View;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.bigkoo.pickerview.listener.OnTimeSelectListener;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.StockFlowBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.WorkStockDetailFlowAdapter;
+import com.wd.workoffice.util.PickTimeUtils;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import flexible.xd.android_base.utils.TimeUtils;
+import io.reactivex.disposables.Disposable;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class WorkWarehouseStockDetailFlowActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    @BindView(R.id.tv_start)
+    TextView tvStart;
+    @BindView(R.id.tv_end)
+    TextView tvEnd;
+    private Map<String, Object> param;
+    private List<StockFlowBean.RecordsBean> dataList;
+    private WorkStockDetailFlowAdapter dataAdapter;
+    private int page = 1;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+    }
+
+
+    @Override
+    protected void initData() {
+        dataList = new ArrayList<>();
+        dataAdapter = new WorkStockDetailFlowAdapter(R.layout.item_stock_detail_flow, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+        param = WorkUtils.pageKey();
+        param.put("sqId", getIntent().getStringExtra("id"));
+        param.put("current", page);
+        getData();
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().stockFlow(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<StockFlowBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), StockFlowBean.class).getRecords();
+
+                if (page == 1) {
+                    srlRefresh.finishRefresh();
+                    dataList.clear();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                    dataAdapter.loadMoreComplete();
+                } else {
+                    dataAdapter.loadMoreComplete();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    dataAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+            }
+        });
+    }
+
+
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                page = 1;
+                param.put("current", page);
+                getData();
+            }
+        });
+        dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
+            @Override
+            public void onLoadMoreRequested() {
+                param.put("current", page);
+                getData();
+            }
+        }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(WorkWarehouseStockDetailFlowDetailActivity.class, "detail", JSON.toJSONString(dataList.get(position)));
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_work_detail_stock_flow;
+    }
+
+
+
+    @OnClick({ R.id.tv_start, R.id.tv_end})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_start:
+                PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
+                    @Override
+                    public void onTimeSelect(Date date, View v) {
+                        String time = TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd"));
+                        param.put("searchStartTime", time + " 00:00:00");
+                        tvStart.setText(time);
+                        page = 1;
+                        param.put("current", page);
+                        getData();
+                    }
+                }).show();
+                break;
+            case R.id.tv_end:
+                PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
+                    @Override
+                    public void onTimeSelect(Date date, View v) {
+                        String time = TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd"));
+                        param.put("searchEndTime", time + " 23:59:59");
+                        tvEnd.setText(time);
+                        page = 1;
+                        param.put("current", page);
+                        getData();
+                    }
+                }).show();
+                break;
+        }
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockDetailFlowDetailActivity.java

+package com.wd.workoffice.ui.activity.bat.work;
+
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.StockFlowBean;
+import com.wd.workoffice.util.MathUtils;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * 工作台 - 仓库 -详情 - 流水 -流水详情
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class WorkWarehouseStockDetailFlowDetailActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_no)
+    TextView tvNo;
+    @BindView(R.id.tv_flow_type)
+    TextView tvFlowType;
+    @BindView(R.id.tv_process_event)
+    TextView tvProcessEvent;
+    @BindView(R.id.tv_move_num)
+    TextView tvMoveNum;
+    @BindView(R.id.tv_balance)
+    TextView tvBalance;
+    @BindView(R.id.tv_operating)
+    TextView tvOperating;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.tv_remark)
+    TextView tvRemark;
+    @BindView(R.id.tv_desc)
+    TextView tvDesc;
+    private StockFlowBean.RecordsBean dataBean;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        dataBean = JSON.parseObject(getIntent().getStringExtra("detail"), StockFlowBean.RecordsBean.class);
+        tvNo.setText(dataBean.getLinkSerialNumber());
+        tvFlowType.setText(dataBean.getTypeName());
+        tvMoveNum.setText(MathUtils.converData(dataBean.getQuantity(), 2));
+        tvBalance.setText(MathUtils.converData(dataBean.getAfterOver(), 2));
+        tvRemark.setText(dataBean.getOptComment());
+        tvOperating.setText(dataBean.getOptUserName());
+        tvTime.setText(dataBean.getCreatedTime());
+        tvDesc.setText(dataBean.getRemark());
+        tvProcessEvent.setText(dataBean.getOrderEventName());
+    }
+
+    @Override
+    protected void initData() {
+    }
+
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_work_warehouse_detail_flow_detail;
+    }
+
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockFlowActivity.java

@@ -146,6 +146,12 @@ public class WorkWarehouseStockFlowActivity extends WorkToolBarActivity {
                 getData();
             }
         }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(WorkWarehouseStockFlowDetailActivity.class, "detail", JSON.toJSONString(dataList.get(position)));
+            }
+        });
     }
 
     @Override

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockFlowDetailActivity.java

+package com.wd.workoffice.ui.activity.bat.work;
+
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.StockFlowBean;
+import com.wd.workoffice.util.MathUtils;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * 工作台 - 部门
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class WorkWarehouseStockFlowDetailActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_no)
+    TextView tvNo;
+    @BindView(R.id.tv_flow_type)
+    TextView tvFlowType;
+    @BindView(R.id.tv_stock_event)
+    TextView tvStockEvent;
+    @BindView(R.id.tv_order_event)
+    TextView tvOrderEvent;
+    @BindView(R.id.tv_order_no)
+    TextView tvOrderNo;
+    @BindView(R.id.tv_pro_name)
+    TextView tvProName;
+    @BindView(R.id.tv_from_stock)
+    TextView tvFromStock;
+    @BindView(R.id.tv_target_stock)
+    TextView tvTargetStock;
+    @BindView(R.id.tv_move_num)
+    TextView tvMoveNum;
+    @BindView(R.id.tv_balance)
+    TextView tvBalance;
+    @BindView(R.id.tv_operating)
+    TextView tvOperating;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.tv_remark)
+    TextView tvRemark;
+    private StockFlowBean.RecordsBean dataBean;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        dataBean = JSON.parseObject(getIntent().getStringExtra("detail"), StockFlowBean.RecordsBean.class);
+        tvNo.setText(dataBean.getLinkSerialNumber());
+        tvFlowType.setText(dataBean.getTypeName());
+        tvStockEvent.setText(dataBean.getStockEventName());
+        tvOrderEvent.setText(dataBean.getOrderEventName());
+        tvOrderNo.setText(dataBean.getOrderId());
+        tvProName.setText(dataBean.getProductName());
+        tvFromStock.setText(dataBean.getOriginStockName());
+        tvTargetStock.setText(dataBean.getTargetStockName());
+        tvMoveNum.setText(MathUtils.converData(dataBean.getQuantity(), 2));
+        tvBalance.setText(MathUtils.converData(dataBean.getAfterOver(), 2));
+        tvRemark.setText(dataBean.getOptComment());
+        tvOperating.setText(dataBean.getOptUserName());
+        tvTime.setText(dataBean.getCreatedTime());
+    }
+
+    @Override
+    protected void initData() {
+    }
+
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_work_warehouse_flow_detail;
+    }
+
+}

app/src/main/java/com/wd/workoffice/ui/adapter/WorkStockDetailFlowAdapter.java

+package com.wd.workoffice.ui.adapter;
+
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.StockFlowBean;
+import com.wd.workoffice.util.MathUtils;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class WorkStockDetailFlowAdapter extends BaseQuickAdapter<StockFlowBean.RecordsBean, BaseViewHolder> {
+
+    public WorkStockDetailFlowAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, StockFlowBean.RecordsBean item) {
+        helper.setText(R.id.tv_name, item.getOrderId());
+        helper.setText(R.id.tv_move, MathUtils.converData(item.getAfterOver(),2));
+        helper.setText(R.id.tv_balance, MathUtils.converData(item.getQuantity(),2));
+        helper.setText(R.id.tv_time, item.getCreatedTime());
+        helper.setText(R.id.tv_flow_type, item.getTypeName());
+        helper.addOnClickListener(R.id.tv_flow);
+    }
+}
+

app/src/main/java/com/wd/workoffice/util/MathUtils.java

@@ -14,72 +14,86 @@ import freemarker.template.utility.CollectionUtils;
  * github: https://github.com/FlexibleXd
  **/
 public class MathUtils {
-    public static String conver(int amount){
-        String str ="";
-        if(amount<0||amount>99){
-            str="不合法的数字";
-        }else if(amount>=1&&amount<=10){
+    public static String conver(int amount) {
+        String str = "";
+        if (amount < 0 || amount > 99) {
+            str = "不合法的数字";
+        } else if (amount >= 1 && amount <= 10) {
             str = cast(amount);
-        }else if(amount>=11&&amount<=19){
-            int num = amount%10;
-            str = "十"+cast(num);
-        }else if(amount>=20&&amount<=99){
-            int num1 = amount/10%10;
-            int num2 = amount%10;
-            str = cast(num1)+"十"+cast(num2);
+        } else if (amount >= 11 && amount <= 19) {
+            int num = amount % 10;
+            str = "十" + cast(num);
+        } else if (amount >= 20 && amount <= 99) {
+            int num1 = amount / 10 % 10;
+            int num2 = amount % 10;
+            str = cast(num1) + "十" + cast(num2);
         }
 
         return str;
 
     }
 
-    public static String cast(int num){
-        String str="";
-        switch(num){
+    public static String cast(int num) {
+        String str = "";
+        switch (num) {
             case 0:
-                str="";
+                str = "";
                 break;
             case 1:
-                str="一";
+                str = "一";
                 break;
             case 2:
-                str="二";
+                str = "二";
                 break;
             case 3:
-                str="三";
+                str = "三";
                 break;
             case 4:
-                str="四";
+                str = "四";
                 break;
             case 5:
-                str="五";
+                str = "五";
                 break;
             case 6:
-                str="六";
+                str = "六";
                 break;
             case 7:
-                str="七";
+                str = "七";
                 break;
             case 8:
-                str="八";
+                str = "八";
                 break;
             case 9:
-                str="九";
+                str = "九";
                 break;
             case 10:
-                str="十";
+                str = "十";
                 break;
         }
         return str;
 
     }
-    public static String converData(String value,Integer scale){
+
+    public static String converData(String value, Integer scale) {
         if (TextUtils.isEmpty(value)) {
             value = "0";
         }
         BigDecimal bg = new BigDecimal(value);
-        return  bg.setScale(scale).toString();
+        return bg.setScale(scale).toString();
+    }
+
+    public static String converData(double value, Integer scale) {
+        String strValue;
+        if (value == 0d || TextUtils.isEmpty(String.valueOf(value))) {
+            strValue = "0";
+        } else {
+            strValue = String.valueOf(value);
+        }
+        BigDecimal bg = new BigDecimal(strValue);
+        return bg.setScale(scale).toString();
     }
+
+
     public static String multiply(String v1, String v2, Integer scale) {
         if (TextUtils.isEmpty(v1)) {
             v1 = "0";

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:paddingVertical="5mm">
+
+        <TextView
+            android:id="@+id/tv_type"
+            android:layout_width="100mm"
+            android:layout_height="wrap_content"
+            android:drawableRight="@mipmap/arrow_down"
+            android:gravity="center_vertical"
+            android:text="全部类型"
+            android:textColor="@color/flexible_text_gray"
+            android:textSize="13sp" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <TextView
+                android:id="@+id/tv_start"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableRight="@mipmap/arrow_down"
+                android:gravity="center_vertical"
+                android:paddingVertical="13mm"
+                android:text="开始时间"
+                android:textSize="13sp" />
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:text="~" />
+
+            <TextView
+                android:id="@+id/tv_end"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableRight="@mipmap/arrow_down"
+                android:gravity="center_vertical"
+                android:paddingVertical="13mm"
+                android:text="结束时间"
+                android:textSize="13sp" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/srl_refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_data"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+</LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/white"
+            android:gravity="center"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="15mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="单据编号"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_no"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="销售二公司"
+                android:textColor="@color/flexible_text_sup"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/white"
+            android:gravity="center"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="15mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="流水类别"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_flow_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/flexible_text_sup"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/white"
+            android:gravity="center"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="15mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="流程事件"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_process_event"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/flexible_text_sup"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/white"
+            android:gravity="center"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="15mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="移库数量"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_move_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="销售二公司"
+                android:textColor="@color/flexible_text_sup"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/white"
+            android:gravity="center"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="15mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="期末结余"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_balance"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/flexible_text_sup"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/white"
+            android:gravity="center"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="15mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="操作人员"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_operating"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="销售二公司"
+                android:textColor="@color/flexible_text_sup"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/white"
+            android:gravity="center"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="15mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="操作时间"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="销售二公司"
+                android:textColor="@color/flexible_text_sup"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/white"
+            android:gravity="center"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="15mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="备注"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_remark"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/flexible_text_sup"
+                android:textSize="14sp" />
+        </RelativeLayout>
+        <View style="@style/dividerX" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="1mm"
+            android:background="@color/white"
+            android:orientation="vertical"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="10mm">
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="系统备注"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_desc"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3mm"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+
+        </LinearLayout>
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@color/white"
+        android:orientation="vertical"
+        android:paddingHorizontal="20mm"
+        android:paddingVertical="10mm">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="SO10579"
+                android:textColor="@color/black"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="2019-11-26 16:65:43"
+                android:textColor="@color/flexible_text_gray" />
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8mm"
+            android:gravity="center_vertical">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="移库数量："
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:id="@+id/tv_move"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="期末结余："
+                    android:layout_marginLeft="10mm"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="12sp" />
+
+                <TextView
+                    android:id="@+id/tv_balance"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/flexible_text_gray"
+                    android:textSize="12sp" />
+
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="15mm"
+                android:layout_height="15mm"
+                android:src="@mipmap/arrow_right_gray" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8mm"
+            android:gravity="center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="流水类别："
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_flow_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="10000"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+
+</LinearLayout>