1.mes订单追踪

ce7df19a · lgd · 55980aac · ce7df19a · ce7df19a · ce7df19a
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1606,6 +1606,14 @@
            android:screenOrientation="portrait"
            android:theme="@style/Work.Base"
            android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.mes.order.MesOrderProcessActivity"
+            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.mes.order.MesOrderDetailActivity"
            android:configChanges="keyboardHidden|orientation"

--- a/app/src/main/java/com/wd/workoffice/bean/mesBean/MesOrderBean.java
+++ b/app/src/main/java/com/wd/workoffice/bean/mesBean/MesOrderBean.java
@@ -9,123 +9,21 @@ import java.util.List;
 * email : lgd19940421@163.com
 * github: https://github.com/FlexibleXd
 **/
-public class MesOrderBean   extends BaseMesPageBean {
+public class MesOrderBean     {
        /**
-         * pageNum : 1
+         * manufactureOrderNumber : BCP-LT191128001
-         * pageSize : 10
+         * customerName : 张家港浦项不锈钢有限公司
-         * size : 3
+         * planCount : 60
-         * startRow : 1
+         * drawingNumber : null
-         * endRow : 3
+         * processCode : null
-         * total : 3
-         * pages : 1
-         * list : [{"id":"22222","createDateTime":1586941483000,"updateDateTime":1586941483000,"manufactureOrderNumber":"ZLD0001","siteId":"1c37c889ffa211e98334fa163e1166bd","siteCode":"GK10","siteName":"铝碳厂","productId":"7101010688L","productName":"塞棒(高碱）加套B354-2","productCode":"7101010688L","specification":"1560","drawingNumber":"xxxxx","planCount":20,"deliveryDate":1574870400000,"scheduleStatus":"0","auditStatus":"1","index":0,"type":"0","seriesName":"1.6米以下免车塞棒（勿删）","materialName":"塞棒(高碱）加套B354-2","materialCode":"7101010688L","specifications":"1560","planQuantity":20,"unit":"个","batchNo":"ZLD0001","seriesId":"7a671920a0b811ea8334fa163e1166bd","delete":false},{"id":"5ac6962d9ed911e8b81100163e049447","createDateTime":1586941483000,"updateDateTime":1586941483000,"manufactureOrderNumber":"ZLD0001","siteId":"GK10","siteCode":"GK10","siteName":"生产部（GK）","productId":"7101010377D","productName":"塞棒B421","productCode":"7101010377D","specification":null,"drawingNumber":"xxxxx","planCount":50,"deliveryDate":1590595200000,"scheduleStatus":"0","auditStatus":"0","index":1,"type":"0","seriesName":"4545","materialName":"塞棒B421","materialCode":"7101010377D","specifications":null,"planQuantity":50,"unit":"1","batchNo":"ZLD0001","seriesId":"1","delete":false},{"id":"cf185b11382311ea8334fa163e1166bd","createDateTime":1586941483000,"updateDateTime":1586941483000,"manufactureOrderNumber":"LSL1111","siteId":"GK10","siteCode":"GK10","siteName":"生产部（GK）","productId":"7101010688L","productName":"塞棒(高碱）加套B354-2","productCode":"7101010688L","specification":null,"drawingNumber":"xxxxx","planCount":20,"deliveryDate":1574870400000,"scheduleStatus":"0","auditStatus":"0","index":0,"type":"0","seriesName":"1.6米以下免车塞棒（勿删）","materialName":"塞棒(高碱）加套B354-2","materialCode":"7101010688L","specifications":null,"planQuantity":20,"unit":null,"batchNo":"LSL1111","seriesId":"7a671920a0b811ea8334fa163e1166bd","delete":false}]
-         * prePage : 0
-         * nextPage : 0
-         * isFirstPage : true
-         * isLastPage : true
-         * hasPreviousPage : false
-         * hasNextPage : false
-         * navigatePages : 8
-         * navigatepageNums : [1]
-         * navigateFirstPage : 1
-         * navigateLastPage : 1
-         * firstPage : 1
-         * lastPage : 1
         */
-        private List<ListBean> list;
-        public List<ListBean> getList() {
-            return list;
-        }
-        public void setList(List<ListBean> list) {
-            this.list = list;
-        }
-        public static class ListBean {
-            /**
-             * id : 22222
-             * createDateTime : 1586941483000
-             * updateDateTime : 1586941483000
-             * manufactureOrderNumber : ZLD0001
-             * siteId : 1c37c889ffa211e98334fa163e1166bd
-             * siteCode : GK10
-             * siteName : 铝碳厂
-             * productId : 7101010688L
-             * productName : 塞棒(高碱）加套B354-2
-             * productCode : 7101010688L
-             * specification : 1560
-             * drawingNumber : xxxxx
-             * planCount : 20
-             * deliveryDate : 1574870400000
-             * scheduleStatus : 0
-             * auditStatus : 1
-             * index : 0
-             * type : 0
-             * seriesName : 1.6米以下免车塞棒（勿删）
-             * materialName : 塞棒(高碱）加套B354-2
-             * materialCode : 7101010688L
-             * specifications : 1560
-             * planQuantity : 20
-             * unit : 个
-             * batchNo : ZLD0001
-             * seriesId : 7a671920a0b811ea8334fa163e1166bd
-             * delete : false
-             */
-            private String id;
-            private long createDateTime;
-            private long updateDateTime;
        private String manufactureOrderNumber;
-            private String siteId;
+        private String customerName;
-            private String siteCode;
-            private String siteName;
-            private String productId;
-            private String productName;
-            private String productCode;
-            private String specification;
-            private String drawingNumber;
        private int planCount;
-            private long deliveryDate;
+        private String drawingNumber;
-            private String scheduleStatus;
+        private String processCode;
-            private String auditStatus;
-            private int index;
-            private String type;
-            private String seriesName;
-            private String materialName;
-            private String materialCode;
-            private String specifications;
-            private int planQuantity;
-            private String unit;
-            private String batchNo;
-            private String seriesId;
-            private boolean delete;
-            public String getId() {
-                return id;
-            }
-            public void setId(String id) {
-                this.id = id;
-            }
-            public long getCreateDateTime() {
-                return createDateTime;
-            }
-            public void setCreateDateTime(long createDateTime) {
-                this.createDateTime = createDateTime;
-            }
-            public long getUpdateDateTime() {
-                return updateDateTime;
-            }
-            public void setUpdateDateTime(long updateDateTime) {
-                this.updateDateTime = updateDateTime;
-            }
        public String getManufactureOrderNumber() {
            return manufactureOrderNumber;
@@ -135,68 +33,12 @@ public class MesOrderBean   extends BaseMesPageBean {
            this.manufactureOrderNumber = manufactureOrderNumber;
        }
-            public String getSiteId() {
+        public String getCustomerName() {
-                return siteId;
+            return customerName;
-            }
-            public void setSiteId(String siteId) {
-                this.siteId = siteId;
-            }
-            public String getSiteCode() {
-                return siteCode;
-            }
-            public void setSiteCode(String siteCode) {
-                this.siteCode = siteCode;
-            }
-            public String getSiteName() {
-                return siteName;
-            }
-            public void setSiteName(String siteName) {
-                this.siteName = siteName;
-            }
-            public String getProductId() {
-                return productId;
        }
-            public void setProductId(String productId) {
+        public void setCustomerName(String customerName) {
-                this.productId = productId;
+            this.customerName = customerName;
-            }
-            public String getProductName() {
-                return productName;
-            }
-            public void setProductName(String productName) {
-                this.productName = productName;
-            }
-            public String getProductCode() {
-                return productCode;
-            }
-            public void setProductCode(String productCode) {
-                this.productCode = productCode;
-            }
-            public String getSpecification() {
-                return specification;
-            }
-            public void setSpecification(String specification) {
-                this.specification = specification;
-            }
-            public String getDrawingNumber() {
-                return drawingNumber;
-            }
-            public void setDrawingNumber(String drawingNumber) {
-                this.drawingNumber = drawingNumber;
        }
        public int getPlanCount() {
@@ -207,116 +49,19 @@ public class MesOrderBean   extends BaseMesPageBean {
            this.planCount = planCount;
        }
-            public long getDeliveryDate() {
+        public String getDrawingNumber() {
-                return deliveryDate;
+            return drawingNumber;
-            }
-            public void setDeliveryDate(long deliveryDate) {
-                this.deliveryDate = deliveryDate;
-            }
-            public String getScheduleStatus() {
-                return scheduleStatus;
-            }
-            public void setScheduleStatus(String scheduleStatus) {
-                this.scheduleStatus = scheduleStatus;
-            }
-            public String getAuditStatus() {
-                return auditStatus;
-            }
-            public void setAuditStatus(String auditStatus) {
-                this.auditStatus = auditStatus;
-            }
-            public int getIndex() {
-                return index;
-            }
-            public void setIndex(int index) {
-                this.index = index;
-            }
-            public String getType() {
-                return type;
-            }
-            public void setType(String type) {
-                this.type = type;
-            }
-            public String getSeriesName() {
-                return seriesName;
-            }
-            public void setSeriesName(String seriesName) {
-                this.seriesName = seriesName;
-            }
-            public String getMaterialName() {
-                return materialName;
-            }
-            public void setMaterialName(String materialName) {
-                this.materialName = materialName;
-            }
-            public String getMaterialCode() {
-                return materialCode;
-            }
-            public void setMaterialCode(String materialCode) {
-                this.materialCode = materialCode;
-            }
-            public String getSpecifications() {
-                return specifications;
-            }
-            public void setSpecifications(String specifications) {
-                this.specifications = specifications;
-            }
-            public int getPlanQuantity() {
-                return planQuantity;
-            }
-            public void setPlanQuantity(int planQuantity) {
-                this.planQuantity = planQuantity;
-            }
-            public String getUnit() {
-                return unit;
-            }
-            public void setUnit(String unit) {
-                this.unit = unit;
-            }
-            public String getBatchNo() {
-                return batchNo;
-            }
-            public void setBatchNo(String batchNo) {
-                this.batchNo = batchNo;
-            }
-            public String getSeriesId() {
-                return seriesId;
        }
-            public void setSeriesId(String seriesId) {
+        public void setDrawingNumber(String drawingNumber) {
-                this.seriesId = seriesId;
+            this.drawingNumber = drawingNumber;
        }
-            public boolean isDelete() {
+        public String getProcessCode() {
-                return delete;
+            return processCode;
        }
-            public void setDelete(boolean delete) {
+        public void setProcessCode(String processCode) {
-                this.delete = delete;
+            this.processCode = processCode;
-            }
        }
 }
--- a/app/src/main/java/com/wd/workoffice/bean/mesBean/MesOrderDetailBean.java
+++ b/app/src/main/java/com/wd/workoffice/bean/mesBean/MesOrderDetailBean.java
+package com.wd.workoffice.bean.mesBean;
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MesOrderDetailBean {
+    /**
+     * manufactureOrderNumber : BCP-LT191128001
+     * customerName : 张家港浦项不锈钢有限公司
+     * drawingNumber : null
+     * processCode : null
+     * orderNumber : SOGK1911280001
+     * weight : 0.0
+     * actualUnitWeight : 0.0
+     * planCount : 60
+     * deliveryDate : null
+     * opComDate : null
+     * cxNum : 0
+     * ghNum : 0
+     * jgNum : 0
+     * ptNum : 0
+     * scNum : 0
+     * tsNum : 0
+     * fjNum : 0
+     * wasteCount : null
+     * actualQuantity : null
+     * endTime : null
+     * differenceNum : null
+     * periodDays : null
+     * noOperateNum : null
+     * noWarehouseNum : null
+     * onLineNum : null
+     */
+    private String manufactureOrderNumber;
+    private String customerName;
+    private String drawingNumber;
+    private String processCode;
+    private String orderNumber;
+    private String weight;
+    private String actualUnitWeight;
+    private String planCount;
+    private String deliveryDate;
+    private String opComDate;
+    private String cxNum;
+    private String ghNum;
+    private String jgNum;
+    private String ptNum;
+    private String scNum;
+    private String tsNum;
+    private String fjNum;
+    private String wasteCount;
+    private String actualQuantity;
+    private String endTime;
+    private String differenceNum;
+    private String periodDays;
+    private String noOperateNum;
+    private String noWarehouseNum;
+    private String onLineNum;
+    public String getManufactureOrderNumber() {
+        return manufactureOrderNumber;
+    }
+    public void setManufactureOrderNumber(String manufactureOrderNumber) {
+        this.manufactureOrderNumber = manufactureOrderNumber;
+    }
+    public String getCustomerName() {
+        return customerName;
+    }
+    public void setCustomerName(String customerName) {
+        this.customerName = customerName;
+    }
+    public String getDrawingNumber() {
+        return drawingNumber;
+    }
+    public void setDrawingNumber(String drawingNumber) {
+        this.drawingNumber = drawingNumber;
+    }
+    public String getProcessCode() {
+        return processCode;
+    }
+    public void setProcessCode(String processCode) {
+        this.processCode = processCode;
+    }
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+    public String getWeight() {
+        return weight;
+    }
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+    public String getActualUnitWeight() {
+        return actualUnitWeight;
+    }
+    public void setActualUnitWeight(String actualUnitWeight) {
+        this.actualUnitWeight = actualUnitWeight;
+    }
+    public String getPlanCount() {
+        return planCount;
+    }
+    public void setPlanCount(String planCount) {
+        this.planCount = planCount;
+    }
+    public String getDeliveryDate() {
+        return deliveryDate;
+    }
+    public void setDeliveryDate(String deliveryDate) {
+        this.deliveryDate = deliveryDate;
+    }
+    public String getOpComDate() {
+        return opComDate;
+    }
+    public void setOpComDate(String opComDate) {
+        this.opComDate = opComDate;
+    }
+    public String getCxNum() {
+        return cxNum;
+    }
+    public void setCxNum(String cxNum) {
+        this.cxNum = cxNum;
+    }
+    public String getGhNum() {
+        return ghNum;
+    }
+    public void setGhNum(String ghNum) {
+        this.ghNum = ghNum;
+    }
+    public String getJgNum() {
+        return jgNum;
+    }
+    public void setJgNum(String jgNum) {
+        this.jgNum = jgNum;
+    }
+    public String getPtNum() {
+        return ptNum;
+    }
+    public void setPtNum(String ptNum) {
+        this.ptNum = ptNum;
+    }
+    public String getScNum() {
+        return scNum;
+    }
+    public void setScNum(String scNum) {
+        this.scNum = scNum;
+    }
+    public String getTsNum() {
+        return tsNum;
+    }
+    public void setTsNum(String tsNum) {
+        this.tsNum = tsNum;
+    }
+    public String getFjNum() {
+        return fjNum;
+    }
+    public void setFjNum(String fjNum) {
+        this.fjNum = fjNum;
+    }
+    public String getWasteCount() {
+        return wasteCount;
+    }
+    public void setWasteCount(String wasteCount) {
+        this.wasteCount = wasteCount;
+    }
+    public String getActualQuantity() {
+        return actualQuantity;
+    }
+    public void setActualQuantity(String actualQuantity) {
+        this.actualQuantity = actualQuantity;
+    }
+    public String getEndTime() {
+        return endTime;
+    }
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+    public String getDifferenceNum() {
+        return differenceNum;
+    }
+    public void setDifferenceNum(String differenceNum) {
+        this.differenceNum = differenceNum;
+    }
+    public String getPeriodDays() {
+        return periodDays;
+    }
+    public void setPeriodDays(String periodDays) {
+        this.periodDays = periodDays;
+    }
+    public String getNoOperateNum() {
+        return noOperateNum;
+    }
+    public void setNoOperateNum(String noOperateNum) {
+        this.noOperateNum = noOperateNum;
+    }
+    public String getNoWarehouseNum() {
+        return noWarehouseNum;
+    }
+    public void setNoWarehouseNum(String noWarehouseNum) {
+        this.noWarehouseNum = noWarehouseNum;
+    }
+    public String getOnLineNum() {
+        return onLineNum;
+    }
+    public void setOnLineNum(String onLineNum) {
+        this.onLineNum = onLineNum;
+    }
+}
--- a/app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
+++ b/app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
@@ -536,12 +536,25 @@ public interface MesApiService {
    @POST("/himes/api/customer/show/page.json")
    Observable<BaseMesBean> clientPhoneList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+//    /**
+//     * @return
+//     */
+//    @POST("/himes/api/order/show/list.json")
+//    Observable<BaseMesBean> orderList(@Query("functionId") String functionId, @Body RequestBody requestBody);
    /**
     * @return
     */
-    @POST("/himes/api/order/show/list.json")
+    @POST("/himes/api/productionStatistics/show/padList.json")
    Observable<BaseMesBean> orderList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+    /**
+     * @return
+     */
+    @GET("/himes/api/productionStatistics/show/{id}.json")
+    Observable<BaseMesBean> orderDetail(@Path("id") String id);
    /**
     * @return
     */

--- a/app/src/main/java/com/wd/workoffice/ui/activity/mes/order/MesOrderDetailActivity.java
+++ b/app/src/main/java/com/wd/workoffice/ui/activity/mes/order/MesOrderDetailActivity.java
 package com.wd.workoffice.ui.activity.mes.order;
-import android.graphics.Color;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.mesBean.MesOrderBean;
+import com.wd.workoffice.bean.mesBean.MesOrderDetailBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import flexible.xd.android_base.utils.TimeUtils;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
 /**
 * 订单追踪 详情
@@ -22,59 +24,124 @@ import flexible.xd.android_base.utils.TimeUtils;
 **/
 public class MesOrderDetailActivity extends WorkToolBarActivity {
+    @BindView(R.id.tv_content1)
-    @BindView(R.id.tv_top_no)
+    TextView tvContent1;
-    TextView tvTopNo;
+    @BindView(R.id.tv_content2)
-    @BindView(R.id.tv_status)
+    TextView tvContent2;
-    TextView tvStatus;
+    @BindView(R.id.tv_content3)
-    @BindView(R.id.tv_no)
+    TextView tvContent3;
-    TextView tvNo;
+    @BindView(R.id.tv_content4)
-    @BindView(R.id.tv_pro_name)
+    TextView tvContent4;
-    TextView tvProName;
+    @BindView(R.id.tv_content5)
-    @BindView(R.id.tv_pro_code)
+    TextView tvContent5;
-    TextView tvProCode;
+    @BindView(R.id.tv_content6)
-    @BindView(R.id.tv_factory_name)
+    TextView tvContent6;
-    TextView tvFactoryName;
+    @BindView(R.id.tv_content7)
-    @BindView(R.id.tv_factory_code)
+    TextView tvContent7;
-    TextView tvFactoryCode;
+    @BindView(R.id.tv_content8)
-    @BindView(R.id.tv_order_time)
+    TextView tvContent8;
-    TextView tvOrderTime;
+    @BindView(R.id.tv_content9)
-    @BindView(R.id.tv_num)
+    TextView tvContent9;
-    TextView tvNum;
+    @BindView(R.id.tv_content10)
-    @BindView(R.id.tv_weight)
+    TextView tvContent10;
-    TextView tvWeight;
+    @BindView(R.id.tv_content11)
-    @BindView(R.id.tv_time)
+    TextView tvContent11;
-    TextView tvTime;
+    @BindView(R.id.tv_content12)
+    TextView tvContent12;
+    @BindView(R.id.tv_content14)
+    TextView tvContent14;
+    @BindView(R.id.tv_content15)
+    TextView tvContent15;
+    @BindView(R.id.tv_content16)
+    TextView tvContent16;
+    @BindView(R.id.tv_content17)
+    TextView tvContent17;
+    @BindView(R.id.tv_content18)
+    TextView tvContent18;
+    @BindView(R.id.tv_content19)
+    TextView tvContent19;
+    @BindView(R.id.tv_content20)
+    TextView tvContent20;
+    @BindView(R.id.tv_content21)
+    TextView tvContent21;
+    @BindView(R.id.tv_content22)
+    TextView tvContent22;
+    @BindView(R.id.tv_content23)
+    TextView tvContent23;
+    @BindView(R.id.tv_content13)
+    TextView tvContent13;
+    @BindView(R.id.tv_content24)
+    TextView tvContent24;
+    @BindView(R.id.tv_content25)
+    TextView tvContent25;
    @Override
    protected void initView() {
        ButterKnife.bind(this);
-        MesOrderBean.ListBean info = JSON.parseObject(getIntent().getStringExtra("info"), MesOrderBean.ListBean.class);
-        if (TextUtils.equals(info.getScheduleStatus(), "") || TextUtils.equals(info.getScheduleStatus(), "0")) {
-            tvStatus.setText("未排程");
-        } else {
-            tvStatus.setText("已排程");
-        }
-        tvTopNo.setText(String.format("制造令单号:%s", info.getManufactureOrderNumber()));
-        tvNo.setText(info.getManufactureOrderNumber());
-        tvFactoryName.setText(info.getSiteName());
-        tvFactoryCode.setText(info.getSiteCode());
-        tvNum.setText(info.getPlanCount() + "");
-        tvProCode.setText(info.getProductCode());
-        tvProName.setText(info.getProductName());
-        tvWeight.setText(info.getUnit());
-        tvTime.setText(TimeUtils.millis2String(info.getDeliveryDate()));
-        tvOrderTime.setText(TimeUtils.millis2String(info.getCreateDateTime()));
    }
    @Override
    protected void initData() {
+        getData();
    }
    @Override
    protected void initEvent() {
    }
+    private void getData() {
+        RtfUtils.getMesRtf().orderDetail(getIntent().getStringExtra("id")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                MesOrderDetailBean mesOrderDetailBean = JSON.parseObject(data.getData().toString(), MesOrderDetailBean.class);
+                tvContent1.setText(mesOrderDetailBean.getCustomerName());
+                tvContent2.setText(mesOrderDetailBean.getManufactureOrderNumber());
+                tvContent3.setText(mesOrderDetailBean.getDrawingNumber());
+                tvContent4.setText(mesOrderDetailBean.getProcessCode());
+                tvContent5.setText(mesOrderDetailBean.getOrderNumber());
+                tvContent6.setText(mesOrderDetailBean.getWeight());
+                tvContent7.setText(mesOrderDetailBean.getActualUnitWeight());
+                tvContent8.setText(mesOrderDetailBean.getPlanCount());
+                tvContent9.setText(mesOrderDetailBean.getDeliveryDate());
+                tvContent10.setText(mesOrderDetailBean.getOpComDate());
+                tvContent11.setText(mesOrderDetailBean.getCxNum());
+                tvContent12.setText(mesOrderDetailBean.getGhNum());
+                tvContent13.setText(mesOrderDetailBean.getJgNum());
+                tvContent14.setText(mesOrderDetailBean.getPtNum());
+                tvContent15.setText(mesOrderDetailBean.getScNum());
+                tvContent16.setText(mesOrderDetailBean.getTsNum());
+                tvContent17.setText(mesOrderDetailBean.getFjNum());
+                tvContent18.setText(mesOrderDetailBean.getWasteCount());
+                tvContent19.setText(mesOrderDetailBean.getActualQuantity());
+                tvContent20.setText(mesOrderDetailBean.getEndTime());
+                tvContent21.setText(mesOrderDetailBean.getDifferenceNum());
+                tvContent22.setText(mesOrderDetailBean.getPeriodDays());
+                tvContent23.setText(mesOrderDetailBean.getNoOperateNum());
+                tvContent24.setText(mesOrderDetailBean.getNoWarehouseNum());
+                tvContent25.setText(mesOrderDetailBean.getOnLineNum());
+            }
+        });
+    }
    @Override
    protected int layoutId() {
        return R.layout.activity_mes_order_detail;

--- a/app/src/main/java/com/wd/workoffice/ui/activity/mes/order/MesOrderProcessActivity.java
+++ b/app/src/main/java/com/wd/workoffice/ui/activity/mes/order/MesOrderProcessActivity.java
+package com.wd.workoffice.ui.activity.mes.order;
+import android.os.Bundle;
+import android.view.View;
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseMesBean;
+import com.wd.workoffice.app.WorkBaseFg;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.mesBean.MesOrderBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.MesOrderAdapter;
+import com.wd.workoffice.util.WorkUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+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 MesOrderProcessActivity extends WorkToolBarActivity {
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    private int page = 1;
+    private Map<String, Object> param;
+    private MesOrderAdapter dataAdapter;
+    private List<MesOrderBean> dataList;
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+    }
+    @Override
+    protected void initData() {
+        param = WorkUtils.pageMesKey();
+        page = 1;
+        param.put("pageNum", page);
+        Map<String ,Object> paramMap =new HashMap<>();
+        param.put("paramMap", paramMap);
+        dataList = new ArrayList<>();
+        dataAdapter = new MesOrderAdapter(R.layout.item_mes_order, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+        dataAdapter.notifyDataSetChanged();
+        getData();
+    }
+    private void getData() {
+        RtfUtils.getMesRtf().orderList("1",WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+            @Override
+            public void onSuccess(BaseMesBean data) {
+                hideLoading();
+                if (!data.isSuccess()) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<MesOrderBean> getList = JSON.parseArray(data.getData().toString(), MesOrderBean.class);
+                dataList.clear();
+                dataList.addAll(getList);
+                dataAdapter.notifyDataSetChanged();
+//                if (page == 1) {
+//                    dataList.clear();
+//                    dataList.addAll(getList);
+//                    dataAdapter.notifyDataSetChanged();
+//                    dataAdapter.loadMoreComplete();
+//                } else {
+//                    dataAdapter.loadMoreComplete();
+//                    dataList.addAll(getList);
+//                    dataAdapter.notifyDataSetChanged();
+//                }
+//                if (getList.size() == 0) {
+//                    dataAdapter.loadMoreEnd();
+//                } else {
+//                    page++;
+//                }
+            }
+        });
+    }
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(refreshLayout -> {
+            page = 1;
+            param.put("pageNum", page);
+            getData();
+        });
+//        dataAdapter.setOnLoadMoreListener(() -> {
+//            param.put("pageNum", page);
+//            getData();
+//        }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(MesOrderDetailActivity.class,"id",dataList.get(position).getManufactureOrderNumber());
+            }
+        });
+    }
+    @Override
+    protected int layoutId() {
+        return R.layout.fg_work_contacts;
+    }
+}
--- a/app/src/main/java/com/wd/workoffice/ui/adapter/MesOrderAdapter.java
+++ b/app/src/main/java/com/wd/workoffice/ui/adapter/MesOrderAdapter.java
@@ -19,29 +19,29 @@ import flexible.xd.android_base.utils.TimeUtils;
 * Created by flexible on 2018/8/13.
 */
-public class MesOrderAdapter extends BaseQuickAdapter<MesOrderBean.ListBean, BaseViewHolder> {
+public class MesOrderAdapter extends BaseQuickAdapter<MesOrderBean, BaseViewHolder> {
    public MesOrderAdapter(int layoutResId, List data) {
        super(layoutResId, data);
    }
    @Override
-    protected void convert(BaseViewHolder helper, MesOrderBean.ListBean item) {
+    protected void convert(BaseViewHolder helper, MesOrderBean item) {
-        if (TextUtils.equals(item.getScheduleStatus(),"")||TextUtils.equals(item.getScheduleStatus(),"0") ) {
+//        if (TextUtils.equals(item.getScheduleStatus(),"")||TextUtils.equals(item.getScheduleStatus(),"0") ) {
-            helper.setTextColor(R.id.tv_status, Color.parseColor("#FFD16A6A"));
+//            helper.setTextColor(R.id.tv_status, Color.parseColor("#FFD16A6A"));
-            helper.setText(R.id.tv_status,"未排程");
+//            helper.setText(R.id.tv_status,"未排程");
-        } else if (TextUtils.equals(item.getScheduleStatus(),"-")){
+//        } else if (TextUtils.equals(item.getScheduleStatus(),"-")){
-            helper.setTextColor(R.id.tv_status, Color.parseColor("#FF34AA68"));
+//            helper.setTextColor(R.id.tv_status, Color.parseColor("#FF34AA68"));
-            helper.setText(R.id.tv_status,"");
+//            helper.setText(R.id.tv_status,"");
-        }else {
+//        }else {
-            helper.setTextColor(R.id.tv_status, Color.parseColor("#FF34AA68"));
+//            helper.setTextColor(R.id.tv_status, Color.parseColor("#FF34AA68"));
-            helper.setText(R.id.tv_status,"已排程");
+//            helper.setText(R.id.tv_status,"已排程");
-        }
+//        }
        helper.setText(R.id.tv_no,String.format("指令单号:%s", item.getManufactureOrderNumber()));
-        helper.setText(R.id.tv_name, item.getProductName());
+        helper.setText(R.id.tv_client, item.getCustomerName());
-        helper.setText(R.id.tv_factory_name, item.getSiteName());
+        helper.setText(R.id.tv_img_code, item.getDrawingNumber());
-        helper.setText(R.id.tv_num, item.getPlanCount()+"");
+        helper.setText(R.id.tv_order_num, item.getPlanCount()+"");
-        helper.setText(R.id.tv_time, TimeUtils.millis2String(item.getDeliveryDate()));
+        helper.setText(R.id.tv_road,item.getProcessCode());
    }
 }

--- a/app/src/main/java/com/wd/workoffice/ui/fg/MesFragment.java
+++ b/app/src/main/java/com/wd/workoffice/ui/fg/MesFragment.java
@@ -14,6 +14,7 @@ import com.wd.workoffice.ui.activity.mes.QualityTraceabilityActivity;
 import com.wd.workoffice.ui.activity.mes.analysis.MesAnalysisActivity;
 import com.wd.workoffice.ui.activity.mes.order.MesOrderActivity;
 import com.wd.workoffice.ui.activity.mes.MesProcessActivity;
+import com.wd.workoffice.ui.activity.mes.order.MesOrderProcessActivity;
 import com.wd.workoffice.ui.activity.mes.report.MesReportActivity;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketActivity;
 import com.wd.workoffice.ui.adapter.BatLayoutAdapter;
@@ -105,7 +106,7 @@ public class MesFragment extends WorkBaseFg {
            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                switch (position) {
                    case 0:
-                        startActivity(MesOrderActivity.class);
+                        startActivity(MesOrderProcessActivity.class);
                        break;
                    case 1:
                        startActivity(MesReportActivity.class);

--- a/app/src/main/java/com/wd/workoffice/ui/fg/MesOrderFragment.java
+++ b/app/src/main/java/com/wd/workoffice/ui/fg/MesOrderFragment.java
@@ -64,7 +64,7 @@ public class MesOrderFragment extends WorkBaseFg {
    private int page = 1;
    private Map<String, Object> param;
    private MesOrderAdapter dataAdapter;
-    private List<MesOrderBean.ListBean> dataList;
+    private List<MesOrderBean> dataList;
    @Override
    protected void initView() {
@@ -100,42 +100,42 @@ public class MesOrderFragment extends WorkBaseFg {
    }
    private void getData() {
-        RtfUtils.getMesRtf().orderList("1",WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+//        RtfUtils.getMesRtf().orderList("1",WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
-            @Override
+//            @Override
-            public void doOnSubscribe(Disposable d) {
+//            public void doOnSubscribe(Disposable d) {
-            }
+//            }
+//
-            @Override
+//            @Override
-            public void onFail(String errorMsg) {
+//            public void onFail(String errorMsg) {
-                hideLoading();
+//                hideLoading();
-                toast(errorMsg);
+//                toast(errorMsg);
-            }
+//            }
+//
-            @Override
+//            @Override
-            public void onSuccess(BaseMesBean data) {
+//            public void onSuccess(BaseMesBean data) {
-                hideLoading();
+//                hideLoading();
-                if (!data.isSuccess()) {
+//                if (!data.isSuccess()) {
-                    toast(data.getMessage());
+//                    toast(data.getMessage());
-                    return;
+//                    return;
-                }
+//                }
-                List<MesOrderBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesOrderBean.class).getList();
+//                List<MesOrderBean.ListBean> getList = JSON.parseObject(data.getData().toString(), MesOrderBean.class).getList();
-                if (page == 1) {
+//                if (page == 1) {
-                    dataList.clear();
+//                    dataList.clear();
-                    dataList.addAll(getList);
+//                    dataList.addAll(getList);
-                    dataAdapter.notifyDataSetChanged();
+//                    dataAdapter.notifyDataSetChanged();
-                    dataAdapter.loadMoreComplete();
+//                    dataAdapter.loadMoreComplete();
-                } else {
+//                } else {
-                    dataAdapter.loadMoreComplete();
+//                    dataAdapter.loadMoreComplete();
-                    dataList.addAll(getList);
+//                    dataList.addAll(getList);
-                    dataAdapter.notifyDataSetChanged();
+//                    dataAdapter.notifyDataSetChanged();
-                }
+//                }
-                if (getList.size() == 0) {
+//                if (getList.size() == 0) {
-                    dataAdapter.loadMoreEnd();
+//                    dataAdapter.loadMoreEnd();
-                } else {
+//                } else {
-                    page++;
+//                    page++;
-                }
+//                }
-            }
+//            }
-        });
+//        });
    }
    @Override
@@ -152,7 +152,7 @@ public class MesOrderFragment extends WorkBaseFg {
        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
            @Override
            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(MesOrderDetailActivity.class,"info",JSON.toJSONString(dataList.get(position)));
+                startActivity(MesOrderDetailActivity.class,"id",dataList.get(position).getManufactureOrderNumber());
            }
        });
    }

--- a/app/src/main/res/layout/activity_mes_order_detail.xml
+++ b/app/src/main/res/layout/activity_mes_order_detail.xml
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical">
-    <RelativeLayout
+        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-        android:background="@android:color/white"
+            android:padding="10mm">
-        android:paddingHorizontal="17mm"
-        android:paddingVertical="14mm">
            <TextView
-            android:id="@+id/tv_top_no"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-            android:text="指令单号："
+                android:text="客户名称"
-            android:textSize="16sp" />
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
            <TextView
-            android:id="@+id/tv_status"
+                android:id="@+id/tv_content1"
-            android:layout_width="wrap_content"
+                android:layout_width="0dp"
                android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+                android:layout_weight="1"
-            android:layout_centerVertical="true"
+                android:gravity="right"
-            android:text="已排程"
+                android:text="1111"
-            android:textColor="#ff34aa68"
                android:textSize="14sp" />
-    </RelativeLayout>
+        </LinearLayout>
+        <View style="@style/dividerX" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-        android:layout_marginVertical="20mm"
+                android:text="指令单号"
-        android:paddingHorizontal="17mm"
+                android:textColor="@color/flexible_text_gray"
-        android:text="订单属性"
+                android:textSize="14sp" />
-        android:textColor="#ff99a3ba"
+            <TextView
+                android:id="@+id/tv_content2"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
+        </LinearLayout>
+        <View style="@style/dividerX" />
-    <androidx.cardview.widget.CardView
+        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-        android:layout_marginHorizontal="15mm"
+            android:padding="10mm">
-        android:background="@color/white"
-        android:orientation="vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="图号"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content3"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
+                android:textSize="14sp" />
+        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:orientation="vertical"
+            android:padding="10mm">
-            android:paddingHorizontal="15mm"
-            android:paddingBottom="20mm">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="工艺路线"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content4"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
+                android:textSize="14sp" />
+        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="指令单号"
+                android:text="受订单号"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                    android:id="@+id/tv_no"
+                android:id="@+id/tv_content5"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="产品名称"
+                android:text="结算单重(KG)"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                    android:id="@+id/tv_pro_name"
+                android:id="@+id/tv_content6"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="产品编码"
+                android:text="实际单重(KG)"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                    android:id="@+id/tv_pro_code"
+                android:id="@+id/tv_content7"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="工厂名称"
+                android:text="实际单重(KG)"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                    android:id="@+id/tv_factory_name"
+                android:id="@+id/tv_content8"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="工厂编码"
+                android:text="交货日期"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                    android:id="@+id/tv_factory_code"
+                android:id="@+id/tv_content9"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="订单日期"
+                android:text="上机日"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                    android:id="@+id/tv_order_time"
+                android:id="@+id/tv_content10"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="计划数量"
+                android:text="成型"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                    android:id="@+id/tv_num"
+                android:id="@+id/tv_content11"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="单位"
+                android:text="固化/干燥"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                    android:id="@+id/tv_weight"
+                android:id="@+id/tv_content12"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="要求交货时间"
+                android:text="车加工"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                    android:id="@+id/tv_time"
+                android:id="@+id/tv_content13"
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10mm">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="喷涂"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content14"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
+                android:textSize="14sp" />
        </LinearLayout>
-    </androidx.cardview.widget.CardView>
+        <View style="@style/dividerX" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-        android:layout_marginVertical="20mm"
+                android:text="烧成"
-        android:paddingHorizontal="17mm"
+                android:textColor="@color/flexible_text_gray"
-        android:text="工序完成情况"
+                android:textSize="14sp" />
-        android:textColor="#ff99a3ba"
-        android:textSize="14sp"
-        android:visibility="gone" />
+            <TextView
+                android:id="@+id/tv_content15"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
+                android:textSize="14sp" />
+        </LinearLayout>
-    <androidx.cardview.widget.CardView
+        <View style="@style/dividerX" />
+        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-        android:layout_marginHorizontal="15mm"
+            android:padding="10mm">
-        android:background="@color/white"
-        android:orientation="vertical"
+            <TextView
-        android:visibility="gone">
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="探伤"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content16"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
+                android:textSize="14sp" />
+        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:orientation="vertical"
+            android:padding="10mm">
-            android:paddingHorizontal="15mm"
-            android:paddingBottom="20mm">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="附加工"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content17"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
+                android:textSize="14sp" />
+        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="工序名称"
+                android:text="废品"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content18"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
+                android:textSize="14sp" />
+        </LinearLayout>
+        <View style="@style/dividerX" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+                android:text="入库"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content19"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="工序1"
+                android:text="结束时间"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content20"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
+                android:textSize="14sp" />
+        </LinearLayout>
+        <View style="@style/dividerX" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+                android:text="差异"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content21"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="工序2"
+                android:text="周期(天)"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content22"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
+                android:textSize="14sp" />
+        </LinearLayout>
+        <View style="@style/dividerX" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+                android:text="未上机"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content23"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                android:layout_marginTop="10mm">
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                    android:text="工序3"
+                android:text="未入库"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content24"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
+                android:textSize="14sp" />
+        </LinearLayout>
+        <View style="@style/dividerX" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="10mm">
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+                android:text="在线"
+                android:textColor="@color/flexible_text_gray"
+                android:textSize="14sp" />
+            <TextView
+                android:id="@+id/tv_content25"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:text="1111"
                android:textSize="14sp" />
        </LinearLayout>
+        <View style="@style/dividerX" />
    </LinearLayout>
-    </androidx.cardview.widget.CardView>
+</androidx.core.widget.NestedScrollView>
-</LinearLayout>
\ No newline at end of file
\ No newline at end of file
--- a/app/src/main/res/layout/item_mes_order.xml
+++ b/app/src/main/res/layout/item_mes_order.xml
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_centerHorizontal="true"
@@ -34,6 +35,7 @@
                android:layout_alignParentRight="true"
                android:layout_centerVertical="true"
                android:text="已排程"
+                android:visibility="gone"
                android:textColor="#ff34aa68"
                android:textSize="14sp" />
        </RelativeLayout>
@@ -52,13 +54,13 @@
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:text="产品名称"
+                android:text="客户名称"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                android:id="@+id/tv_name"
+                android:id="@+id/tv_client"
                android:layout_width="0dp"
                android:layout_weight="1"
                android:gravity="right"
@@ -73,13 +75,13 @@
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:text="工厂名称"
+                android:text="订单数量"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                android:id="@+id/tv_factory_name"
+                android:id="@+id/tv_order_num"
                android:layout_width="0dp"
                android:layout_weight="1"
                android:layout_height="wrap_content"
@@ -96,13 +98,13 @@
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:text="计划数量"
+                android:text="图号"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                android:id="@+id/tv_num"
+                android:id="@+id/tv_img_code"
                android:layout_width="0dp"
                android:layout_weight="1"
                android:gravity="right"
@@ -119,13 +121,13 @@
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:text="要求交货时间:"
+                android:text="工艺路线:"
                android:textColor="@color/flexible_text_gray"
                android:textSize="14sp" />
            <TextView
-                android:id="@+id/tv_time"
+                android:id="@+id/tv_road"
                android:layout_width="0dp"
                android:layout_weight="1"
                android:gravity="right"