1.订单详情

2.//TODO erp用户激活测试，忘记/重置密码测试，坩埚下单页面，组装下单，产品下单还差附件测试，mes，消息，刷新token

app/src/main/AndroidManifest.xml

@@ -849,9 +849,17 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.work.WorkContactsLiveStockActivity"
+        android:name=".ui.activity.bat.work.WorkContactsLiveStockActivity"
+        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.sale.SaleOrderDetailActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label="现场库"
+            android:label="订单详情"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"

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

+package com.wd.workoffice.bean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class OrderDetail {
+
+    /**
+     * createdBy : 675
+     * createdByName : null
+     * createdTime : 2020-04-09 16:28:59
+     * updatedBy : null
+     * updatedByName : null
+     * updatedTime : null
+     * commenceFromId : null
+     * createdType : null
+     * orderType : SO
+     * id : SO10766
+     * customerId : 51
+     * supplierId : null
+     * launchUserId : 675
+     * launchUserName : 李凯
+     * launchDeptId : 117
+     * receiveUserId : null
+     * receiveUserName : null
+     * receiveDeptId : 136
+     * launchOrderAmount : 20.0
+     * orderTypeName : null
+     * launchDeptName : 销售四公司
+     * receiveDeptName : 铝碳公司
+     * expandInfo : {"createdBy":null,"createdByName":null,"createdTime":null,"updatedBy":null,"updatedByName":null,"updatedTime":null,"id":"862cf3ce9bac1fcaed4dec0d81f043e7","orderType":"SO","orderId":null,"intoStore":595,"outerStore":600,"usedStore":601,"returnStore":599,"outdeptLedger":"gk","invoiceOrderAmount":null,"comments":"","annex":null,"verifyTime":null,"verifyUserId":null,"verifyComment":null,"ensureTime":null,"ensureUserId":null,"ensureComment":null,"requireTime":"2020-10-09","warehouseTime":null,"handoverTime":null,"orderDesc":null,"erpId":null,"demond1":"","demond2":"","demond3":"","demond4":"安阳","demond5":"","verifyUserName":"李凯","ensureUserName":null,"intoStoreName":"销售四厂内入库仓库","outerStoreName":"销售四发货库","usedStoreName":"销售四领用库厂外库","returnStoreName":"销售四退货库"}
+     * status : 200
+     * attr : 100
+     * deptIdList : null
+     * realOrderAmount : 20.0
+     * outerOrderAmount : 25.0
+     * subProcessId : 567
+     * version : 1
+     * customerName : 大庆钢铁厂1
+     * subProcessName : 销售四下单流程
+     * statusName : 审核通过
+     * attrName : 正常进行中
+     * orderItems : [{"createdBy":null,"createdByName":null,"createdTime":null,"updatedBy":null,"updatedByName":null,"updatedTime":null,"id":"6233d963254148b79d7a6bf1137ad882","orderId":"SO10766","productId":16404,"innerPrice":20,"productCount":1,"type":"PDS","outerPrice":25,"storeSum":0,"shipSum":0,"packageSum":0,"usedSum":0,"invoiceSum":0,"usedReturnSum":null,"oddSum":0,"lotNumber":"LT200409001","serialNumber":null,"annex":null,"tranFromStockId":null,"customerBranchFactoryId":null,"version":0,"productName":"垫片","itemFlows":[{"createdBy":675,"createdByName":null,"createdTime":"2020-04-09 16:28:59","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":1073,"orderType":"SO","orderId":"SO10766","productId":16404,"orderItemId":"6233d963254148b79d7a6bf1137ad882","productCount":0,"eventCode":"SPLIT_PD","linkSerialNumber":null,"optUserId":675,"optComment":"拆成生产订单","eventCodeName":"拆成生产子订单","optUserName":"李凯","orderTypeName":"销售订单","productName":"垫片"}],"stockQuantityDetailList":null,"stockQuantityDetailMaps":[{"stockName":"销售四厂内入库仓库","quantity":0,"applyOut":0,"stockTypeName":"内库","stockId":595,"applyInto":0,"productName":null},{"stockName":"销售四发货库","quantity":0,"applyOut":0,"stockTypeName":"现场库","stockId":600,"applyInto":0,"productName":null},{"stockName":"销售四领用库厂外库","quantity":0,"applyOut":0,"stockTypeName":"未结算库","stockId":601,"applyInto":0,"productName":null}],"productSoleCode":"wer","productSimpleCode":"wer","productSpec":"25*30*5","productUnit":"件","productWeight":35,"canOutStoreProductSum":0,"canInStoreProductSum":0,"canUseProductSum":0,"canPackageSum":null,"launchDeptName":null,"launchDeptId":null,"receiveDeptName":null,"customerId":null,"customerName":null,"productOfKind":null,"canInvoiceSum":null,"orderType":null,"customerBranchFactoryName":null,"orderTypeName":null}]
+     * orderFlows : [{"createdBy":675,"createdByName":null,"createdTime":"2020-04-09 16:29:58","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":558,"orderType":"SO","orderId":"SO10766","eventCode":"AUDIT_OK","optUserId":675,"optComment":"","eventCodeName":"审核通过","optUserName":"李凯","orderTypeName":"销售订单"},{"createdBy":675,"createdByName":null,"createdTime":"2020-04-09 16:28:59","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":557,"orderType":"SO","orderId":"SO10766","eventCode":"PO","optUserId":675,"optComment":"","eventCodeName":"创建订单","optUserName":"李凯","orderTypeName":"销售订单"}]
+     * requireTime : 2020-10-09 00:00:00
+     * deptId : null
+     */
+
+    private int createdBy;
+    private Object createdByName;
+    private String createdTime;
+    private Object updatedBy;
+    private Object updatedByName;
+    private Object updatedTime;
+    private Object commenceFromId;
+    private Object createdType;
+    private String orderType;
+    private String id;
+    private int customerId;
+    private Object supplierId;
+    private int launchUserId;
+    private String launchUserName;
+    private int launchDeptId;
+    private Object receiveUserId;
+    private Object receiveUserName;
+    private int receiveDeptId;
+    private double launchOrderAmount;
+    private Object orderTypeName;
+    private String launchDeptName;
+    private String receiveDeptName;
+    private ExpandInfoBean expandInfo;
+    private int status;
+    private int attr;
+    private Object deptIdList;
+    private double realOrderAmount;
+    private double outerOrderAmount;
+    private int subProcessId;
+    private int version;
+    private String customerName;
+    private String subProcessName;
+    private String statusName;
+    private String attrName;
+    private String requireTime;
+    private Object deptId;
+    private List<OrderItemsBean> orderItems;
+    private List<OrderFlowsBean> orderFlows;
+
+    public int getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(int createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Object getCreatedByName() {
+        return createdByName;
+    }
+
+    public void setCreatedByName(Object createdByName) {
+        this.createdByName = createdByName;
+    }
+
+    public String getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(String createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Object getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedBy(Object updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    public Object getUpdatedByName() {
+        return updatedByName;
+    }
+
+    public void setUpdatedByName(Object updatedByName) {
+        this.updatedByName = updatedByName;
+    }
+
+    public Object getUpdatedTime() {
+        return updatedTime;
+    }
+
+    public void setUpdatedTime(Object updatedTime) {
+        this.updatedTime = updatedTime;
+    }
+
+    public Object getCommenceFromId() {
+        return commenceFromId;
+    }
+
+    public void setCommenceFromId(Object commenceFromId) {
+        this.commenceFromId = commenceFromId;
+    }
+
+    public Object getCreatedType() {
+        return createdType;
+    }
+
+    public void setCreatedType(Object createdType) {
+        this.createdType = createdType;
+    }
+
+    public String getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(String orderType) {
+        this.orderType = orderType;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public int getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(int customerId) {
+        this.customerId = customerId;
+    }
+
+    public Object getSupplierId() {
+        return supplierId;
+    }
+
+    public void setSupplierId(Object supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    public int getLaunchUserId() {
+        return launchUserId;
+    }
+
+    public void setLaunchUserId(int launchUserId) {
+        this.launchUserId = launchUserId;
+    }
+
+    public String getLaunchUserName() {
+        return launchUserName;
+    }
+
+    public void setLaunchUserName(String launchUserName) {
+        this.launchUserName = launchUserName;
+    }
+
+    public int getLaunchDeptId() {
+        return launchDeptId;
+    }
+
+    public void setLaunchDeptId(int launchDeptId) {
+        this.launchDeptId = launchDeptId;
+    }
+
+    public Object getReceiveUserId() {
+        return receiveUserId;
+    }
+
+    public void setReceiveUserId(Object receiveUserId) {
+        this.receiveUserId = receiveUserId;
+    }
+
+    public Object getReceiveUserName() {
+        return receiveUserName;
+    }
+
+    public void setReceiveUserName(Object receiveUserName) {
+        this.receiveUserName = receiveUserName;
+    }
+
+    public int getReceiveDeptId() {
+        return receiveDeptId;
+    }
+
+    public void setReceiveDeptId(int receiveDeptId) {
+        this.receiveDeptId = receiveDeptId;
+    }
+
+    public double getLaunchOrderAmount() {
+        return launchOrderAmount;
+    }
+
+    public void setLaunchOrderAmount(double launchOrderAmount) {
+        this.launchOrderAmount = launchOrderAmount;
+    }
+
+    public Object getOrderTypeName() {
+        return orderTypeName;
+    }
+
+    public void setOrderTypeName(Object orderTypeName) {
+        this.orderTypeName = orderTypeName;
+    }
+
+    public String getLaunchDeptName() {
+        return launchDeptName;
+    }
+
+    public void setLaunchDeptName(String launchDeptName) {
+        this.launchDeptName = launchDeptName;
+    }
+
+    public String getReceiveDeptName() {
+        return receiveDeptName;
+    }
+
+    public void setReceiveDeptName(String receiveDeptName) {
+        this.receiveDeptName = receiveDeptName;
+    }
+
+    public ExpandInfoBean getExpandInfo() {
+        return expandInfo;
+    }
+
+    public void setExpandInfo(ExpandInfoBean expandInfo) {
+        this.expandInfo = expandInfo;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public int getAttr() {
+        return attr;
+    }
+
+    public void setAttr(int attr) {
+        this.attr = attr;
+    }
+
+    public Object getDeptIdList() {
+        return deptIdList;
+    }
+
+    public void setDeptIdList(Object deptIdList) {
+        this.deptIdList = deptIdList;
+    }
+
+    public double getRealOrderAmount() {
+        return realOrderAmount;
+    }
+
+    public void setRealOrderAmount(double realOrderAmount) {
+        this.realOrderAmount = realOrderAmount;
+    }
+
+    public double getOuterOrderAmount() {
+        return outerOrderAmount;
+    }
+
+    public void setOuterOrderAmount(double outerOrderAmount) {
+        this.outerOrderAmount = outerOrderAmount;
+    }
+
+    public int getSubProcessId() {
+        return subProcessId;
+    }
+
+    public void setSubProcessId(int subProcessId) {
+        this.subProcessId = subProcessId;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+    public String getCustomerName() {
+        return customerName;
+    }
+
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+
+    public String getSubProcessName() {
+        return subProcessName;
+    }
+
+    public void setSubProcessName(String subProcessName) {
+        this.subProcessName = subProcessName;
+    }
+
+    public String getStatusName() {
+        return statusName;
+    }
+
+    public void setStatusName(String statusName) {
+        this.statusName = statusName;
+    }
+
+    public String getAttrName() {
+        return attrName;
+    }
+
+    public void setAttrName(String attrName) {
+        this.attrName = attrName;
+    }
+
+    public String getRequireTime() {
+        return requireTime;
+    }
+
+    public void setRequireTime(String requireTime) {
+        this.requireTime = requireTime;
+    }
+
+    public Object getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Object deptId) {
+        this.deptId = deptId;
+    }
+
+    public List<OrderItemsBean> getOrderItems() {
+        return orderItems;
+    }
+
+    public void setOrderItems(List<OrderItemsBean> orderItems) {
+        this.orderItems = orderItems;
+    }
+
+    public List<OrderFlowsBean> getOrderFlows() {
+        return orderFlows;
+    }
+
+    public void setOrderFlows(List<OrderFlowsBean> orderFlows) {
+        this.orderFlows = orderFlows;
+    }
+
+    public static class ExpandInfoBean {
+        /**
+         * createdBy : null
+         * createdByName : null
+         * createdTime : null
+         * updatedBy : null
+         * updatedByName : null
+         * updatedTime : null
+         * id : 862cf3ce9bac1fcaed4dec0d81f043e7
+         * orderType : SO
+         * orderId : null
+         * intoStore : 595
+         * outerStore : 600
+         * usedStore : 601
+         * returnStore : 599
+         * outdeptLedger : gk
+         * invoiceOrderAmount : null
+         * comments :
+         * annex : null
+         * verifyTime : null
+         * verifyUserId : null
+         * verifyComment : null
+         * ensureTime : null
+         * ensureUserId : null
+         * ensureComment : null
+         * requireTime : 2020-10-09
+         * warehouseTime : null
+         * handoverTime : null
+         * orderDesc : null
+         * erpId : null
+         * demond1 :
+         * demond2 :
+         * demond3 :
+         * demond4 : 安阳
+         * demond5 :
+         * verifyUserName : 李凯
+         * ensureUserName : null
+         * intoStoreName : 销售四厂内入库仓库
+         * outerStoreName : 销售四发货库
+         * usedStoreName : 销售四领用库厂外库
+         * returnStoreName : 销售四退货库
+         */
+
+        private Object createdBy;
+        private Object createdByName;
+        private Object createdTime;
+        private Object updatedBy;
+        private Object updatedByName;
+        private Object updatedTime;
+        private String id;
+        private String orderType;
+        private Object orderId;
+        private int intoStore;
+        private int outerStore;
+        private int usedStore;
+        private int returnStore;
+        private String outdeptLedger;
+        private Object invoiceOrderAmount;
+        private String comments;
+        private Object annex;
+        private Object verifyTime;
+        private Object verifyUserId;
+        private Object verifyComment;
+        private Object ensureTime;
+        private Object ensureUserId;
+        private Object ensureComment;
+        private String requireTime;
+        private Object warehouseTime;
+        private Object handoverTime;
+        private Object orderDesc;
+        private Object erpId;
+        private String demond1;
+        private String demond2;
+        private String demond3;
+        private String demond4;
+        private String demond5;
+        private String verifyUserName;
+        private Object ensureUserName;
+        private String intoStoreName;
+        private String outerStoreName;
+        private String usedStoreName;
+        private String returnStoreName;
+
+        public Object getCreatedBy() {
+            return createdBy;
+        }
+
+        public void setCreatedBy(Object createdBy) {
+            this.createdBy = createdBy;
+        }
+
+        public Object getCreatedByName() {
+            return createdByName;
+        }
+
+        public void setCreatedByName(Object createdByName) {
+            this.createdByName = createdByName;
+        }
+
+        public Object getCreatedTime() {
+            return createdTime;
+        }
+
+        public void setCreatedTime(Object createdTime) {
+            this.createdTime = createdTime;
+        }
+
+        public Object getUpdatedBy() {
+            return updatedBy;
+        }
+
+        public void setUpdatedBy(Object updatedBy) {
+            this.updatedBy = updatedBy;
+        }
+
+        public Object getUpdatedByName() {
+            return updatedByName;
+        }
+
+        public void setUpdatedByName(Object updatedByName) {
+            this.updatedByName = updatedByName;
+        }
+
+        public Object getUpdatedTime() {
+            return updatedTime;
+        }
+
+        public void setUpdatedTime(Object updatedTime) {
+            this.updatedTime = updatedTime;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getOrderType() {
+            return orderType;
+        }
+
+        public void setOrderType(String orderType) {
+            this.orderType = orderType;
+        }
+
+        public Object getOrderId() {
+            return orderId;
+        }
+
+        public void setOrderId(Object orderId) {
+            this.orderId = orderId;
+        }
+
+        public int getIntoStore() {
+            return intoStore;
+        }
+
+        public void setIntoStore(int intoStore) {
+            this.intoStore = intoStore;
+        }
+
+        public int getOuterStore() {
+            return outerStore;
+        }
+
+        public void setOuterStore(int outerStore) {
+            this.outerStore = outerStore;
+        }
+
+        public int getUsedStore() {
+            return usedStore;
+        }
+
+        public void setUsedStore(int usedStore) {
+            this.usedStore = usedStore;
+        }
+
+        public int getReturnStore() {
+            return returnStore;
+        }
+
+        public void setReturnStore(int returnStore) {
+            this.returnStore = returnStore;
+        }
+
+        public String getOutdeptLedger() {
+            return outdeptLedger;
+        }
+
+        public void setOutdeptLedger(String outdeptLedger) {
+            this.outdeptLedger = outdeptLedger;
+        }
+
+        public Object getInvoiceOrderAmount() {
+            return invoiceOrderAmount;
+        }
+
+        public void setInvoiceOrderAmount(Object invoiceOrderAmount) {
+            this.invoiceOrderAmount = invoiceOrderAmount;
+        }
+
+        public String getComments() {
+            return comments;
+        }
+
+        public void setComments(String comments) {
+            this.comments = comments;
+        }
+
+        public Object getAnnex() {
+            return annex;
+        }
+
+        public void setAnnex(Object annex) {
+            this.annex = annex;
+        }
+
+        public Object getVerifyTime() {
+            return verifyTime;
+        }
+
+        public void setVerifyTime(Object verifyTime) {
+            this.verifyTime = verifyTime;
+        }
+
+        public Object getVerifyUserId() {
+            return verifyUserId;
+        }
+
+        public void setVerifyUserId(Object verifyUserId) {
+            this.verifyUserId = verifyUserId;
+        }
+
+        public Object getVerifyComment() {
+            return verifyComment;
+        }
+
+        public void setVerifyComment(Object verifyComment) {
+            this.verifyComment = verifyComment;
+        }
+
+        public Object getEnsureTime() {
+            return ensureTime;
+        }
+
+        public void setEnsureTime(Object ensureTime) {
+            this.ensureTime = ensureTime;
+        }
+
+        public Object getEnsureUserId() {
+            return ensureUserId;
+        }
+
+        public void setEnsureUserId(Object ensureUserId) {
+            this.ensureUserId = ensureUserId;
+        }
+
+        public Object getEnsureComment() {
+            return ensureComment;
+        }
+
+        public void setEnsureComment(Object ensureComment) {
+            this.ensureComment = ensureComment;
+        }
+
+        public String getRequireTime() {
+            return requireTime;
+        }
+
+        public void setRequireTime(String requireTime) {
+            this.requireTime = requireTime;
+        }
+
+        public Object getWarehouseTime() {
+            return warehouseTime;
+        }
+
+        public void setWarehouseTime(Object warehouseTime) {
+            this.warehouseTime = warehouseTime;
+        }
+
+        public Object getHandoverTime() {
+            return handoverTime;
+        }
+
+        public void setHandoverTime(Object handoverTime) {
+            this.handoverTime = handoverTime;
+        }
+
+        public Object getOrderDesc() {
+            return orderDesc;
+        }
+
+        public void setOrderDesc(Object orderDesc) {
+            this.orderDesc = orderDesc;
+        }
+
+        public Object getErpId() {
+            return erpId;
+        }
+
+        public void setErpId(Object erpId) {
+            this.erpId = erpId;
+        }
+
+        public String getDemond1() {
+            return demond1;
+        }
+
+        public void setDemond1(String demond1) {
+            this.demond1 = demond1;
+        }
+
+        public String getDemond2() {
+            return demond2;
+        }
+
+        public void setDemond2(String demond2) {
+            this.demond2 = demond2;
+        }
+
+        public String getDemond3() {
+            return demond3;
+        }
+
+        public void setDemond3(String demond3) {
+            this.demond3 = demond3;
+        }
+
+        public String getDemond4() {
+            return demond4;
+        }
+
+        public void setDemond4(String demond4) {
+            this.demond4 = demond4;
+        }
+
+        public String getDemond5() {
+            return demond5;
+        }
+
+        public void setDemond5(String demond5) {
+            this.demond5 = demond5;
+        }
+
+        public String getVerifyUserName() {
+            return verifyUserName;
+        }
+
+        public void setVerifyUserName(String verifyUserName) {
+            this.verifyUserName = verifyUserName;
+        }
+
+        public Object getEnsureUserName() {
+            return ensureUserName;
+        }
+
+        public void setEnsureUserName(Object ensureUserName) {
+            this.ensureUserName = ensureUserName;
+        }
+
+        public String getIntoStoreName() {
+            return intoStoreName;
+        }
+
+        public void setIntoStoreName(String intoStoreName) {
+            this.intoStoreName = intoStoreName;
+        }
+
+        public String getOuterStoreName() {
+            return outerStoreName;
+        }
+
+        public void setOuterStoreName(String outerStoreName) {
+            this.outerStoreName = outerStoreName;
+        }
+
+        public String getUsedStoreName() {
+            return usedStoreName;
+        }
+
+        public void setUsedStoreName(String usedStoreName) {
+            this.usedStoreName = usedStoreName;
+        }
+
+        public String getReturnStoreName() {
+            return returnStoreName;
+        }
+
+        public void setReturnStoreName(String returnStoreName) {
+            this.returnStoreName = returnStoreName;
+        }
+    }
+
+    public static class OrderItemsBean {
+        /**
+         * createdBy : null
+         * createdByName : null
+         * createdTime : null
+         * updatedBy : null
+         * updatedByName : null
+         * updatedTime : null
+         * id : 6233d963254148b79d7a6bf1137ad882
+         * orderId : SO10766
+         * productId : 16404
+         * innerPrice : 20.0
+         * productCount : 1.0
+         * type : PDS
+         * outerPrice : 25.0
+         * storeSum : 0.0
+         * shipSum : 0.0
+         * packageSum : 0.0
+         * usedSum : 0.0
+         * invoiceSum : 0.0
+         * usedReturnSum : null
+         * oddSum : 0.0
+         * lotNumber : LT200409001
+         * serialNumber : null
+         * annex : null
+         * tranFromStockId : null
+         * customerBranchFactoryId : null
+         * version : 0
+         * productName : 垫片
+         * itemFlows : [{"createdBy":675,"createdByName":null,"createdTime":"2020-04-09 16:28:59","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":1073,"orderType":"SO","orderId":"SO10766","productId":16404,"orderItemId":"6233d963254148b79d7a6bf1137ad882","productCount":0,"eventCode":"SPLIT_PD","linkSerialNumber":null,"optUserId":675,"optComment":"拆成生产订单","eventCodeName":"拆成生产子订单","optUserName":"李凯","orderTypeName":"销售订单","productName":"垫片"}]
+         * stockQuantityDetailList : null
+         * stockQuantityDetailMaps : [{"stockName":"销售四厂内入库仓库","quantity":0,"applyOut":0,"stockTypeName":"内库","stockId":595,"applyInto":0,"productName":null},{"stockName":"销售四发货库","quantity":0,"applyOut":0,"stockTypeName":"现场库","stockId":600,"applyInto":0,"productName":null},{"stockName":"销售四领用库厂外库","quantity":0,"applyOut":0,"stockTypeName":"未结算库","stockId":601,"applyInto":0,"productName":null}]
+         * productSoleCode : wer
+         * productSimpleCode : wer
+         * productSpec : 25*30*5
+         * productUnit : 件
+         * productWeight : 35.0
+         * canOutStoreProductSum : 0.0
+         * canInStoreProductSum : 0
+         * canUseProductSum : 0.0
+         * canPackageSum : null
+         * launchDeptName : null
+         * launchDeptId : null
+         * receiveDeptName : null
+         * customerId : null
+         * customerName : null
+         * productOfKind : null
+         * canInvoiceSum : null
+         * orderType : null
+         * customerBranchFactoryName : null
+         * orderTypeName : null
+         */
+
+        private Object createdBy;
+        private Object createdByName;
+        private Object createdTime;
+        private Object updatedBy;
+        private Object updatedByName;
+        private Object updatedTime;
+        private String id;
+        private String orderId;
+        private int productId;
+        private double innerPrice;
+        private double productCount;
+        private String type;
+        private double outerPrice;
+        private double storeSum;
+        private double shipSum;
+        private double packageSum;
+        private double usedSum;
+        private double invoiceSum;
+        private Object usedReturnSum;
+        private double oddSum;
+        private String lotNumber;
+        private Object serialNumber;
+        private Object annex;
+        private Object tranFromStockId;
+        private Object customerBranchFactoryId;
+        private int version;
+        private String productName;
+        private Object stockQuantityDetailList;
+        private String productSoleCode;
+        private String productSimpleCode;
+        private String productSpec;
+        private String productUnit;
+        private double productWeight;
+        private double canOutStoreProductSum;
+        private int canInStoreProductSum;
+        private double canUseProductSum;
+        private Object canPackageSum;
+        private Object launchDeptName;
+        private Object launchDeptId;
+        private Object receiveDeptName;
+        private Object customerId;
+        private Object customerName;
+        private Object productOfKind;
+        private Object canInvoiceSum;
+        private Object orderType;
+        private Object customerBranchFactoryName;
+        private Object orderTypeName;
+        private List<ItemFlowsBean> itemFlows;
+        private List<StockQuantityDetailMapsBean> stockQuantityDetailMaps;
+
+        public Object getCreatedBy() {
+            return createdBy;
+        }
+
+        public void setCreatedBy(Object createdBy) {
+            this.createdBy = createdBy;
+        }
+
+        public Object getCreatedByName() {
+            return createdByName;
+        }
+
+        public void setCreatedByName(Object createdByName) {
+            this.createdByName = createdByName;
+        }
+
+        public Object getCreatedTime() {
+            return createdTime;
+        }
+
+        public void setCreatedTime(Object createdTime) {
+            this.createdTime = createdTime;
+        }
+
+        public Object getUpdatedBy() {
+            return updatedBy;
+        }
+
+        public void setUpdatedBy(Object updatedBy) {
+            this.updatedBy = updatedBy;
+        }
+
+        public Object getUpdatedByName() {
+            return updatedByName;
+        }
+
+        public void setUpdatedByName(Object updatedByName) {
+            this.updatedByName = updatedByName;
+        }
+
+        public Object getUpdatedTime() {
+            return updatedTime;
+        }
+
+        public void setUpdatedTime(Object updatedTime) {
+            this.updatedTime = updatedTime;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getOrderId() {
+            return orderId;
+        }
+
+        public void setOrderId(String orderId) {
+            this.orderId = orderId;
+        }
+
+        public int getProductId() {
+            return productId;
+        }
+
+        public void setProductId(int productId) {
+            this.productId = productId;
+        }
+
+        public double getInnerPrice() {
+            return innerPrice;
+        }
+
+        public void setInnerPrice(double innerPrice) {
+            this.innerPrice = innerPrice;
+        }
+
+        public double getProductCount() {
+            return productCount;
+        }
+
+        public void setProductCount(double productCount) {
+            this.productCount = productCount;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        public double getOuterPrice() {
+            return outerPrice;
+        }
+
+        public void setOuterPrice(double outerPrice) {
+            this.outerPrice = outerPrice;
+        }
+
+        public double getStoreSum() {
+            return storeSum;
+        }
+
+        public void setStoreSum(double storeSum) {
+            this.storeSum = storeSum;
+        }
+
+        public double getShipSum() {
+            return shipSum;
+        }
+
+        public void setShipSum(double shipSum) {
+            this.shipSum = shipSum;
+        }
+
+        public double getPackageSum() {
+            return packageSum;
+        }
+
+        public void setPackageSum(double packageSum) {
+            this.packageSum = packageSum;
+        }
+
+        public double getUsedSum() {
+            return usedSum;
+        }
+
+        public void setUsedSum(double usedSum) {
+            this.usedSum = usedSum;
+        }
+
+        public double getInvoiceSum() {
+            return invoiceSum;
+        }
+
+        public void setInvoiceSum(double invoiceSum) {
+            this.invoiceSum = invoiceSum;
+        }
+
+        public Object getUsedReturnSum() {
+            return usedReturnSum;
+        }
+
+        public void setUsedReturnSum(Object usedReturnSum) {
+            this.usedReturnSum = usedReturnSum;
+        }
+
+        public double getOddSum() {
+            return oddSum;
+        }
+
+        public void setOddSum(double oddSum) {
+            this.oddSum = oddSum;
+        }
+
+        public String getLotNumber() {
+            return lotNumber;
+        }
+
+        public void setLotNumber(String lotNumber) {
+            this.lotNumber = lotNumber;
+        }
+
+        public Object getSerialNumber() {
+            return serialNumber;
+        }
+
+        public void setSerialNumber(Object serialNumber) {
+            this.serialNumber = serialNumber;
+        }
+
+        public Object getAnnex() {
+            return annex;
+        }
+
+        public void setAnnex(Object annex) {
+            this.annex = annex;
+        }
+
+        public Object getTranFromStockId() {
+            return tranFromStockId;
+        }
+
+        public void setTranFromStockId(Object tranFromStockId) {
+            this.tranFromStockId = tranFromStockId;
+        }
+
+        public Object getCustomerBranchFactoryId() {
+            return customerBranchFactoryId;
+        }
+
+        public void setCustomerBranchFactoryId(Object customerBranchFactoryId) {
+            this.customerBranchFactoryId = customerBranchFactoryId;
+        }
+
+        public int getVersion() {
+            return version;
+        }
+
+        public void setVersion(int version) {
+            this.version = version;
+        }
+
+        public String getProductName() {
+            return productName;
+        }
+
+        public void setProductName(String productName) {
+            this.productName = productName;
+        }
+
+        public Object getStockQuantityDetailList() {
+            return stockQuantityDetailList;
+        }
+
+        public void setStockQuantityDetailList(Object stockQuantityDetailList) {
+            this.stockQuantityDetailList = stockQuantityDetailList;
+        }
+
+        public String getProductSoleCode() {
+            return productSoleCode;
+        }
+
+        public void setProductSoleCode(String productSoleCode) {
+            this.productSoleCode = productSoleCode;
+        }
+
+        public String getProductSimpleCode() {
+            return productSimpleCode;
+        }
+
+        public void setProductSimpleCode(String productSimpleCode) {
+            this.productSimpleCode = productSimpleCode;
+        }
+
+        public String getProductSpec() {
+            return productSpec;
+        }
+
+        public void setProductSpec(String productSpec) {
+            this.productSpec = productSpec;
+        }
+
+        public String getProductUnit() {
+            return productUnit;
+        }
+
+        public void setProductUnit(String productUnit) {
+            this.productUnit = productUnit;
+        }
+
+        public double getProductWeight() {
+            return productWeight;
+        }
+
+        public void setProductWeight(double productWeight) {
+            this.productWeight = productWeight;
+        }
+
+        public double getCanOutStoreProductSum() {
+            return canOutStoreProductSum;
+        }
+
+        public void setCanOutStoreProductSum(double canOutStoreProductSum) {
+            this.canOutStoreProductSum = canOutStoreProductSum;
+        }
+
+        public int getCanInStoreProductSum() {
+            return canInStoreProductSum;
+        }
+
+        public void setCanInStoreProductSum(int canInStoreProductSum) {
+            this.canInStoreProductSum = canInStoreProductSum;
+        }
+
+        public double getCanUseProductSum() {
+            return canUseProductSum;
+        }
+
+        public void setCanUseProductSum(double canUseProductSum) {
+            this.canUseProductSum = canUseProductSum;
+        }
+
+        public Object getCanPackageSum() {
+            return canPackageSum;
+        }
+
+        public void setCanPackageSum(Object canPackageSum) {
+            this.canPackageSum = canPackageSum;
+        }
+
+        public Object getLaunchDeptName() {
+            return launchDeptName;
+        }
+
+        public void setLaunchDeptName(Object launchDeptName) {
+            this.launchDeptName = launchDeptName;
+        }
+
+        public Object getLaunchDeptId() {
+            return launchDeptId;
+        }
+
+        public void setLaunchDeptId(Object launchDeptId) {
+            this.launchDeptId = launchDeptId;
+        }
+
+        public Object getReceiveDeptName() {
+            return receiveDeptName;
+        }
+
+        public void setReceiveDeptName(Object receiveDeptName) {
+            this.receiveDeptName = receiveDeptName;
+        }
+
+        public Object getCustomerId() {
+            return customerId;
+        }
+
+        public void setCustomerId(Object customerId) {
+            this.customerId = customerId;
+        }
+
+        public Object getCustomerName() {
+            return customerName;
+        }
+
+        public void setCustomerName(Object customerName) {
+            this.customerName = customerName;
+        }
+
+        public Object getProductOfKind() {
+            return productOfKind;
+        }
+
+        public void setProductOfKind(Object productOfKind) {
+            this.productOfKind = productOfKind;
+        }
+
+        public Object getCanInvoiceSum() {
+            return canInvoiceSum;
+        }
+
+        public void setCanInvoiceSum(Object canInvoiceSum) {
+            this.canInvoiceSum = canInvoiceSum;
+        }
+
+        public Object getOrderType() {
+            return orderType;
+        }
+
+        public void setOrderType(Object orderType) {
+            this.orderType = orderType;
+        }
+
+        public Object getCustomerBranchFactoryName() {
+            return customerBranchFactoryName;
+        }
+
+        public void setCustomerBranchFactoryName(Object customerBranchFactoryName) {
+            this.customerBranchFactoryName = customerBranchFactoryName;
+        }
+
+        public Object getOrderTypeName() {
+            return orderTypeName;
+        }
+
+        public void setOrderTypeName(Object orderTypeName) {
+            this.orderTypeName = orderTypeName;
+        }
+
+        public List<ItemFlowsBean> getItemFlows() {
+            return itemFlows;
+        }
+
+        public void setItemFlows(List<ItemFlowsBean> itemFlows) {
+            this.itemFlows = itemFlows;
+        }
+
+        public List<StockQuantityDetailMapsBean> getStockQuantityDetailMaps() {
+            return stockQuantityDetailMaps;
+        }
+
+        public void setStockQuantityDetailMaps(List<StockQuantityDetailMapsBean> stockQuantityDetailMaps) {
+            this.stockQuantityDetailMaps = stockQuantityDetailMaps;
+        }
+
+        public static class ItemFlowsBean {
+            /**
+             * createdBy : 675
+             * createdByName : null
+             * createdTime : 2020-04-09 16:28:59
+             * updatedBy : null
+             * updatedByName : null
+             * updatedTime : null
+             * id : 1073
+             * orderType : SO
+             * orderId : SO10766
+             * productId : 16404
+             * orderItemId : 6233d963254148b79d7a6bf1137ad882
+             * productCount : 0.0
+             * eventCode : SPLIT_PD
+             * linkSerialNumber : null
+             * optUserId : 675
+             * optComment : 拆成生产订单
+             * eventCodeName : 拆成生产子订单
+             * optUserName : 李凯
+             * orderTypeName : 销售订单
+             * productName : 垫片
+             */
+
+            private int createdBy;
+            private Object createdByName;
+            private String createdTime;
+            private Object updatedBy;
+            private Object updatedByName;
+            private Object updatedTime;
+            private int id;
+            private String orderType;
+            private String orderId;
+            private int productId;
+            private String orderItemId;
+            private double productCount;
+            private String eventCode;
+            private Object linkSerialNumber;
+            private int optUserId;
+            private String optComment;
+            private String eventCodeName;
+            private String optUserName;
+            private String orderTypeName;
+            private String productName;
+
+            public int getCreatedBy() {
+                return createdBy;
+            }
+
+            public void setCreatedBy(int createdBy) {
+                this.createdBy = createdBy;
+            }
+
+            public Object getCreatedByName() {
+                return createdByName;
+            }
+
+            public void setCreatedByName(Object createdByName) {
+                this.createdByName = createdByName;
+            }
+
+            public String getCreatedTime() {
+                return createdTime;
+            }
+
+            public void setCreatedTime(String createdTime) {
+                this.createdTime = createdTime;
+            }
+
+            public Object getUpdatedBy() {
+                return updatedBy;
+            }
+
+            public void setUpdatedBy(Object updatedBy) {
+                this.updatedBy = updatedBy;
+            }
+
+            public Object getUpdatedByName() {
+                return updatedByName;
+            }
+
+            public void setUpdatedByName(Object updatedByName) {
+                this.updatedByName = updatedByName;
+            }
+
+            public Object getUpdatedTime() {
+                return updatedTime;
+            }
+
+            public void setUpdatedTime(Object updatedTime) {
+                this.updatedTime = updatedTime;
+            }
+
+            public int getId() {
+                return id;
+            }
+
+            public void setId(int id) {
+                this.id = id;
+            }
+
+            public String getOrderType() {
+                return orderType;
+            }
+
+            public void setOrderType(String orderType) {
+                this.orderType = orderType;
+            }
+
+            public String getOrderId() {
+                return orderId;
+            }
+
+            public void setOrderId(String orderId) {
+                this.orderId = orderId;
+            }
+
+            public int getProductId() {
+                return productId;
+            }
+
+            public void setProductId(int productId) {
+                this.productId = productId;
+            }
+
+            public String getOrderItemId() {
+                return orderItemId;
+            }
+
+            public void setOrderItemId(String orderItemId) {
+                this.orderItemId = orderItemId;
+            }
+
+            public double getProductCount() {
+                return productCount;
+            }
+
+            public void setProductCount(double productCount) {
+                this.productCount = productCount;
+            }
+
+            public String getEventCode() {
+                return eventCode;
+            }
+
+            public void setEventCode(String eventCode) {
+                this.eventCode = eventCode;
+            }
+
+            public Object getLinkSerialNumber() {
+                return linkSerialNumber;
+            }
+
+            public void setLinkSerialNumber(Object linkSerialNumber) {
+                this.linkSerialNumber = linkSerialNumber;
+            }
+
+            public int getOptUserId() {
+                return optUserId;
+            }
+
+            public void setOptUserId(int optUserId) {
+                this.optUserId = optUserId;
+            }
+
+            public String getOptComment() {
+                return optComment;
+            }
+
+            public void setOptComment(String optComment) {
+                this.optComment = optComment;
+            }
+
+            public String getEventCodeName() {
+                return eventCodeName;
+            }
+
+            public void setEventCodeName(String eventCodeName) {
+                this.eventCodeName = eventCodeName;
+            }
+
+            public String getOptUserName() {
+                return optUserName;
+            }
+
+            public void setOptUserName(String optUserName) {
+                this.optUserName = optUserName;
+            }
+
+            public String getOrderTypeName() {
+                return orderTypeName;
+            }
+
+            public void setOrderTypeName(String orderTypeName) {
+                this.orderTypeName = orderTypeName;
+            }
+
+            public String getProductName() {
+                return productName;
+            }
+
+            public void setProductName(String productName) {
+                this.productName = productName;
+            }
+        }
+
+        public static class StockQuantityDetailMapsBean {
+            /**
+             * stockName : 销售四厂内入库仓库
+             * quantity : 0
+             * applyOut : 0
+             * stockTypeName : 内库
+             * stockId : 595
+             * applyInto : 0
+             * productName : null
+             */
+
+            private String stockName;
+            private int quantity;
+            private int applyOut;
+            private String stockTypeName;
+            private int stockId;
+            private int applyInto;
+            private Object productName;
+
+            public String getStockName() {
+                return stockName;
+            }
+
+            public void setStockName(String stockName) {
+                this.stockName = stockName;
+            }
+
+            public int getQuantity() {
+                return quantity;
+            }
+
+            public void setQuantity(int quantity) {
+                this.quantity = quantity;
+            }
+
+            public int getApplyOut() {
+                return applyOut;
+            }
+
+            public void setApplyOut(int applyOut) {
+                this.applyOut = applyOut;
+            }
+
+            public String getStockTypeName() {
+                return stockTypeName;
+            }
+
+            public void setStockTypeName(String stockTypeName) {
+                this.stockTypeName = stockTypeName;
+            }
+
+            public int getStockId() {
+                return stockId;
+            }
+
+            public void setStockId(int stockId) {
+                this.stockId = stockId;
+            }
+
+            public int getApplyInto() {
+                return applyInto;
+            }
+
+            public void setApplyInto(int applyInto) {
+                this.applyInto = applyInto;
+            }
+
+            public Object getProductName() {
+                return productName;
+            }
+
+            public void setProductName(Object productName) {
+                this.productName = productName;
+            }
+        }
+    }
+
+    public static class OrderFlowsBean {
+        /**
+         * createdBy : 675
+         * createdByName : null
+         * createdTime : 2020-04-09 16:29:58
+         * updatedBy : null
+         * updatedByName : null
+         * updatedTime : null
+         * id : 558
+         * orderType : SO
+         * orderId : SO10766
+         * eventCode : AUDIT_OK
+         * optUserId : 675
+         * optComment :
+         * eventCodeName : 审核通过
+         * optUserName : 李凯
+         * orderTypeName : 销售订单
+         */
+
+        private int createdBy;
+        private Object createdByName;
+        private String createdTime;
+        private Object updatedBy;
+        private Object updatedByName;
+        private Object updatedTime;
+        private int id;
+        private String orderType;
+        private String orderId;
+        private String eventCode;
+        private int optUserId;
+        private String optComment;
+        private String eventCodeName;
+        private String optUserName;
+        private String orderTypeName;
+
+        public int getCreatedBy() {
+            return createdBy;
+        }
+
+        public void setCreatedBy(int createdBy) {
+            this.createdBy = createdBy;
+        }
+
+        public Object getCreatedByName() {
+            return createdByName;
+        }
+
+        public void setCreatedByName(Object createdByName) {
+            this.createdByName = createdByName;
+        }
+
+        public String getCreatedTime() {
+            return createdTime;
+        }
+
+        public void setCreatedTime(String createdTime) {
+            this.createdTime = createdTime;
+        }
+
+        public Object getUpdatedBy() {
+            return updatedBy;
+        }
+
+        public void setUpdatedBy(Object updatedBy) {
+            this.updatedBy = updatedBy;
+        }
+
+        public Object getUpdatedByName() {
+            return updatedByName;
+        }
+
+        public void setUpdatedByName(Object updatedByName) {
+            this.updatedByName = updatedByName;
+        }
+
+        public Object getUpdatedTime() {
+            return updatedTime;
+        }
+
+        public void setUpdatedTime(Object updatedTime) {
+            this.updatedTime = updatedTime;
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public String getOrderType() {
+            return orderType;
+        }
+
+        public void setOrderType(String orderType) {
+            this.orderType = orderType;
+        }
+
+        public String getOrderId() {
+            return orderId;
+        }
+
+        public void setOrderId(String orderId) {
+            this.orderId = orderId;
+        }
+
+        public String getEventCode() {
+            return eventCode;
+        }
+
+        public void setEventCode(String eventCode) {
+            this.eventCode = eventCode;
+        }
+
+        public int getOptUserId() {
+            return optUserId;
+        }
+
+        public void setOptUserId(int optUserId) {
+            this.optUserId = optUserId;
+        }
+
+        public String getOptComment() {
+            return optComment;
+        }
+
+        public void setOptComment(String optComment) {
+            this.optComment = optComment;
+        }
+
+        public String getEventCodeName() {
+            return eventCodeName;
+        }
+
+        public void setEventCodeName(String eventCodeName) {
+            this.eventCodeName = eventCodeName;
+        }
+
+        public String getOptUserName() {
+            return optUserName;
+        }
+
+        public void setOptUserName(String optUserName) {
+            this.optUserName = optUserName;
+        }
+
+        public String getOrderTypeName() {
+            return orderTypeName;
+        }
+
+        public void setOrderTypeName(String orderTypeName) {
+            this.orderTypeName = orderTypeName;
+        }
+    }
+}

app/src/main/java/com/wd/workoffice/retrofit/ApiService.java

@@ -302,6 +302,7 @@ public interface ApiService {
      */
     @GET("/crucibleOrder/current-user/page/list")
     Observable<BaseBean> getCucibleOrder(@QueryMap Map<String, Object> param);
+
     /**
      * 订单
      * <p>
@@ -455,9 +456,10 @@ public interface ApiService {
      *
      * <p>
      * orderItems
-     *type 类别 (暂时使用product)
+     * type 类别 (暂时使用product)
      * product(产品)
      * service(服务)
+     *
      * @return
      */
     @POST("/insideOrder/start")
@@ -472,17 +474,19 @@ public interface ApiService {
      * launchOrderAmount下单总金额
      * inStockId	入库仓库id
      * expandInfo 第二层:订单扩展信息
-     *customerId
+     * customerId
      * supplierId
      * subProcessId
      * 备注: 第二层:订单扩展信息
      *
      * <p>
      * orderItems
+     *
      * @return
      */
     @POST("/purchaseOrder/start")
     Observable<BaseBean> submitPurchaseOrder(@Body RequestBody requestBody);
+
     /**
      * 获取客户分厂
      *
@@ -1013,6 +1017,7 @@ public interface ApiService {
      */
     @GET("/finance-dept-ar-ap-part-detail/app/page/list")
     Observable<BaseBean> contactsMoney(@QueryMap Map<String, Object> param);
+
     /**
      * 物流账单
      * transitPartId
@@ -1024,6 +1029,7 @@ public interface ApiService {
      */
     @GET("/finance-logistics/page/list")
     Observable<BaseBean> contactsMoneyLogistic(@QueryMap Map<String, Object> param);
+
     /**
      * 物流账单
      * transitPartId
@@ -1043,6 +1049,7 @@ public interface ApiService {
      */
     @GET("/finance-dept-ar-ap-part/flow/page/list")
     Observable<BaseBean> contactsMoneyFlow(@QueryMap Map<String, Object> param);
+
     /**
      * 部门应收应付账款流水
      *
@@ -1066,7 +1073,8 @@ public interface ApiService {
      * @return
      */
     @GET("/finance-tax/page/list")
-    Observable<BaseBean> storeFinancial(@QueryMap Map<String,Object> param);
+    Observable<BaseBean> storeFinancial(@QueryMap Map<String, Object> param);
+
     /**
      * 修改个人信息,头像和用户名（app）
      *
@@ -1082,7 +1090,7 @@ public interface ApiService {
      * @return
      */
     @GET("/stockQuantity/return-stock/page/list")
-    Observable<BaseBean> tradingPro(@QueryMap Map<String,Object> param);
+    Observable<BaseBean> tradingPro(@QueryMap Map<String, Object> param);
 
     /**
      * 获取产品去向(搜索置换产品)
@@ -1098,7 +1106,7 @@ public interface ApiService {
      * @return
      */
     @GET("/package-order/app/page/list")
-    Observable<BaseBean> productList(@QueryMap Map<String,Object> param);
+    Observable<BaseBean> productList(@QueryMap Map<String, Object> param);
 
     /**
      * 获取产品去向(搜索置换产品)
@@ -1106,6 +1114,14 @@ public interface ApiService {
      * @return
      */
     @GET("/packageApply/app/page/list")
-    Observable<BaseBean> productApplyList(@QueryMap Map<String,Object> param);
+    Observable<BaseBean> productApplyList(@QueryMap Map<String, Object> param);
+
+    /**
+     * 获取产品去向(搜索置换产品)
+     *
+     * @return
+     */
+    @GET("/saleOrder/oneInfo/{orderId}")
+    Observable<BaseBean> saleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
 
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleOrderDetailActivity.java

+package com.wd.workoffice.ui.activity.bat.sale;
+
+import android.media.tv.TvContentRating;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.AccountBean;
+import com.wd.workoffice.bean.OrderDetail;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.OrderDetailProductAdapter;
+import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
+import com.wd.workoffice.ui.adapter.SaleSupplierAdapter;
+import com.wd.workoffice.util.MathUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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 io.reactivex.disposables.Disposable;
+
+/**
+ * 销售订单详情
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class SaleOrderDetailActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_status)
+    TextView tvStatus;
+    @BindView(R.id.tv_desc)
+    TextView tvDesc;
+    @BindView(R.id.ll_top)
+    RelativeLayout llTop;
+    @BindView(R.id.tv_refuse)
+    TextView tvRefuse;
+    @BindView(R.id.tv_agree)
+    TextView tvAgree;
+    @BindView(R.id.ll_bottom)
+    LinearLayout llBottom;
+    @BindView(R.id.rv_process)
+    RecyclerView rvProcess;
+    @BindView(R.id.tv_name)
+    TextView tvName;
+    @BindView(R.id.tv_dep)
+    TextView tvDep;
+    @BindView(R.id.tv_place_name)
+    TextView tvPlaceName;
+    @BindView(R.id.tv_company)
+    TextView tvCompany;
+    @BindView(R.id.tv_order_no)
+    TextView tvOrderNo;
+    @BindView(R.id.tv_time)
+    TextView tvTime;
+    @BindView(R.id.tv_send_time)
+    TextView tvSendTime;
+    @BindView(R.id.tv_order_price)
+    TextView tvOrderPrice;
+    @BindView(R.id.rv_pro)
+    RecyclerView rvPro;
+    @BindView(R.id.tv_claim1)
+    TextView tvClaim1;
+    @BindView(R.id.tv_claim2)
+    TextView tvClaim2;
+    @BindView(R.id.tv_claim3)
+    TextView tvClaim3;
+    @BindView(R.id.tv_claim4)
+    TextView tvClaim4;
+    @BindView(R.id.tv_claim5)
+    TextView tvClaim5;
+    @BindView(R.id.tv_claim6)
+    TextView tvClaim6;
+    private OrderDetail dataBean;
+    private List<OrderDetail.OrderFlowsBean> flowList;
+    private OrderProcessAdapter flowAdapter;
+    private OrderDetailProductAdapter proAdapter;
+    private List<OrderDetail.OrderItemsBean> proList;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+        rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+
+    }
+
+    @Override
+    protected void initData() {
+        getData();
+        flowList = new ArrayList<>();
+        flowAdapter = new OrderProcessAdapter(R.layout.item_order_process, flowList);
+        flowAdapter.bindToRecyclerView(rvProcess);
+        flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
+        proList = new ArrayList<>();
+        proAdapter = new OrderDetailProductAdapter(R.layout.item_order_product, proList);
+        proAdapter.bindToRecyclerView(rvPro);
+        proAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().saleOrderDetail(getIntent().getStringExtra("id"), "3").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;
+                }
+                dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
+                flowList.addAll(dataBean.getOrderFlows());
+                flowAdapter.notifyDataSetChanged();
+                proList.addAll(dataBean.getOrderItems());
+                proAdapter.notifyDataSetChanged();
+
+                tvName.setText(dataBean.getCustomerName());
+                tvDep.setText(dataBean.getReceiveDeptName());
+                tvStatus.setText(dataBean.getStatusName());
+                tvPlaceName.setText(dataBean.getLaunchUserName());
+                tvCompany.setText(dataBean.getLaunchDeptName());
+                tvOrderNo.setText(dataBean.getId());
+                tvTime.setText(dataBean.getCreatedTime());
+                tvSendTime.setText(dataBean.getRequireTime());
+                tvDesc.setText(dataBean.getAttrName());
+                tvOrderPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
+
+                OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
+                tvClaim1.setText(expandInfo.getDemond4());
+                tvClaim2.setText(expandInfo.getDemond5());
+                tvClaim3.setText(expandInfo.getDemond1());
+                tvClaim4.setText(expandInfo.getDemond2());
+                tvClaim5.setText(expandInfo.getDemond3());
+                tvClaim6.setText(expandInfo.getComments());
+
+                tvDesc.setText(dataBean.getAttrName());
+                tvStatus.setText(dataBean.getStatusName());
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_sale_order;
+    }
+
+
+
+    @OnClick({R.id.tv_refuse, R.id.tv_agree})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.tv_refuse:
+                break;
+            case R.id.tv_agree:
+                break;
+        }
+    }
+}

app/src/main/java/com/wd/workoffice/ui/adapter/OrderDetailProductAdapter.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.OrderBean;
+import com.wd.workoffice.bean.OrderDetail;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBean, BaseViewHolder> {
+
+    public OrderDetailProductAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, OrderDetail.OrderItemsBean item) {
+        helper.setText(R.id.tv_name, item.getProductName());
+        helper.setText(R.id.tv_card, item.getProductSoleCode());
+        helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
+        helper.setText(R.id.tv_spec, item.getProductSpec());
+        helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
+        helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
+        helper.setText(R.id.tv_unit,item.getProductUnit());
+        helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
+        helper.setText(R.id.tv_num,String.valueOf(item.getProductCount()));
+    }
+}
+

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

+package com.wd.workoffice.ui.adapter;
+
+
+import android.graphics.Color;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.LogisticDetailBean;
+import com.wd.workoffice.bean.OrderDetail;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class OrderProcessAdapter extends BaseQuickAdapter<OrderDetail.OrderFlowsBean, BaseViewHolder> {
+
+
+    public OrderProcessAdapter(int layoutResId, @Nullable List<OrderDetail.OrderFlowsBean> data) {
+        super(layoutResId, data);
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, OrderDetail.OrderFlowsBean item) {
+        if (helper.getAdapterPosition() == 0) {
+            helper.setTextColor(R.id.tv_status, Color.parseColor("#ff359486"));
+            helper.setTextColor(R.id.tv_time, Color.parseColor("#ff359486"));
+            helper.setTextColor(R.id.tv_remark, Color.parseColor("#ff359486"));
+            helper.setGone(R.id.iv_last, true);
+            helper.setGone(R.id.iv_simple, false);
+        } else {
+            helper.setTextColor(R.id.tv_status, helper.getConvertView().getResources().getColor(R.color.flexible_text_gray));
+            helper.setTextColor(R.id.tv_time, helper.getConvertView().getResources().getColor(R.color.flexible_text_gray));
+            helper.setTextColor(R.id.tv_remark, helper.getConvertView().getResources().getColor(R.color.flexible_text_gray));
+            helper.setGone(R.id.iv_last, false);
+            helper.setGone(R.id.iv_simple, true);
+        }
+        helper.setText(R.id.tv_status, item.getEventCodeName());
+        helper.setText(R.id.tv_time, item.getCreatedTime());
+        helper.setText(R.id.tv_remark, "备注：" + item.getOptComment());
+    }
+
+}
+

app/src/main/java/com/wd/workoffice/ui/fg/SaleSaleFragment.java

 package com.wd.workoffice.ui.fg;
 
 import android.os.Bundle;
+import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
@@ -8,6 +9,7 @@ import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.OrderBean;
 import com.wd.workoffice.contract.SaleSaleContract;
 import com.wd.workoffice.presenter.SaleSalePresenter;
+import com.wd.workoffice.ui.activity.bat.sale.SaleOrderDetailActivity;
 import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -38,6 +40,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
     private SaleSaleAdapter orderAdapter;
     private int page = 1;
     private String identity;
+
     @Override
     protected void initView() {
         ButterKnife.bind(this, getContentView());
@@ -56,7 +59,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
         param = WorkUtils.pageKey();
         param.put("orderStatus", state);
         param.put("current", page);
-        param.put("identity",  identity);
+        param.put("identity", identity);
         page = 1;
         param.put("current", page);
         saleSalePresenter.getOrder(param);
@@ -72,6 +75,12 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
                 saleSalePresenter.getOrder(param);
             }
         }, rvData);
+        orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(SaleOrderDetailActivity.class, "id", orderList.get(position).getId());
+            }
+        });
     }
 
     @Override

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

@@ -152,6 +152,22 @@ public class WorkUtils {
         }
         return name;
     }
+
+    /**
+     * name：订单来源
+     *：PDS-拆分生产订单 TRS-库存已有转单
+     * @param code
+     * @return
+     */
+    public static String getOrderFrom(String code) {
+        String name ="";
+        if(TextUtils.equals(code,"PDS")){
+            name="拆分生产订单";
+        }else if (TextUtils.equals(code,"TRS")){
+            name="库存已有转单";
+        }
+        return name;
+    }
     /**
      * 财务状态
      * 0未审核      1已通过      2不通过

app/src/main/res/drawable/shape_order_circle.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#ff5c7589" />
+</shape>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/ll_top"
+        android:layout_width="match_parent"
+        android:layout_height="60mm"
+        android:layout_alignParentTop="true"
+        android:background="@color/blue_bg"
+        android:gravity="center_vertical|right"
+        android:orientation="horizontal"
+        android:paddingHorizontal="20mm">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true">
+
+            <ImageView
+                android:layout_width="18mm"
+                android:layout_height="18mm"
+                android:src="@mipmap/order_detail_bell" />
+
+            <TextView
+                android:id="@+id/tv_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10mm"
+                android:text="拒绝"
+                android:textColor="@color/white"
+                android:textSize="16sp" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="10mm"
+            android:text="同意"
+            android:textColor="@color/white"
+            android:textSize="16sp" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="60mm"
+        android:layout_alignParentBottom="true"
+        android:gravity="center_vertical|right"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/tv_refuse"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10mm"
+            android:background="@drawable/shape_red_btn"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="5mm"
+            android:text="拒绝"
+            android:textColor="@color/white" />
+
+        <TextView
+            android:id="@+id/tv_agree"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10mm"
+            android:background="@drawable/shape_green_btn"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="5mm"
+            android:text="同意"
+            android:textColor="@color/white" />
+
+    </LinearLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/ll_bottom"
+        android:layout_below="@id/ll_top"
+        android:background="@color/white">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@id/ll_bottom"
+            android:orientation="vertical"
+            android:paddingBottom="20mm">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_process"
+                android:layout_width="match_parent"
+                android:paddingVertical="10mm"
+                android:layout_height="wrap_content" />
+
+            <View style="@style/ViewX" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm">
+
+                <View
+                    android:layout_width="8mm"
+                    android:layout_height="18mm"
+                    android:background="@color/red_btn_bg" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10mm"
+                    android:text="订单信息"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_sale"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10mm"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:paddingHorizontal="20mm">
+
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5mm"
+                    android:text="邢台德龙钢铁客户"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="14mm"
+                    android:background="#FCFCFD"
+                    android:orientation="vertical"
+                    android:paddingVertical="10mm">
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="接单部门"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_dep"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:text="王紫逸"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="下单人"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_place_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:text="王紫逸"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="所属公司"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_company"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:text="王紫逸"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+
+                    <!-- 3.订单编号 -->
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="订单编号"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_order_no"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:text="王紫逸"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                    <!-- 4.下单时间 -->
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="下单时间"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:text="王紫逸"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                    <!-- 3.要求发货时间 -->
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="10mm"
+                        android:paddingHorizontal="10mm">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="10mm"
+                            android:text="要求发货时间"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+
+                        <TextView
+                            android:id="@+id/tv_send_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentRight="true"
+                            android:layout_centerVertical="true"
+                            android:text="王紫逸"
+                            android:textColor="@color/flexible_text_gray"
+                            android:textSize="13sp" />
+                    </RelativeLayout>
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10mm"
+                    android:gravity="right">
+
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="订单总价:￥"
+                        android:textSize="12sp" />
+
+                    <TextView
+                        android:id="@+id/tv_order_price"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="15sp" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <View style="@style/ViewX" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm">
+
+                <View
+                    android:layout_width="8mm"
+                    android:layout_height="18mm"
+                    android:background="@color/red_btn_bg" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10mm"
+                    android:text="货品信息"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_pro"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <View style="@style/ViewX" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm">
+
+                <View
+                    android:layout_width="8mm"
+                    android:layout_height="18mm"
+                    android:background="@color/red_btn_bg" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10mm"
+                    android:text="订单要求"
+                    android:textSize="15sp" />
+            </LinearLayout>
+
+            <View style="@style/ViewX" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="交提货地点:"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="5mm" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="运输方式及费用承担:"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="质量要求技术标准，供方对质量负责的条件和期限："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="包装、唛头及发货要求："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim4"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="注意事项："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="18mm"
+                android:paddingVertical="10mm"
+                android:text="备注："
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/tv_claim6"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="20mm"
+                android:background="@drawable/shape_confirm_order"
+                android:paddingVertical="10mm" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</RelativeLayout>

app/src/main/res/layout/item_order_process.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:orientation="horizontal">
+
+    <LinearLayout
+        android:layout_width="30mm"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/iv_last"
+            android:layout_width="11mm"
+            android:layout_height="11mm"
+            android:src="@mipmap/order_process" />
+
+        <View
+            android:id="@+id/iv_simple"
+            style="@style/dividerY"
+            android:layout_width="5mm"
+
+            android:layout_height="5mm"
+            android:background="@drawable/shape_circle" />
+
+        <View
+            style="@style/dividerY"
+            android:layout_width="1mm"
+            android:layout_height="match_parent"
+            android:background="@color/blue_bg" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:orientation="vertical"
+        android:paddingVertical="5mm"
+        android:layout_marginLeft="10mm"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/tv_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="销售部门管理员通过审核"
+            android:textColor="#ff359486"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/tv_remark"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3mm"
+            android:text="备注"
+            android:textColor="#ff359486"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/tv_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3mm"
+            android:text="销售部门管理员通过审核"
+            android:textColor="#ff359486"
+            android:textSize="12sp" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

app/src/main/res/layout/item_order_product.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"
+    android:paddingHorizontal="20mm"
+    android:paddingVertical="10mm">
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="图号TH82739857"
+        android:textColor="@color/black"
+        android:textSize="16sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="14mm"
+        android:background="#FCFCFD"
+        android:orientation="vertical"
+        android:padding="10mm">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="品号"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_card"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="品号"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="品名"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_card_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="品号"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="规格"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_spec"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="品号"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="单价"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_price"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="品号"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="单位"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_unit"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="品号"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="数量"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="产品来源"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_from"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:text="品号"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10mm">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="附件"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/tv_annex"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:layout_marginTop="4mm">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="小计："
+            android:textColor="@color/flexible_text_gray" />
+
+        <TextView
+            android:id="@+id/tv_all_price"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            android:textColor="@color/flexible_text_gray" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

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

@@ -13,5 +13,6 @@
     <color name="red_btn_bg">#C45D5D</color>
     <color name="orange">#FF5722</color>
     <color name="flexible_text_color">#333333</color>
+    <color name="blue_bg">#5C768A</color>
 
 </resources>