1.用户反馈连铸机详情

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改

app/src/main/java/com/wd/workoffice/bean/event/RefreshMachineEvent.java

+package com.wd.workoffice.bean.event;
+
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class RefreshMachineEvent {
+
+    public RefreshMachineEvent() {
+    }
+
+}

app/src/main/java/com/wd/workoffice/bean/mesBean/MachineBean.java

+package com.wd.workoffice.bean.mesBean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MachineBean {
+
+
+        /**
+         * id : 19
+         * createDateTime : 1585721647000
+         * updateDateTime : 1587460675000
+         * continuousCasterCode : lzj111
+         * continuousCasterName : 连铸机01
+         * steelmakingWorksCode : lgc1
+         * steelmakingWorksName : 炼钢厂1
+         * continuousCasterType : 铸机类型11
+         * fractureSurface : 断面1
+         * steelGrade : 钢种1
+         * castingSpeed : 拉速1
+         * ladleCode : zjb1
+         * ladleCoveringAgentCode : zjbfgj1
+         * mouldFluxesCode : jjbhz1
+         * productsCode : 7301050001B
+         * createUserId : 398c852b38e911ea8334fa163e1166bd
+         * createUserName : null
+         * updateUserId : 398c852b38e911ea8334fa163e1166bd
+         * updateUserName : hello
+         * remark : null
+         * delete : null
+         */
+
+        private String id;
+        private long createDateTime;
+        private long updateDateTime;
+        private String continuousCasterCode;
+        private String continuousCasterName;
+        private String steelmakingWorksCode;
+        private String steelmakingWorksName;
+        private String continuousCasterType;
+        private String fractureSurface;
+        private String steelGrade;
+        private String castingSpeed;
+        private String ladleCode;
+        private String ladleCoveringAgentCode;
+        private String mouldFluxesCode;
+        private String productsCode;
+        private String createUserId;
+        private Object createUserName;
+        private String updateUserId;
+        private String updateUserName;
+        private Object remark;
+        private Object 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 getContinuousCasterCode() {
+            return continuousCasterCode;
+        }
+
+        public void setContinuousCasterCode(String continuousCasterCode) {
+            this.continuousCasterCode = continuousCasterCode;
+        }
+
+        public String getContinuousCasterName() {
+            return continuousCasterName;
+        }
+
+        public void setContinuousCasterName(String continuousCasterName) {
+            this.continuousCasterName = continuousCasterName;
+        }
+
+        public String getSteelmakingWorksCode() {
+            return steelmakingWorksCode;
+        }
+
+        public void setSteelmakingWorksCode(String steelmakingWorksCode) {
+            this.steelmakingWorksCode = steelmakingWorksCode;
+        }
+
+        public String getSteelmakingWorksName() {
+            return steelmakingWorksName;
+        }
+
+        public void setSteelmakingWorksName(String steelmakingWorksName) {
+            this.steelmakingWorksName = steelmakingWorksName;
+        }
+
+        public String getContinuousCasterType() {
+            return continuousCasterType;
+        }
+
+        public void setContinuousCasterType(String continuousCasterType) {
+            this.continuousCasterType = continuousCasterType;
+        }
+
+        public String getFractureSurface() {
+            return fractureSurface;
+        }
+
+        public void setFractureSurface(String fractureSurface) {
+            this.fractureSurface = fractureSurface;
+        }
+
+        public String getSteelGrade() {
+            return steelGrade;
+        }
+
+        public void setSteelGrade(String steelGrade) {
+            this.steelGrade = steelGrade;
+        }
+
+        public String getCastingSpeed() {
+            return castingSpeed;
+        }
+
+        public void setCastingSpeed(String castingSpeed) {
+            this.castingSpeed = castingSpeed;
+        }
+
+        public String getLadleCode() {
+            return ladleCode;
+        }
+
+        public void setLadleCode(String ladleCode) {
+            this.ladleCode = ladleCode;
+        }
+
+        public String getLadleCoveringAgentCode() {
+            return ladleCoveringAgentCode;
+        }
+
+        public void setLadleCoveringAgentCode(String ladleCoveringAgentCode) {
+            this.ladleCoveringAgentCode = ladleCoveringAgentCode;
+        }
+
+        public String getMouldFluxesCode() {
+            return mouldFluxesCode;
+        }
+
+        public void setMouldFluxesCode(String mouldFluxesCode) {
+            this.mouldFluxesCode = mouldFluxesCode;
+        }
+
+        public String getProductsCode() {
+            return productsCode;
+        }
+
+        public void setProductsCode(String productsCode) {
+            this.productsCode = productsCode;
+        }
+
+        public String getCreateUserId() {
+            return createUserId;
+        }
+
+        public void setCreateUserId(String createUserId) {
+            this.createUserId = createUserId;
+        }
+
+        public Object getCreateUserName() {
+            return createUserName;
+        }
+
+        public void setCreateUserName(Object createUserName) {
+            this.createUserName = createUserName;
+        }
+
+        public String getUpdateUserId() {
+            return updateUserId;
+        }
+
+        public void setUpdateUserId(String updateUserId) {
+            this.updateUserId = updateUserId;
+        }
+
+        public String getUpdateUserName() {
+            return updateUserName;
+        }
+
+        public void setUpdateUserName(String updateUserName) {
+            this.updateUserName = updateUserName;
+        }
+
+        public Object getRemark() {
+            return remark;
+        }
+
+        public void setRemark(Object remark) {
+            this.remark = remark;
+        }
+
+        public Object getDelete() {
+            return delete;
+        }
+
+        public void setDelete(Object delete) {
+            this.delete = delete;
+        }
+}

app/src/main/java/com/wd/workoffice/bean/mesBean/MchineDetailBean.java

+package com.wd.workoffice.bean.mesBean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class MchineDetailBean {
+
+
+        /**
+         * id : null
+         * createDateTime : null
+         * updateDateTime : null
+         * castInfo : {"id":"19","isDelete":null,"createDateTime":1585721647000,"updateDateTime":1587460675000,"continuousCasterCode":"lzj111","continuousCasterName":"连铸机01","steelmakingWorksCode":"lgc1","steelmakingWorksName":"炼钢厂1","continuousCasterType":"铸机类型11","fractureSurface":"断面1","steelGrade":"钢种1","castingSpeed":"拉速1","ladleCode":"zjb1","ladleCoveringAgentCode":"zjbfgj1","mouldFluxesCode":"jjbhz1","productsCode":"7301050001B","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":null}
+         * castLadle : {"id":"17","createDateTime":null,"updateDateTime":1587460675000,"ladleCode":"zjb1","capacity":"1001","lifeSpan":"1001","liquidLevel":"液位1","liquidSteelTemperature":"30001","bakingMethod":"小火1","bakingTemperature":"5001","bakingDateTime":1001,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":false}
+         * covAgent : {"id":"18","isDelete":null,"createDateTime":1585721647000,"updateDateTime":1587460675000,"ladleCoveringAgentCode":"zjbfgj1","ladleCoveringAgentName":"中包覆盖名称11","acidAlkaliDegree":"101","chemicalComposition":"O-S1","supplierCode":"gys1","supplierName":"供应商11","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":null}
+         * mouldFlu : {"id":"18","isDelete":null,"createDateTime":1585721647000,"updateDateTime":1587460675000,"mouldFluxesCode":"jjbhz1","mouldFluxesName":"结晶保护11","acidAlkaliDegree":"101","chemicalComposition":"O-T1","supplierCode":"gys2","supplierName":"供应商2","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":null}
+         * productList : [{"id":"18","createDateTime":1585721647000,"updateDateTime":1587429741000,"continuousCasterCode":"lzj111","productsCode":"1233","productsName":"型号A","figureNumber":"11-11","productsType":"类别1","productsStandards":null,"materialsUsed":"用料","useRequirement":"使用详情","useLife":"10","slagLineLocation":"高","bakingMethod":"中火","bakingTemperature":"300","bakingDateTime":100,"useProblemFeedback":"使用详情","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":false},{"id":"36","createDateTime":1587353909000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"C","productsName":"型号C","figureNumber":"11-11","productsType":"类别1","productsStandards":null,"materialsUsed":"用料","useRequirement":"要求","useLife":"10","slagLineLocation":"高","bakingMethod":"中火","bakingTemperature":"300","bakingDateTime":100,"useProblemFeedback":"使用详情","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"38","createDateTime":1587364195000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"99","productsName":"座砖Z124","figureNumber":null,"productsType":"成品","productsStandards":null,"materialsUsed":"11","useRequirement":"88","useLife":"33","slagLineLocation":"44","bakingMethod":"55","bakingTemperature":"66","bakingDateTime":77,"useProblemFeedback":null,"attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"39","createDateTime":1587365983000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"999","productsName":"塞棒B286-1","figureNumber":"B286-1","productsType":"成品","productsStandards":null,"materialsUsed":"11","useRequirement":"88","useLife":"33","slagLineLocation":"44","bakingMethod":"55","bakingTemperature":"66","bakingDateTime":77,"useProblemFeedback":null,"attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"40","createDateTime":1587366764000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"9","productsName":"塞棒B286-1","figureNumber":"B286-1","productsType":"成品","productsStandards":null,"materialsUsed":"1","useRequirement":"8","useLife":"3","slagLineLocation":"4","bakingMethod":"5","bakingTemperature":"6","bakingDateTime":7,"useProblemFeedback":null,"attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false}]
+         * supplyList : [{"id":"9","createDateTime":1585721647000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7301050001B","productsName":"型号A","figureNumber":"图号","deliveryDateTime":1584933071000,"deliveryNumber":"20","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"11","createDateTime":1585819308000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7301050001B","productsName":"型号A","figureNumber":"图号","deliveryDateTime":1584933071000,"deliveryNumber":"20","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"13","createDateTime":1585822154000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7301050001B","productsName":"型号A","figureNumber":"图号","deliveryDateTime":1584933071000,"deliveryNumber":"20","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"15","createDateTime":1585822229000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7301050001B","productsName":"型号A","figureNumber":"图号","deliveryDateTime":1584933071000,"deliveryNumber":"20","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"25","createDateTime":1588146604000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7104010142L","productsName":"快换中包水口ZB145-A","figureNumber":"ZB145-A","deliveryDateTime":null,"deliveryNumber":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false}]
+         * stockList : [{"id":"9","createDateTime":1585721647000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7301050001B","productsName":"型号A","figureNumber":"图号","stockNumber":"100","otherInformationExplain":"说明","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"11","createDateTime":1585819308000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7301050001B","productsName":"型号A","figureNumber":"图号","stockNumber":"100","otherInformationExplain":"说明","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"13","createDateTime":1585822154000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7301050001B","productsName":"型号A","figureNumber":"图号","stockNumber":"100","otherInformationExplain":"说明","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"15","createDateTime":1585822229000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7301050001B","productsName":"型号A","figureNumber":"图号","stockNumber":"100","otherInformationExplain":"说明","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"26","createDateTime":1588146709000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7103040019L","productsName":"浸入式水口J561-1B","figureNumber":"J561-1B","stockNumber":null,"otherInformationExplain":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false}]
+         * otherSupList : [{"id":"9","createDateTime":1585721648000,"updateDateTime":1587371966000,"continuousCasterCode":"lzj111","supplierCode":"gys1","supplierName":"供应商1","useLife":"10","supplyNumber":"20","stockNumber":"30","otherSituationDescription":"说明","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":false},{"id":"10","createDateTime":1585721648000,"updateDateTime":1587371433000,"continuousCasterCode":"lzj111","supplierCode":"gys1","supplierName":"供应商2","useLife":"20","supplyNumber":"205","stockNumber":"305","otherSituationDescription":"说明2","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":false},{"id":"24","createDateTime":1587089994000,"updateDateTime":1587371473000,"continuousCasterCode":"lzj111","supplierCode":"gys1","supplierName":"供应商1","useLife":"10","supplyNumber":"20","stockNumber":"30","otherSituationDescription":"说明","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":false}]
+         * otherLadleList : [{"id":"9","createDateTime":1585721648000,"updateDateTime":1587371943000,"continuousCasterCode":"lzj111","refractoryName":"滑块","figureNumber":"图号2","materialsUsed":"用料2","useRequirement":null,"useLife":"10","useProblemFeedback":"说明","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":false},{"id":"10","createDateTime":1585721648000,"updateDateTime":null,"continuousCasterCode":"lzj111","refractoryName":"滑块2","figureNumber":"图号2","materialsUsed":"用料2","useRequirement":null,"useLife":"10","useProblemFeedback":"说明2","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"23","createDateTime":1587090145000,"updateDateTime":1587371561000,"continuousCasterCode":"lzj111","refractoryName":"滑块","figureNumber":"图号","materialsUsed":"用料","useRequirement":null,"useLife":"10","useProblemFeedback":"说明","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":false}]
+         * settleList : [{"id":"9","isDelete":null,"createDateTime":1585721648000,"updateDateTime":1587367515000,"continuousCasterCode":"lzj111","ladleContractSituation":"中包情况11122","continuousCastingContractSituation":"承包情况222","settlementMethod":"结算方式333","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":null},{"id":"10","isDelete":null,"createDateTime":1585721648000,"updateDateTime":null,"continuousCasterCode":"lzj111","ladleContractSituation":"中包情况2","continuousCastingContractSituation":"承包情况2","settlementMethod":"结算方式2","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},{"id":"22","isDelete":null,"createDateTime":1587090288000,"updateDateTime":null,"continuousCasterCode":"lzj111","ladleContractSituation":"中包情况","continuousCastingContractSituation":"承包情况","settlementMethod":"结算方式","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":null},{"id":"23","isDelete":null,"createDateTime":1587368590000,"updateDateTime":null,"continuousCasterCode":"lzj111","ladleContractSituation":"111112","continuousCastingContractSituation":"1111111311","settlementMethod":"112314","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":null},{"id":"24","isDelete":null,"createDateTime":1587368626000,"updateDateTime":null,"continuousCasterCode":"lzj111","ladleContractSituation":"22222","continuousCastingContractSituation":"3333","settlementMethod":"2213","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":null},{"id":"25","isDelete":null,"createDateTime":1587368719000,"updateDateTime":null,"continuousCasterCode":"lzj111","ladleContractSituation":"12345","continuousCastingContractSituation":"3214","settlementMethod":"56da","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":null},{"id":"26","isDelete":null,"createDateTime":1587368861000,"updateDateTime":null,"continuousCasterCode":"lzj111","ladleContractSituation":"3123as","continuousCastingContractSituation":"Aaaaa","settlementMethod":"Ssssss","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":null},{"id":"27","isDelete":null,"createDateTime":1587368946000,"updateDateTime":null,"continuousCasterCode":"lzj111","ladleContractSituation":"31231","continuousCastingContractSituation":"Ddddd","settlementMethod":"Ffffff","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":null}]
+         * delete : null
+         */
+
+        private Object id;
+        private Object createDateTime;
+        private Object updateDateTime;
+        private CastInfoBean castInfo;
+        private CastLadleBean castLadle;
+        private CovAgentBean covAgent;
+        private MouldFluBean mouldFlu;
+        private Object delete;
+        private List<ProductListBean> productList;
+        private List<SupplyListBean> supplyList;
+        private List<StockListBean> stockList;
+        private List<OtherSupListBean> otherSupList;
+        private List<OtherLadleListBean> otherLadleList;
+        private List<SettleListBean> settleList;
+
+        public Object getId() {
+            return id;
+        }
+
+        public void setId(Object id) {
+            this.id = id;
+        }
+
+        public Object getCreateDateTime() {
+            return createDateTime;
+        }
+
+        public void setCreateDateTime(Object createDateTime) {
+            this.createDateTime = createDateTime;
+        }
+
+        public Object getUpdateDateTime() {
+            return updateDateTime;
+        }
+
+        public void setUpdateDateTime(Object updateDateTime) {
+            this.updateDateTime = updateDateTime;
+        }
+
+        public CastInfoBean getCastInfo() {
+            return castInfo;
+        }
+
+        public void setCastInfo(CastInfoBean castInfo) {
+            this.castInfo = castInfo;
+        }
+
+        public CastLadleBean getCastLadle() {
+            return castLadle;
+        }
+
+        public void setCastLadle(CastLadleBean castLadle) {
+            this.castLadle = castLadle;
+        }
+
+        public CovAgentBean getCovAgent() {
+            return covAgent;
+        }
+
+        public void setCovAgent(CovAgentBean covAgent) {
+            this.covAgent = covAgent;
+        }
+
+        public MouldFluBean getMouldFlu() {
+            return mouldFlu;
+        }
+
+        public void setMouldFlu(MouldFluBean mouldFlu) {
+            this.mouldFlu = mouldFlu;
+        }
+
+        public Object getDelete() {
+            return delete;
+        }
+
+        public void setDelete(Object delete) {
+            this.delete = delete;
+        }
+
+        public List<ProductListBean> getProductList() {
+            return productList;
+        }
+
+        public void setProductList(List<ProductListBean> productList) {
+            this.productList = productList;
+        }
+
+        public List<SupplyListBean> getSupplyList() {
+            return supplyList;
+        }
+
+        public void setSupplyList(List<SupplyListBean> supplyList) {
+            this.supplyList = supplyList;
+        }
+
+        public List<StockListBean> getStockList() {
+            return stockList;
+        }
+
+        public void setStockList(List<StockListBean> stockList) {
+            this.stockList = stockList;
+        }
+
+        public List<OtherSupListBean> getOtherSupList() {
+            return otherSupList;
+        }
+
+        public void setOtherSupList(List<OtherSupListBean> otherSupList) {
+            this.otherSupList = otherSupList;
+        }
+
+        public List<OtherLadleListBean> getOtherLadleList() {
+            return otherLadleList;
+        }
+
+        public void setOtherLadleList(List<OtherLadleListBean> otherLadleList) {
+            this.otherLadleList = otherLadleList;
+        }
+
+        public List<SettleListBean> getSettleList() {
+            return settleList;
+        }
+
+        public void setSettleList(List<SettleListBean> settleList) {
+            this.settleList = settleList;
+        }
+
+        public static class CastInfoBean {
+            /**
+             * id : 19
+             * isDelete : null
+             * createDateTime : 1585721647000
+             * updateDateTime : 1587460675000
+             * continuousCasterCode : lzj111
+             * continuousCasterName : 连铸机01
+             * steelmakingWorksCode : lgc1
+             * steelmakingWorksName : 炼钢厂1
+             * continuousCasterType : 铸机类型11
+             * fractureSurface : 断面1
+             * steelGrade : 钢种1
+             * castingSpeed : 拉速1
+             * ladleCode : zjb1
+             * ladleCoveringAgentCode : zjbfgj1
+             * mouldFluxesCode : jjbhz1
+             * productsCode : 7301050001B
+             * createUserId : 398c852b38e911ea8334fa163e1166bd
+             * createUserName : null
+             * updateUserId : 398c852b38e911ea8334fa163e1166bd
+             * updateUserName : hello
+             * remark : null
+             * delete : null
+             */
+
+            private String id;
+            private Object isDelete;
+            private long createDateTime;
+            private long updateDateTime;
+            private String continuousCasterCode;
+            private String continuousCasterName;
+            private String steelmakingWorksCode;
+            private String steelmakingWorksName;
+            private String continuousCasterType;
+            private String fractureSurface;
+            private String steelGrade;
+            private String castingSpeed;
+            private String ladleCode;
+            private String ladleCoveringAgentCode;
+            private String mouldFluxesCode;
+            private String productsCode;
+            private String createUserId;
+            private Object createUserName;
+            private String updateUserId;
+            private String updateUserName;
+            private Object remark;
+            private Object delete;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public Object getIsDelete() {
+                return isDelete;
+            }
+
+            public void setIsDelete(Object isDelete) {
+                this.isDelete = isDelete;
+            }
+
+            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 getContinuousCasterCode() {
+                return continuousCasterCode;
+            }
+
+            public void setContinuousCasterCode(String continuousCasterCode) {
+                this.continuousCasterCode = continuousCasterCode;
+            }
+
+            public String getContinuousCasterName() {
+                return continuousCasterName;
+            }
+
+            public void setContinuousCasterName(String continuousCasterName) {
+                this.continuousCasterName = continuousCasterName;
+            }
+
+            public String getSteelmakingWorksCode() {
+                return steelmakingWorksCode;
+            }
+
+            public void setSteelmakingWorksCode(String steelmakingWorksCode) {
+                this.steelmakingWorksCode = steelmakingWorksCode;
+            }
+
+            public String getSteelmakingWorksName() {
+                return steelmakingWorksName;
+            }
+
+            public void setSteelmakingWorksName(String steelmakingWorksName) {
+                this.steelmakingWorksName = steelmakingWorksName;
+            }
+
+            public String getContinuousCasterType() {
+                return continuousCasterType;
+            }
+
+            public void setContinuousCasterType(String continuousCasterType) {
+                this.continuousCasterType = continuousCasterType;
+            }
+
+            public String getFractureSurface() {
+                return fractureSurface;
+            }
+
+            public void setFractureSurface(String fractureSurface) {
+                this.fractureSurface = fractureSurface;
+            }
+
+            public String getSteelGrade() {
+                return steelGrade;
+            }
+
+            public void setSteelGrade(String steelGrade) {
+                this.steelGrade = steelGrade;
+            }
+
+            public String getCastingSpeed() {
+                return castingSpeed;
+            }
+
+            public void setCastingSpeed(String castingSpeed) {
+                this.castingSpeed = castingSpeed;
+            }
+
+            public String getLadleCode() {
+                return ladleCode;
+            }
+
+            public void setLadleCode(String ladleCode) {
+                this.ladleCode = ladleCode;
+            }
+
+            public String getLadleCoveringAgentCode() {
+                return ladleCoveringAgentCode;
+            }
+
+            public void setLadleCoveringAgentCode(String ladleCoveringAgentCode) {
+                this.ladleCoveringAgentCode = ladleCoveringAgentCode;
+            }
+
+            public String getMouldFluxesCode() {
+                return mouldFluxesCode;
+            }
+
+            public void setMouldFluxesCode(String mouldFluxesCode) {
+                this.mouldFluxesCode = mouldFluxesCode;
+            }
+
+            public String getProductsCode() {
+                return productsCode;
+            }
+
+            public void setProductsCode(String productsCode) {
+                this.productsCode = productsCode;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object createUserName) {
+                this.createUserName = createUserName;
+            }
+
+            public String getUpdateUserId() {
+                return updateUserId;
+            }
+
+            public void setUpdateUserId(String updateUserId) {
+                this.updateUserId = updateUserId;
+            }
+
+            public String getUpdateUserName() {
+                return updateUserName;
+            }
+
+            public void setUpdateUserName(String updateUserName) {
+                this.updateUserName = updateUserName;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public Object getDelete() {
+                return delete;
+            }
+
+            public void setDelete(Object delete) {
+                this.delete = delete;
+            }
+        }
+
+        public static class CastLadleBean {
+            /**
+             * id : 17
+             * createDateTime : null
+             * updateDateTime : 1587460675000
+             * ladleCode : zjb1
+             * capacity : 1001
+             * lifeSpan : 1001
+             * liquidLevel : 液位1
+             * liquidSteelTemperature : 30001
+             * bakingMethod : 小火1
+             * bakingTemperature : 5001
+             * bakingDateTime : 1001
+             * createUserId : 398c852b38e911ea8334fa163e1166bd
+             * createUserName : null
+             * updateUserId : 398c852b38e911ea8334fa163e1166bd
+             * updateUserName : hello
+             * remark : null
+             * delete : false
+             */
+
+            private String id;
+            private Object createDateTime;
+            private long updateDateTime;
+            private String ladleCode;
+            private String capacity;
+            private String lifeSpan;
+            private String liquidLevel;
+            private String liquidSteelTemperature;
+            private String bakingMethod;
+            private String bakingTemperature;
+            private long bakingDateTime;
+            private String createUserId;
+            private Object createUserName;
+            private String updateUserId;
+            private String updateUserName;
+            private Object remark;
+            private boolean delete;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public Object getCreateDateTime() {
+                return createDateTime;
+            }
+
+            public void setCreateDateTime(Object createDateTime) {
+                this.createDateTime = createDateTime;
+            }
+
+            public long getUpdateDateTime() {
+                return updateDateTime;
+            }
+
+            public void setUpdateDateTime(long updateDateTime) {
+                this.updateDateTime = updateDateTime;
+            }
+
+            public String getLadleCode() {
+                return ladleCode;
+            }
+
+            public void setLadleCode(String ladleCode) {
+                this.ladleCode = ladleCode;
+            }
+
+            public String getCapacity() {
+                return capacity;
+            }
+
+            public void setCapacity(String capacity) {
+                this.capacity = capacity;
+            }
+
+            public String getLifeSpan() {
+                return lifeSpan;
+            }
+
+            public void setLifeSpan(String lifeSpan) {
+                this.lifeSpan = lifeSpan;
+            }
+
+            public String getLiquidLevel() {
+                return liquidLevel;
+            }
+
+            public void setLiquidLevel(String liquidLevel) {
+                this.liquidLevel = liquidLevel;
+            }
+
+            public String getLiquidSteelTemperature() {
+                return liquidSteelTemperature;
+            }
+
+            public void setLiquidSteelTemperature(String liquidSteelTemperature) {
+                this.liquidSteelTemperature = liquidSteelTemperature;
+            }
+
+            public String getBakingMethod() {
+                return bakingMethod;
+            }
+
+            public void setBakingMethod(String bakingMethod) {
+                this.bakingMethod = bakingMethod;
+            }
+
+            public String getBakingTemperature() {
+                return bakingTemperature;
+            }
+
+            public void setBakingTemperature(String bakingTemperature) {
+                this.bakingTemperature = bakingTemperature;
+            }
+
+            public long getBakingDateTime() {
+                return bakingDateTime;
+            }
+
+            public void setBakingDateTime(long bakingDateTime) {
+                this.bakingDateTime = bakingDateTime;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object createUserName) {
+                this.createUserName = createUserName;
+            }
+
+            public String getUpdateUserId() {
+                return updateUserId;
+            }
+
+            public void setUpdateUserId(String updateUserId) {
+                this.updateUserId = updateUserId;
+            }
+
+            public String getUpdateUserName() {
+                return updateUserName;
+            }
+
+            public void setUpdateUserName(String updateUserName) {
+                this.updateUserName = updateUserName;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public boolean isDelete() {
+                return delete;
+            }
+
+            public void setDelete(boolean delete) {
+                this.delete = delete;
+            }
+        }
+
+        public static class CovAgentBean {
+            /**
+             * id : 18
+             * isDelete : null
+             * createDateTime : 1585721647000
+             * updateDateTime : 1587460675000
+             * ladleCoveringAgentCode : zjbfgj1
+             * ladleCoveringAgentName : 中包覆盖名称11
+             * acidAlkaliDegree : 101
+             * chemicalComposition : O-S1
+             * supplierCode : gys1
+             * supplierName : 供应商11
+             * createUserId : 398c852b38e911ea8334fa163e1166bd
+             * createUserName : null
+             * updateUserId : 398c852b38e911ea8334fa163e1166bd
+             * updateUserName : hello
+             * remark : null
+             * delete : null
+             */
+
+            private String id;
+            private Object isDelete;
+            private long createDateTime;
+            private long updateDateTime;
+            private String ladleCoveringAgentCode;
+            private String ladleCoveringAgentName;
+            private String acidAlkaliDegree;
+            private String chemicalComposition;
+            private String supplierCode;
+            private String supplierName;
+            private String createUserId;
+            private Object createUserName;
+            private String updateUserId;
+            private String updateUserName;
+            private Object remark;
+            private Object delete;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public Object getIsDelete() {
+                return isDelete;
+            }
+
+            public void setIsDelete(Object isDelete) {
+                this.isDelete = isDelete;
+            }
+
+            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 getLadleCoveringAgentCode() {
+                return ladleCoveringAgentCode;
+            }
+
+            public void setLadleCoveringAgentCode(String ladleCoveringAgentCode) {
+                this.ladleCoveringAgentCode = ladleCoveringAgentCode;
+            }
+
+            public String getLadleCoveringAgentName() {
+                return ladleCoveringAgentName;
+            }
+
+            public void setLadleCoveringAgentName(String ladleCoveringAgentName) {
+                this.ladleCoveringAgentName = ladleCoveringAgentName;
+            }
+
+            public String getAcidAlkaliDegree() {
+                return acidAlkaliDegree;
+            }
+
+            public void setAcidAlkaliDegree(String acidAlkaliDegree) {
+                this.acidAlkaliDegree = acidAlkaliDegree;
+            }
+
+            public String getChemicalComposition() {
+                return chemicalComposition;
+            }
+
+            public void setChemicalComposition(String chemicalComposition) {
+                this.chemicalComposition = chemicalComposition;
+            }
+
+            public String getSupplierCode() {
+                return supplierCode;
+            }
+
+            public void setSupplierCode(String supplierCode) {
+                this.supplierCode = supplierCode;
+            }
+
+            public String getSupplierName() {
+                return supplierName;
+            }
+
+            public void setSupplierName(String supplierName) {
+                this.supplierName = supplierName;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object createUserName) {
+                this.createUserName = createUserName;
+            }
+
+            public String getUpdateUserId() {
+                return updateUserId;
+            }
+
+            public void setUpdateUserId(String updateUserId) {
+                this.updateUserId = updateUserId;
+            }
+
+            public String getUpdateUserName() {
+                return updateUserName;
+            }
+
+            public void setUpdateUserName(String updateUserName) {
+                this.updateUserName = updateUserName;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public Object getDelete() {
+                return delete;
+            }
+
+            public void setDelete(Object delete) {
+                this.delete = delete;
+            }
+        }
+
+        public static class MouldFluBean {
+            /**
+             * id : 18
+             * isDelete : null
+             * createDateTime : 1585721647000
+             * updateDateTime : 1587460675000
+             * mouldFluxesCode : jjbhz1
+             * mouldFluxesName : 结晶保护11
+             * acidAlkaliDegree : 101
+             * chemicalComposition : O-T1
+             * supplierCode : gys2
+             * supplierName : 供应商2
+             * createUserId : 398c852b38e911ea8334fa163e1166bd
+             * createUserName : null
+             * updateUserId : 398c852b38e911ea8334fa163e1166bd
+             * updateUserName : hello
+             * remark : null
+             * delete : null
+             */
+
+            private String id;
+            private Object isDelete;
+            private long createDateTime;
+            private long updateDateTime;
+            private String mouldFluxesCode;
+            private String mouldFluxesName;
+            private String acidAlkaliDegree;
+            private String chemicalComposition;
+            private String supplierCode;
+            private String supplierName;
+            private String createUserId;
+            private Object createUserName;
+            private String updateUserId;
+            private String updateUserName;
+            private Object remark;
+            private Object delete;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public Object getIsDelete() {
+                return isDelete;
+            }
+
+            public void setIsDelete(Object isDelete) {
+                this.isDelete = isDelete;
+            }
+
+            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 getMouldFluxesCode() {
+                return mouldFluxesCode;
+            }
+
+            public void setMouldFluxesCode(String mouldFluxesCode) {
+                this.mouldFluxesCode = mouldFluxesCode;
+            }
+
+            public String getMouldFluxesName() {
+                return mouldFluxesName;
+            }
+
+            public void setMouldFluxesName(String mouldFluxesName) {
+                this.mouldFluxesName = mouldFluxesName;
+            }
+
+            public String getAcidAlkaliDegree() {
+                return acidAlkaliDegree;
+            }
+
+            public void setAcidAlkaliDegree(String acidAlkaliDegree) {
+                this.acidAlkaliDegree = acidAlkaliDegree;
+            }
+
+            public String getChemicalComposition() {
+                return chemicalComposition;
+            }
+
+            public void setChemicalComposition(String chemicalComposition) {
+                this.chemicalComposition = chemicalComposition;
+            }
+
+            public String getSupplierCode() {
+                return supplierCode;
+            }
+
+            public void setSupplierCode(String supplierCode) {
+                this.supplierCode = supplierCode;
+            }
+
+            public String getSupplierName() {
+                return supplierName;
+            }
+
+            public void setSupplierName(String supplierName) {
+                this.supplierName = supplierName;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object createUserName) {
+                this.createUserName = createUserName;
+            }
+
+            public String getUpdateUserId() {
+                return updateUserId;
+            }
+
+            public void setUpdateUserId(String updateUserId) {
+                this.updateUserId = updateUserId;
+            }
+
+            public String getUpdateUserName() {
+                return updateUserName;
+            }
+
+            public void setUpdateUserName(String updateUserName) {
+                this.updateUserName = updateUserName;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public Object getDelete() {
+                return delete;
+            }
+
+            public void setDelete(Object delete) {
+                this.delete = delete;
+            }
+        }
+
+        public static class ProductListBean {
+            /**
+             * id : 18
+             * createDateTime : 1585721647000
+             * updateDateTime : 1587429741000
+             * continuousCasterCode : lzj111
+             * productsCode : 1233
+             * productsName : 型号A
+             * figureNumber : 11-11
+             * productsType : 类别1
+             * productsStandards : null
+             * materialsUsed : 用料
+             * useRequirement : 使用详情
+             * useLife : 10
+             * slagLineLocation : 高
+             * bakingMethod : 中火
+             * bakingTemperature : 300
+             * bakingDateTime : 100
+             * useProblemFeedback : 使用详情
+             * attachmentId : null
+             * attachments : []
+             * createUserId : 398c852b38e911ea8334fa163e1166bd
+             * createUserName : null
+             * updateUserId : 398c852b38e911ea8334fa163e1166bd
+             * updateUserName : hello
+             * remark : null
+             * delete : false
+             */
+
+            private String id;
+            private long createDateTime;
+            private long updateDateTime;
+            private String continuousCasterCode;
+            private String productsCode;
+            private String productsName;
+            private String figureNumber;
+            private String productsType;
+            private Object productsStandards;
+            private String materialsUsed;
+            private String useRequirement;
+            private String useLife;
+            private String slagLineLocation;
+            private String bakingMethod;
+            private String bakingTemperature;
+            private int bakingDateTime;
+            private String useProblemFeedback;
+            private Object attachmentId;
+            private String createUserId;
+            private Object createUserName;
+            private String updateUserId;
+            private String updateUserName;
+            private Object remark;
+            private boolean delete;
+            private List<?> attachments;
+
+            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 getContinuousCasterCode() {
+                return continuousCasterCode;
+            }
+
+            public void setContinuousCasterCode(String continuousCasterCode) {
+                this.continuousCasterCode = continuousCasterCode;
+            }
+
+            public String getProductsCode() {
+                return productsCode;
+            }
+
+            public void setProductsCode(String productsCode) {
+                this.productsCode = productsCode;
+            }
+
+            public String getProductsName() {
+                return productsName;
+            }
+
+            public void setProductsName(String productsName) {
+                this.productsName = productsName;
+            }
+
+            public String getFigureNumber() {
+                return figureNumber;
+            }
+
+            public void setFigureNumber(String figureNumber) {
+                this.figureNumber = figureNumber;
+            }
+
+            public String getProductsType() {
+                return productsType;
+            }
+
+            public void setProductsType(String productsType) {
+                this.productsType = productsType;
+            }
+
+            public Object getProductsStandards() {
+                return productsStandards;
+            }
+
+            public void setProductsStandards(Object productsStandards) {
+                this.productsStandards = productsStandards;
+            }
+
+            public String getMaterialsUsed() {
+                return materialsUsed;
+            }
+
+            public void setMaterialsUsed(String materialsUsed) {
+                this.materialsUsed = materialsUsed;
+            }
+
+            public String getUseRequirement() {
+                return useRequirement;
+            }
+
+            public void setUseRequirement(String useRequirement) {
+                this.useRequirement = useRequirement;
+            }
+
+            public String getUseLife() {
+                return useLife;
+            }
+
+            public void setUseLife(String useLife) {
+                this.useLife = useLife;
+            }
+
+            public String getSlagLineLocation() {
+                return slagLineLocation;
+            }
+
+            public void setSlagLineLocation(String slagLineLocation) {
+                this.slagLineLocation = slagLineLocation;
+            }
+
+            public String getBakingMethod() {
+                return bakingMethod;
+            }
+
+            public void setBakingMethod(String bakingMethod) {
+                this.bakingMethod = bakingMethod;
+            }
+
+            public String getBakingTemperature() {
+                return bakingTemperature;
+            }
+
+            public void setBakingTemperature(String bakingTemperature) {
+                this.bakingTemperature = bakingTemperature;
+            }
+
+            public int getBakingDateTime() {
+                return bakingDateTime;
+            }
+
+            public void setBakingDateTime(int bakingDateTime) {
+                this.bakingDateTime = bakingDateTime;
+            }
+
+            public String getUseProblemFeedback() {
+                return useProblemFeedback;
+            }
+
+            public void setUseProblemFeedback(String useProblemFeedback) {
+                this.useProblemFeedback = useProblemFeedback;
+            }
+
+            public Object getAttachmentId() {
+                return attachmentId;
+            }
+
+            public void setAttachmentId(Object attachmentId) {
+                this.attachmentId = attachmentId;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object createUserName) {
+                this.createUserName = createUserName;
+            }
+
+            public String getUpdateUserId() {
+                return updateUserId;
+            }
+
+            public void setUpdateUserId(String updateUserId) {
+                this.updateUserId = updateUserId;
+            }
+
+            public String getUpdateUserName() {
+                return updateUserName;
+            }
+
+            public void setUpdateUserName(String updateUserName) {
+                this.updateUserName = updateUserName;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public boolean isDelete() {
+                return delete;
+            }
+
+            public void setDelete(boolean delete) {
+                this.delete = delete;
+            }
+
+            public List<?> getAttachments() {
+                return attachments;
+            }
+
+            public void setAttachments(List<?> attachments) {
+                this.attachments = attachments;
+            }
+        }
+
+        public static class SupplyListBean {
+            /**
+             * id : 9
+             * createDateTime : 1585721647000
+             * updateDateTime : null
+             * continuousCasterCode : lzj111
+             * productsCode : 7301050001B
+             * productsName : 型号A
+             * figureNumber : 图号
+             * deliveryDateTime : 1584933071000
+             * deliveryNumber : 20
+             * createUserId : 398c852b38e911ea8334fa163e1166bd
+             * createUserName : null
+             * updateUserId : null
+             * updateUserName : null
+             * remark : null
+             * delete : false
+             */
+
+            private String id;
+            private long createDateTime;
+            private Object updateDateTime;
+            private String continuousCasterCode;
+            private String productsCode;
+            private String productsName;
+            private String figureNumber;
+            private long deliveryDateTime;
+            private String deliveryNumber;
+            private String createUserId;
+            private Object createUserName;
+            private Object updateUserId;
+            private Object updateUserName;
+            private Object remark;
+            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 Object getUpdateDateTime() {
+                return updateDateTime;
+            }
+
+            public void setUpdateDateTime(Object updateDateTime) {
+                this.updateDateTime = updateDateTime;
+            }
+
+            public String getContinuousCasterCode() {
+                return continuousCasterCode;
+            }
+
+            public void setContinuousCasterCode(String continuousCasterCode) {
+                this.continuousCasterCode = continuousCasterCode;
+            }
+
+            public String getProductsCode() {
+                return productsCode;
+            }
+
+            public void setProductsCode(String productsCode) {
+                this.productsCode = productsCode;
+            }
+
+            public String getProductsName() {
+                return productsName;
+            }
+
+            public void setProductsName(String productsName) {
+                this.productsName = productsName;
+            }
+
+            public String getFigureNumber() {
+                return figureNumber;
+            }
+
+            public void setFigureNumber(String figureNumber) {
+                this.figureNumber = figureNumber;
+            }
+
+            public long getDeliveryDateTime() {
+                return deliveryDateTime;
+            }
+
+            public void setDeliveryDateTime(long deliveryDateTime) {
+                this.deliveryDateTime = deliveryDateTime;
+            }
+
+            public String getDeliveryNumber() {
+                return deliveryNumber;
+            }
+
+            public void setDeliveryNumber(String deliveryNumber) {
+                this.deliveryNumber = deliveryNumber;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object createUserName) {
+                this.createUserName = createUserName;
+            }
+
+            public Object getUpdateUserId() {
+                return updateUserId;
+            }
+
+            public void setUpdateUserId(Object updateUserId) {
+                this.updateUserId = updateUserId;
+            }
+
+            public Object getUpdateUserName() {
+                return updateUserName;
+            }
+
+            public void setUpdateUserName(Object updateUserName) {
+                this.updateUserName = updateUserName;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public boolean isDelete() {
+                return delete;
+            }
+
+            public void setDelete(boolean delete) {
+                this.delete = delete;
+            }
+        }
+
+        public static class StockListBean {
+            /**
+             * id : 9
+             * createDateTime : 1585721647000
+             * updateDateTime : null
+             * continuousCasterCode : lzj111
+             * productsCode : 7301050001B
+             * productsName : 型号A
+             * figureNumber : 图号
+             * stockNumber : 100
+             * otherInformationExplain : 说明
+             * createUserId : 398c852b38e911ea8334fa163e1166bd
+             * createUserName : null
+             * updateUserId : null
+             * updateUserName : null
+             * remark : null
+             * delete : false
+             */
+
+            private String id;
+            private long createDateTime;
+            private Object updateDateTime;
+            private String continuousCasterCode;
+            private String productsCode;
+            private String productsName;
+            private String figureNumber;
+            private String stockNumber;
+            private String otherInformationExplain;
+            private String createUserId;
+            private Object createUserName;
+            private Object updateUserId;
+            private Object updateUserName;
+            private Object remark;
+            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 Object getUpdateDateTime() {
+                return updateDateTime;
+            }
+
+            public void setUpdateDateTime(Object updateDateTime) {
+                this.updateDateTime = updateDateTime;
+            }
+
+            public String getContinuousCasterCode() {
+                return continuousCasterCode;
+            }
+
+            public void setContinuousCasterCode(String continuousCasterCode) {
+                this.continuousCasterCode = continuousCasterCode;
+            }
+
+            public String getProductsCode() {
+                return productsCode;
+            }
+
+            public void setProductsCode(String productsCode) {
+                this.productsCode = productsCode;
+            }
+
+            public String getProductsName() {
+                return productsName;
+            }
+
+            public void setProductsName(String productsName) {
+                this.productsName = productsName;
+            }
+
+            public String getFigureNumber() {
+                return figureNumber;
+            }
+
+            public void setFigureNumber(String figureNumber) {
+                this.figureNumber = figureNumber;
+            }
+
+            public String getStockNumber() {
+                return stockNumber;
+            }
+
+            public void setStockNumber(String stockNumber) {
+                this.stockNumber = stockNumber;
+            }
+
+            public String getOtherInformationExplain() {
+                return otherInformationExplain;
+            }
+
+            public void setOtherInformationExplain(String otherInformationExplain) {
+                this.otherInformationExplain = otherInformationExplain;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object createUserName) {
+                this.createUserName = createUserName;
+            }
+
+            public Object getUpdateUserId() {
+                return updateUserId;
+            }
+
+            public void setUpdateUserId(Object updateUserId) {
+                this.updateUserId = updateUserId;
+            }
+
+            public Object getUpdateUserName() {
+                return updateUserName;
+            }
+
+            public void setUpdateUserName(Object updateUserName) {
+                this.updateUserName = updateUserName;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public boolean isDelete() {
+                return delete;
+            }
+
+            public void setDelete(boolean delete) {
+                this.delete = delete;
+            }
+        }
+
+        public static class OtherSupListBean {
+            /**
+             * id : 9
+             * createDateTime : 1585721648000
+             * updateDateTime : 1587371966000
+             * continuousCasterCode : lzj111
+             * supplierCode : gys1
+             * supplierName : 供应商1
+             * useLife : 10
+             * supplyNumber : 20
+             * stockNumber : 30
+             * otherSituationDescription : 说明
+             * attachmentId : null
+             * attachments : []
+             * createUserId : 398c852b38e911ea8334fa163e1166bd
+             * createUserName : null
+             * updateUserId : 398c852b38e911ea8334fa163e1166bd
+             * updateUserName : hello
+             * remark : null
+             * delete : false
+             */
+
+            private String id;
+            private long createDateTime;
+            private long updateDateTime;
+            private String continuousCasterCode;
+            private String supplierCode;
+            private String supplierName;
+            private String useLife;
+            private String supplyNumber;
+            private String stockNumber;
+            private String otherSituationDescription;
+            private Object attachmentId;
+            private String createUserId;
+            private Object createUserName;
+            private String updateUserId;
+            private String updateUserName;
+            private Object remark;
+            private boolean delete;
+            private List<?> attachments;
+
+            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 getContinuousCasterCode() {
+                return continuousCasterCode;
+            }
+
+            public void setContinuousCasterCode(String continuousCasterCode) {
+                this.continuousCasterCode = continuousCasterCode;
+            }
+
+            public String getSupplierCode() {
+                return supplierCode;
+            }
+
+            public void setSupplierCode(String supplierCode) {
+                this.supplierCode = supplierCode;
+            }
+
+            public String getSupplierName() {
+                return supplierName;
+            }
+
+            public void setSupplierName(String supplierName) {
+                this.supplierName = supplierName;
+            }
+
+            public String getUseLife() {
+                return useLife;
+            }
+
+            public void setUseLife(String useLife) {
+                this.useLife = useLife;
+            }
+
+            public String getSupplyNumber() {
+                return supplyNumber;
+            }
+
+            public void setSupplyNumber(String supplyNumber) {
+                this.supplyNumber = supplyNumber;
+            }
+
+            public String getStockNumber() {
+                return stockNumber;
+            }
+
+            public void setStockNumber(String stockNumber) {
+                this.stockNumber = stockNumber;
+            }
+
+            public String getOtherSituationDescription() {
+                return otherSituationDescription;
+            }
+
+            public void setOtherSituationDescription(String otherSituationDescription) {
+                this.otherSituationDescription = otherSituationDescription;
+            }
+
+            public Object getAttachmentId() {
+                return attachmentId;
+            }
+
+            public void setAttachmentId(Object attachmentId) {
+                this.attachmentId = attachmentId;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object createUserName) {
+                this.createUserName = createUserName;
+            }
+
+            public String getUpdateUserId() {
+                return updateUserId;
+            }
+
+            public void setUpdateUserId(String updateUserId) {
+                this.updateUserId = updateUserId;
+            }
+
+            public String getUpdateUserName() {
+                return updateUserName;
+            }
+
+            public void setUpdateUserName(String updateUserName) {
+                this.updateUserName = updateUserName;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public boolean isDelete() {
+                return delete;
+            }
+
+            public void setDelete(boolean delete) {
+                this.delete = delete;
+            }
+
+            public List<?> getAttachments() {
+                return attachments;
+            }
+
+            public void setAttachments(List<?> attachments) {
+                this.attachments = attachments;
+            }
+        }
+
+        public static class OtherLadleListBean {
+            /**
+             * id : 9
+             * createDateTime : 1585721648000
+             * updateDateTime : 1587371943000
+             * continuousCasterCode : lzj111
+             * refractoryName : 滑块
+             * figureNumber : 图号2
+             * materialsUsed : 用料2
+             * useRequirement : null
+             * useLife : 10
+             * useProblemFeedback : 说明
+             * attachmentId : null
+             * attachments : []
+             * createUserId : 398c852b38e911ea8334fa163e1166bd
+             * createUserName : null
+             * updateUserId : 398c852b38e911ea8334fa163e1166bd
+             * updateUserName : hello
+             * remark : null
+             * delete : false
+             */
+
+            private String id;
+            private long createDateTime;
+            private long updateDateTime;
+            private String continuousCasterCode;
+            private String refractoryName;
+            private String figureNumber;
+            private String materialsUsed;
+            private Object useRequirement;
+            private String useLife;
+            private String useProblemFeedback;
+            private Object attachmentId;
+            private String createUserId;
+            private Object createUserName;
+            private String updateUserId;
+            private String updateUserName;
+            private Object remark;
+            private boolean delete;
+            private List<?> attachments;
+
+            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 getContinuousCasterCode() {
+                return continuousCasterCode;
+            }
+
+            public void setContinuousCasterCode(String continuousCasterCode) {
+                this.continuousCasterCode = continuousCasterCode;
+            }
+
+            public String getRefractoryName() {
+                return refractoryName;
+            }
+
+            public void setRefractoryName(String refractoryName) {
+                this.refractoryName = refractoryName;
+            }
+
+            public String getFigureNumber() {
+                return figureNumber;
+            }
+
+            public void setFigureNumber(String figureNumber) {
+                this.figureNumber = figureNumber;
+            }
+
+            public String getMaterialsUsed() {
+                return materialsUsed;
+            }
+
+            public void setMaterialsUsed(String materialsUsed) {
+                this.materialsUsed = materialsUsed;
+            }
+
+            public Object getUseRequirement() {
+                return useRequirement;
+            }
+
+            public void setUseRequirement(Object useRequirement) {
+                this.useRequirement = useRequirement;
+            }
+
+            public String getUseLife() {
+                return useLife;
+            }
+
+            public void setUseLife(String useLife) {
+                this.useLife = useLife;
+            }
+
+            public String getUseProblemFeedback() {
+                return useProblemFeedback;
+            }
+
+            public void setUseProblemFeedback(String useProblemFeedback) {
+                this.useProblemFeedback = useProblemFeedback;
+            }
+
+            public Object getAttachmentId() {
+                return attachmentId;
+            }
+
+            public void setAttachmentId(Object attachmentId) {
+                this.attachmentId = attachmentId;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object createUserName) {
+                this.createUserName = createUserName;
+            }
+
+            public String getUpdateUserId() {
+                return updateUserId;
+            }
+
+            public void setUpdateUserId(String updateUserId) {
+                this.updateUserId = updateUserId;
+            }
+
+            public String getUpdateUserName() {
+                return updateUserName;
+            }
+
+            public void setUpdateUserName(String updateUserName) {
+                this.updateUserName = updateUserName;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public boolean isDelete() {
+                return delete;
+            }
+
+            public void setDelete(boolean delete) {
+                this.delete = delete;
+            }
+
+            public List<?> getAttachments() {
+                return attachments;
+            }
+
+            public void setAttachments(List<?> attachments) {
+                this.attachments = attachments;
+            }
+        }
+
+        public static class SettleListBean {
+            /**
+             * id : 9
+             * isDelete : null
+             * createDateTime : 1585721648000
+             * updateDateTime : 1587367515000
+             * continuousCasterCode : lzj111
+             * ladleContractSituation : 中包情况11122
+             * continuousCastingContractSituation : 承包情况222
+             * settlementMethod : 结算方式333
+             * createUserId : 398c852b38e911ea8334fa163e1166bd
+             * createUserName : null
+             * updateUserId : 398c852b38e911ea8334fa163e1166bd
+             * updateUserName : hello
+             * remark : null
+             * delete : null
+             */
+
+            private String id;
+            private Object isDelete;
+            private long createDateTime;
+            private long updateDateTime;
+            private String continuousCasterCode;
+            private String ladleContractSituation;
+            private String continuousCastingContractSituation;
+            private String settlementMethod;
+            private String createUserId;
+            private Object createUserName;
+            private String updateUserId;
+            private String updateUserName;
+            private Object remark;
+            private Object delete;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public Object getIsDelete() {
+                return isDelete;
+            }
+
+            public void setIsDelete(Object isDelete) {
+                this.isDelete = isDelete;
+            }
+
+            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 getContinuousCasterCode() {
+                return continuousCasterCode;
+            }
+
+            public void setContinuousCasterCode(String continuousCasterCode) {
+                this.continuousCasterCode = continuousCasterCode;
+            }
+
+            public String getLadleContractSituation() {
+                return ladleContractSituation;
+            }
+
+            public void setLadleContractSituation(String ladleContractSituation) {
+                this.ladleContractSituation = ladleContractSituation;
+            }
+
+            public String getContinuousCastingContractSituation() {
+                return continuousCastingContractSituation;
+            }
+
+            public void setContinuousCastingContractSituation(String continuousCastingContractSituation) {
+                this.continuousCastingContractSituation = continuousCastingContractSituation;
+            }
+
+            public String getSettlementMethod() {
+                return settlementMethod;
+            }
+
+            public void setSettlementMethod(String settlementMethod) {
+                this.settlementMethod = settlementMethod;
+            }
+
+            public String getCreateUserId() {
+                return createUserId;
+            }
+
+            public void setCreateUserId(String createUserId) {
+                this.createUserId = createUserId;
+            }
+
+            public Object getCreateUserName() {
+                return createUserName;
+            }
+
+            public void setCreateUserName(Object createUserName) {
+                this.createUserName = createUserName;
+            }
+
+            public String getUpdateUserId() {
+                return updateUserId;
+            }
+
+            public void setUpdateUserId(String updateUserId) {
+                this.updateUserId = updateUserId;
+            }
+
+            public String getUpdateUserName() {
+                return updateUserName;
+            }
+
+            public void setUpdateUserName(String updateUserName) {
+                this.updateUserName = updateUserName;
+            }
+
+            public Object getRemark() {
+                return remark;
+            }
+
+            public void setRemark(Object remark) {
+                this.remark = remark;
+            }
+
+            public Object getDelete() {
+                return delete;
+            }
+
+            public void setDelete(Object delete) {
+                this.delete = delete;
+            }
+        }
+}

app/src/main/java/com/wd/workoffice/bean/mesBean/UserDataBean.java

@@ -111,9 +111,18 @@ public class UserDataBean extends BaseMesPageBean {
             private String annualOutput;
             private String steelGrade;
             private String continuousCasterName;
+            private String continuousCasterCode;
             private String continuousCasterType;
             private Object delete;
 
+            public String getContinuousCasterCode() {
+                return continuousCasterCode;
+            }
+
+            public void setContinuousCasterCode(String continuousCasterCode) {
+                this.continuousCasterCode = continuousCasterCode;
+            }
+
             public String getId() {
                 return id;
             }

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

@@ -172,4 +172,28 @@ public interface MesApiService {
      */
     @POST("/himes/api/msSteelmakingWorks/show/getBySteel.json")
     Observable<BaseMesBean> factoryDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+    /**
+     * 连铸机列表查询
+     *
+     * @return
+     */
+    @POST("/himes/api/msContinuousCasterInfo/show/list.json")
+    Observable<BaseMesBean> machineList(@Query("functionId") String functionId, @Body RequestBody requestBody);
+    /**
+     * 连铸机详情
+     *
+     * @return
+     */
+    @POST("/himes/api/msContinuousCasterInfo/show/getByCaster.json")
+    Observable<BaseMesBean> machineDetail(@Query("functionId") String functionId, @Body RequestBody requestBody);
+
+    /**
+     * 连铸机详情
+     *
+     * @return
+     */
+    @POST("/himes/api/msContinuousProducts/save.json")
+    Observable<BaseMesBean> threeAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryActivity.java

@@ -115,6 +115,8 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 data.setSteelmakingWorksName(clientList.get(position).getSteelmakingWorksName());
                 data.setSteelmakingWorksCode(clientList.get(position).getSteelmakingWorksCode());
+                data.setAnnualOutput(clientList.get(position).getAnnualOutput());
+                data.setSteelGrade(clientList.get(position).getSteelGrade());
                 startActivity(MesUserDataAdd3Activity.class,
                         "data", JSON.toJSONString(data)
                 );

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineActivity.java

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.content.Intent;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -12,11 +11,16 @@ import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.ClientBean;
 import com.wd.workoffice.bean.event.AddFactoryEvent;
+import com.wd.workoffice.bean.mesBean.FactoryBean;
+import com.wd.workoffice.bean.mesBean.MachineBean;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.UserDataChooseMachineAdapter;
 import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -50,10 +54,9 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
     @BindView(R.id.rv_client)
     RecyclerView rvClient;
     private Map<String, Object> param;
-    private List<ClientBean.RecordsBean> clientList;
-    private UserDataClientAdapter clientAdapter;
-    private int page = 1;
-
+    private List<MachineBean> clientList;
+    private UserDataChooseMachineAdapter clientAdapter;
+    private UserDataBean.ListBean data;
     @Override
     protected void initView() {
         ButterKnife.bind(this);
@@ -62,25 +65,18 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
+        data = JSON.parseObject(getIntent().getStringExtra("data"), UserDataBean.ListBean.class);
         clientList = new ArrayList<>();
-        clientList.add(null);
-        clientList.add(null);
-        clientList.add(null);
-        clientAdapter = new UserDataClientAdapter(R.layout.item_store_client, clientList);
+        clientAdapter = new UserDataChooseMachineAdapter(R.layout.item_store_client, clientList);
         clientAdapter.bindToRecyclerView(rvClient);
         clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
-        param = WorkUtils.pageKey();
-//        getData();
+        param = WorkUtils.simpleParam();
+        param.put("steelmakingWorksCode",data.getSteelmakingWorksCode());
+        getData();
     }
 
     private void getData() {
-        Observable<BaseBean> observable;
-        if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-            observable = RtfUtils.getRtf().getClient(param);
-        } else {
-            observable = RtfUtils.getRtf().getClientOut(param);
-        }
-        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getMesRtf().machineList("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -92,41 +88,16 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
             }
 
             @Override
-            public void onSuccess(BaseBean data) {
+            public void onSuccess(BaseMesBean data) {
                 hideLoading();
-                if (data.getCode() != 0) {
-                    toast(data.getMessage());
+                if (!data.isSuccess()) {
+                    toast(data.getMsg());
                     return;
                 }
-                List<ClientBean.RecordsBean> dataList = new ArrayList<>();
-                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-                    ClientBean clientBean = JSON.parseObject(data.getData().toString(), ClientBean.class);
-                    dataList.addAll(clientBean.getRecords());
-                    if (page == 1) {
-                        clientList.clear();
-                        clientList.addAll(dataList);
-                        clientAdapter.notifyDataSetChanged();
-                        clientAdapter.loadMoreComplete();
-                    } else {
-                        clientAdapter.loadMoreComplete();
-                        clientList.addAll(dataList);
-                        clientAdapter.notifyDataSetChanged();
-                    }
-                    if (dataList.size() == 0) {
-                        clientAdapter.loadMoreEnd();
-                    } else {
-                        page++;
-                    }
-                } else {
-                    dataList.addAll(JSON.parseArray(data.getData().toString(), ClientBean.RecordsBean.class));
-                    clientAdapter.loadMoreEnd();
-                    clientList.clear();
-                    clientList.addAll(dataList);
-                    clientAdapter.notifyDataSetChanged();
-                }
-                if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
-
-                }
+                List<MachineBean> getList = JSON.parseArray(data.getData().toString(), MachineBean.class);
+                clientList.clear();
+                clientList.addAll(getList);
+                clientAdapter.notifyDataSetChanged();
                 toast("搜索成功");
             }
         });
@@ -134,17 +105,13 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
 
     @Override
     protected void initEvent() {
-        clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
-            @Override
-            public void onLoadMoreRequested() {
-                param.put("current", page);
-//                getData();
-            }
-        }, rvClient);
         clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(MesChooseMachineDetailActivity.class);
+                data.setContinuousCasterName(clientList.get(position).getContinuousCasterName());
+                data.setContinuousCasterType(clientList.get(position).getContinuousCasterType());
+                data.setContinuousCasterCode(clientList.get(position).getContinuousCasterCode());
+                startActivity(MesChooseMachineDetailActivity.class,"data",JSON.toJSONString(data));
             }
         });
     }
@@ -157,10 +124,8 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
 
     @OnClick(R.id.btn_search)
     public void onViewClicked() {
-        param.put("name", etKey.getText().toString());
-        param.put("current", 1);
-        page = 1;
-//        getData();
+        param.put("continuousCasterName", etKey.getText().toString());
+        getData();
     }
 
     @Override

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java

 package com.wd.workoffice.ui.activity.mes.user;
 
+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.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
-import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.AccountBean;
+import com.wd.workoffice.bean.mesBean.MchineDetailBean;
+import com.wd.workoffice.bean.mesBean.UserDataBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
+import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -23,6 +28,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import flexible.xd.android_base.utils.TimeUtils;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -32,10 +38,58 @@ import io.reactivex.disposables.Disposable;
  * github: https://github.com/FlexibleXd
  **/
 public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
-    @BindView(R.id.tv_client)
-    TextView tvClient;
-    @BindView(R.id.rl_client)
-    RelativeLayout rlClient;
+    @BindView(R.id.tv_machine_type)
+    TextView tvMachineType;
+    @BindView(R.id.tv_section)
+    TextView tvSection;
+    @BindView(R.id.tv_steel_type)
+    TextView tvSteelType;
+    @BindView(R.id.tv_speed)
+    TextView tvSpeed;
+    @BindView(R.id.rl_middle)
+    RelativeLayout rlMiddle;
+    @BindView(R.id.tv_middle1)
+    TextView tvMiddle1;
+    @BindView(R.id.tv_middle2)
+    TextView tvMiddle2;
+    @BindView(R.id.tv_middle3)
+    TextView tvMiddle3;
+    @BindView(R.id.tv_middle4)
+    TextView tvMiddle4;
+    @BindView(R.id.tv_middle5)
+    TextView tvMiddle5;
+    @BindView(R.id.tv_middle6)
+    TextView tvMiddle6;
+    @BindView(R.id.tv_middle7)
+    TextView tvMiddle7;
+    @BindView(R.id.tv_middle8)
+    TextView tvMiddle8;
+    @BindView(R.id.ll_middle)
+    LinearLayout llMiddle;
+    @BindView(R.id.rl_cover)
+    RelativeLayout rlCover;
+    @BindView(R.id.tv_cover1)
+    TextView tvCover1;
+    @BindView(R.id.tv_cover2)
+    TextView tvCover2;
+    @BindView(R.id.tv_cover3)
+    TextView tvCover3;
+    @BindView(R.id.tv_cover4)
+    TextView tvCover4;
+    @BindView(R.id.ll_cover)
+    LinearLayout llCover;
+    @BindView(R.id.rl_protection)
+    RelativeLayout rlProtection;
+    @BindView(R.id.tv_protection1)
+    TextView tvProtection1;
+    @BindView(R.id.tv_protection2)
+    TextView tvProtection2;
+    @BindView(R.id.tv_protection3)
+    TextView tvProtection3;
+    @BindView(R.id.tv_protection4)
+    TextView tvProtection4;
+    @BindView(R.id.ll_protection)
+    LinearLayout llProtection;
     @BindView(R.id.rv_data1)
     RecyclerView rvData1;
     @BindView(R.id.tv_add1)
@@ -44,19 +98,24 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
     RecyclerView rvData2;
     @BindView(R.id.rv_data3)
     RecyclerView rvData3;
-    @BindView(R.id.tv_add3)
-    TextView tvAdd3;
     @BindView(R.id.rv_data4)
     RecyclerView rvData4;
     @BindView(R.id.tv_add4)
     TextView tvAdd4;
     @BindView(R.id.rl_add)
     RelativeLayout rlAdd;
-    private AccountBean dataBean;
+    @BindView(R.id.tv_add3)
+    TextView tvAdd3;
     private UserDataMachineAdapter data1Adapter;
     private UserDataMachineAdapter data2Adapter;
     private UserDataMachineAdapter data3Adapter;
     private UserDataMachineAdapter data4Adapter;
+    private UserDataBean.ListBean data;
+    private List<String> data1List;
+    private List<String> data2List;
+    private List<String> data3List;
+    private List<String> data4List;
+    private MchineDetailBean machineDetailBean;
 
     @Override
     protected void initView() {
@@ -69,22 +128,11 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
-        List<Object> data1List = new ArrayList<>();
-        data1List.add(null);
-        data1List.add(null);
-        data1List.add(null);
-        List<Object> data2List = new ArrayList<>();
-        data2List.add(null);
-        data2List.add(null);
-        data2List.add(null);
-        List<Object> data3List = new ArrayList<>();
-        data3List.add(null);
-        data3List.add(null);
-        data3List.add(null);
-        List<Object> data4List = new ArrayList<>();
-        data4List.add(null);
-        data4List.add(null);
-        data4List.add(null);
+        data = JSON.parseObject(getIntent().getStringExtra("data"), UserDataBean.ListBean.class);
+        data1List = new ArrayList<>();
+        data2List = new ArrayList<>();
+        data3List = new ArrayList<>();
+        data4List = new ArrayList<>();
         data1Adapter = new UserDataMachineAdapter(R.layout.item_machine, data1List);
         data2Adapter = new UserDataMachineAdapter(R.layout.item_machine, data2List);
         data3Adapter = new UserDataMachineAdapter(R.layout.item_machine, data3List);
@@ -97,9 +145,9 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
     }
 
     private void getData() {
-        RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
-
-
+        Map<String, Object> param = WorkUtils.simpleParam();
+        param.put("continuousCasterCode", data.getContinuousCasterCode());
+        RtfUtils.getMesRtf().machineDetail("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }
@@ -111,21 +159,83 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
             }
 
             @Override
-            public void onSuccess(BaseBean data) {
+            public void onSuccess(BaseMesBean data) {
                 hideLoading();
-                if (data.getCode() != 0) {
-                    toast(data.getMessage());
+                if (!data.isSuccess()) {
+                    toast(data.getMsg());
                     return;
                 }
-                dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
-//                tvName.setText(dataBean.getName());
-//                tvDpeName.setText(dataBean.getName());
-//                tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
-//                tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
+                machineDetailBean = JSON.parseObject(data.getData().toString(), MchineDetailBean.class);
+                MchineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
+                if (castInfo != null) {
+                    tvMachineType.setText(castInfo.getContinuousCasterName());
+                    tvSection.setText(castInfo.getFractureSurface());
+                    tvSteelType.setText(castInfo.getSteelGrade());
+                    tvSpeed.setText(castInfo.getCastingSpeed());
+                }
+                MchineDetailBean.CastLadleBean castLadle = machineDetailBean.getCastLadle();
+                if (castLadle != null) {
+                    tvMiddle1.setText(castLadle.getCapacity());
+                    tvMiddle2.setText(castLadle.getLifeSpan());
+                    tvMiddle3.setText(castLadle.getLadleCode());
+                    tvMiddle4.setText(castLadle.getLiquidLevel());
+                    tvMiddle5.setText(castLadle.getLiquidSteelTemperature());
+                    tvMiddle6.setText(castLadle.getBakingMethod());
+                    tvMiddle7.setText(castLadle.getBakingTemperature());
+                    tvMiddle8.setText(TimeUtils.millis2String(castLadle.getBakingDateTime()));
+                }
+                MchineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
+                if (covAgent != null) {
+                    tvCover1.setText(covAgent.getLadleCoveringAgentName());
+                    tvCover2.setText(covAgent.getAcidAlkaliDegree());
+                    tvCover3.setText(covAgent.getChemicalComposition());
+                    tvCover4.setText(covAgent.getSupplierName());
+                }
+                MchineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
+                if (mouldFlu != null) {
+                    tvProtection1.setText(mouldFlu.getMouldFluxesName());
+                    tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
+                    tvProtection3.setText(mouldFlu.getChemicalComposition());
+                    tvProtection4.setText(mouldFlu.getSupplierName());
+                }
+                changeList();
+
+
             }
         });
     }
 
+    private void changeList() {
+        data1List.clear();
+        data2List.clear();
+        data3List.clear();
+        data4List.clear();
+        if (machineDetailBean.getProductList() != null) {
+            for (MchineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
+                data1List.add(productListBean.getProductsName());
+            }
+            data1Adapter.notifyDataSetChanged();
+        }
+        if (machineDetailBean.getSupplyList() != null) {
+            for (MchineDetailBean.SupplyListBean productListBean : machineDetailBean.getSupplyList()) {
+                data2List.add(productListBean.getProductsName());
+            }
+            data2Adapter.notifyDataSetChanged();
+        }
+        if (machineDetailBean.getOtherSupList() != null) {
+            for (MchineDetailBean.OtherSupListBean productListBean : machineDetailBean.getOtherSupList()) {
+                data3List.add(productListBean.getSupplierName());
+            }
+            data3Adapter.notifyDataSetChanged();
+        }
+        if (machineDetailBean.getOtherLadleList() != null) {
+            for (MchineDetailBean.OtherLadleListBean productListBean : machineDetailBean.getOtherLadleList()) {
+                data4List.add(productListBean.getRefractoryName());
+            }
+            data4Adapter.notifyDataSetChanged();
+        }
+    }
+
     @Override
     protected void initEvent() {
         data1Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@@ -160,11 +270,11 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
     }
 
 
-    @OnClick({R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
+    @OnClick({R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_add1:
-                startActivity(MesThreeAddActivity.class);
+                startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
                 break;
             case R.id.tv_add3:
                 startActivity(MesOtherSupplierAddActivity.class);
@@ -175,7 +285,29 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
             case R.id.rl_add:
                 startActivity(MesMiddleAddActivity.class);
                 break;
+            case R.id.rl_middle:
+                if (llMiddle.getVisibility() == View.VISIBLE) {
+                    llMiddle.setVisibility(View.GONE);
+                } else {
+                    llMiddle.setVisibility(View.VISIBLE);
+                }
+                break;
+            case R.id.rl_cover:
+                if (llCover.getVisibility() == View.VISIBLE) {
+                    llCover.setVisibility(View.GONE);
+                } else {
+                    llCover.setVisibility(View.VISIBLE);
+                }
+                break;
+            case R.id.rl_protection:
+                if (llProtection.getVisibility() == View.VISIBLE) {
+                    llProtection.setVisibility(View.GONE);
+                } else {
+                    llProtection.setVisibility(View.VISIBLE);
+                }
+                break;
         }
     }
 
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesThreeAddActivity.java

 package com.wd.workoffice.ui.activity.mes.user;
 
-import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.wd.workoffice.R;
-import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.ClientBean;
 import com.wd.workoffice.bean.event.AddFactoryEvent;
+import com.wd.workoffice.bean.event.RefreshMachineEvent;
+import com.wd.workoffice.bean.mesBean.MchineDetailBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
-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.Observable;
+import flexible.xd.android_base.utils.TimeUtils;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -50,6 +41,7 @@ public class MesThreeAddActivity extends WorkToolBarActivity {
     RelativeLayout rlFactory;
     @BindView(R.id.et_content)
     EditText etContent;
+    private Map<String, Object> param;
 
     @Override
     protected void initView() {
@@ -58,8 +50,35 @@ public class MesThreeAddActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
+        param = WorkUtils.simpleParam();
+        param.put("continuousCasterCode", getIntent().getStringExtra("continuousCasterCode"));
     }
 
+    private void submit() {
+        RtfUtils.getMesRtf().threeAdd("1", "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.getMsg());
+                    return;
+                }
+                finish();
+                toast("添加成功");
+                EventBus.getDefault().post(new RefreshMachineEvent());
+            }
+        });
+    }
 
     @Override
     protected void initEvent() {
@@ -87,20 +106,4 @@ public class MesThreeAddActivity extends WorkToolBarActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    @Override
-    public void onStart() {
-        super.onStart();
-        EventBus.getDefault().register(this);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        EventBus.getDefault().unregister(this);
-    }
-
-    @Subscribe
-    public void refresh(AddFactoryEvent event) {
-    }
-
 }

app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd3Activity.java

@@ -173,7 +173,7 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
 
     @OnClick(R.id.rl_machine)
     public void onViewClicked() {
-        startActivityForResult(MesChooseMachineActivity.class, 10001);
+        startActivity(MesChooseMachineActivity.class,"data",JSON.toJSONString(data));
     }
 
 }

app/src/main/java/com/wd/workoffice/ui/adapter/UserDataChooseMachineAdapter.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.mesBean.MachineBean;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class UserDataChooseMachineAdapter extends BaseQuickAdapter<MachineBean, BaseViewHolder> {
+
+    public UserDataChooseMachineAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, MachineBean item) {
+        helper.setText(R.id.tv_name,item.getContinuousCasterName());
+    }
+}
+

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

@@ -13,7 +13,7 @@ import java.util.List;
  * Created by flexible on 2018/8/13.
  */
 
-public class UserDataMachineAdapter extends BaseQuickAdapter<Object, BaseViewHolder> {
+public class UserDataMachineAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
 
     public UserDataMachineAdapter(int layoutResId, List data) {
         super(layoutResId, data);
@@ -21,7 +21,8 @@ public class UserDataMachineAdapter extends BaseQuickAdapter<Object, BaseViewHol
 
 
     @Override
-    protected void convert(BaseViewHolder helper, Object item) {
+    protected void convert(BaseViewHolder helper, String item) {
+        helper.setText(R.id.tv_name, item);
     }
 }
 

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

@@ -9,7 +9,6 @@
         android:orientation="vertical">
 
         <RelativeLayout
-            android:id="@+id/rl_client"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10mm"
@@ -26,13 +25,12 @@
 
 
             <TextView
-                android:id="@+id/tv_client"
+                android:id="@+id/tv_machine_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
-                android:text="请输入"
                 android:textSize="14sp" />
 
         </RelativeLayout>
@@ -55,12 +53,12 @@
 
 
             <TextView
+                android:id="@+id/tv_section"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
-                android:text="请输入"
                 android:textSize="14sp" />
         </RelativeLayout>
 
@@ -81,12 +79,12 @@
                 android:textSize="14sp" />
 
             <TextView
+                android:id="@+id/tv_steel_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="3mm"
                 android:background="@null"
-                android:text="请输入"
                 android:textSize="14sp" />
         </RelativeLayout>
 
@@ -99,6 +97,33 @@
             android:paddingHorizontal="20mm"
             android:paddingVertical="9mm">
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:text="拉速"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_speed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="3mm"
+                android:background="@null"
+                android:textSize="14sp" />
+        </RelativeLayout>
+
+        <View style="@style/dividerX" />
+
+        <RelativeLayout
+            android:id="@+id/rl_middle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/white"
+            android:paddingHorizontal="20mm"
+            android:paddingVertical="9mm">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -117,6 +142,7 @@
         <View style="@style/dividerX" />
 
         <LinearLayout
+            android:id="@+id/ll_middle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -140,12 +166,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_middle1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -166,12 +192,38 @@
 
 
                 <TextView
+                    android:id="@+id/tv_middle2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="3mm"
+                    android:background="@null"
+                    android:textSize="14sp" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/white"
+                android:paddingVertical="9mm"
+                android:paddingLeft="25mm">
+
+                <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="14sp" />
+
+
+                <TextView
+                    android:id="@+id/tv_middle3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -192,12 +244,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_middle4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -218,12 +270,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_middle5"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -244,12 +296,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_middle6"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -270,12 +322,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_middle7"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -296,12 +348,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_middle8"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
         </LinearLayout>
@@ -309,6 +361,7 @@
         <View style="@style/dividerX" />
 
         <RelativeLayout
+            android:id="@+id/rl_cover"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -333,6 +386,7 @@
         <View style="@style/dividerX" />
 
         <LinearLayout
+            android:id="@+id/ll_cover"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -347,6 +401,7 @@
                 android:paddingLeft="25mm">
 
                 <TextView
+
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
@@ -356,12 +411,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_cover1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -382,12 +437,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_cover2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -408,12 +463,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_cover3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -434,12 +489,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_cover4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
         </LinearLayout>
@@ -447,6 +502,7 @@
         <View style="@style/dividerX" />
 
         <RelativeLayout
+            android:id="@+id/rl_protection"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -471,6 +527,7 @@
         <View style="@style/dividerX" />
 
         <LinearLayout
+            android:id="@+id/ll_protection"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/white"
@@ -494,12 +551,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_protection1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -520,12 +577,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_protection2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -546,12 +603,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_protection3"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
 
@@ -572,12 +629,12 @@
 
 
                 <TextView
+                    android:id="@+id/tv_protection4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="3mm"
                     android:background="@null"
-                    android:text="请输入"
                     android:textSize="14sp" />
             </RelativeLayout>
         </LinearLayout>
@@ -600,6 +657,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
+                android:gravity="right"
                 android:orientation="vertical">
 
                 <androidx.recyclerview.widget.RecyclerView
@@ -609,8 +667,9 @@
 
                 <TextView
                     android:id="@+id/tv_add1"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="right"
                     android:text="添加 +"
                     android:textSize="16sp" />
             </LinearLayout>
@@ -658,18 +717,21 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
+                android:gravity="right"
                 android:orientation="vertical">
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_data3"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
-t
+                t
+
                 <TextView
-                    android:id="@+id/tv_data3"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/tv_add3"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="添加 +"
+                    android:gravity="right"
                     android:textSize="16sp" />
             </LinearLayout>
         </RelativeLayout>
@@ -692,6 +754,7 @@ t
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
+                android:gravity="right"
                 android:orientation="vertical">
 
                 <androidx.recyclerview.widget.RecyclerView
@@ -701,7 +764,8 @@ t
 
                 <TextView
                     android:id="@+id/tv_add4"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
+                    android:gravity="right"
                     android:layout_height="wrap_content"
                     android:text="添加 +"
                     android:textSize="16sp" />

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

@@ -9,7 +9,7 @@
         android:orientation="vertical">
 
         <RelativeLayout
-            android:id="@+id/rl_factory"
+            android:id="@+id/rl_pro"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10mm"
@@ -31,7 +31,7 @@
                 android:gravity="center_vertical">
 
                 <TextView
-                    android:id="@+id/tv_factory"
+                    android:id="@+id/tv_pro"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
@@ -65,6 +65,7 @@
 
 
             <EditText
+                android:id="@+id/et_img_code"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -91,6 +92,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -117,6 +119,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_spec"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -143,6 +146,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_material"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -169,6 +173,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_requirements"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -195,6 +200,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_years"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -221,6 +227,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_position"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -247,6 +254,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_baking_method"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -269,10 +277,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
-                android:text="烘烤方式"
+                android:text="烘烤温度"
                 android:textSize="14sp" />
 
+
             <EditText
+                android:id="@+id/et_baking_temperature"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -299,6 +309,7 @@
                 android:textSize="14sp" />
 
             <EditText
+                android:id="@+id/et_baking_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
@@ -313,7 +324,6 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
             android:paddingVertical="15mm"
             android:paddingLeft="18mm"
             android:text="使用问题反馈（侵蚀、冲刷、断裂等）"
@@ -329,18 +339,38 @@
             android:background="@drawable/shape_input_white"
             android:gravity="top"
             android:minLines="3"
+            android:hint="请输入"
             android:padding="5mm"
             android:textSize="14sp" />
 
-        <androidx.recyclerview.widget.RecyclerView
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10mm" />
+            android:paddingHorizontal="20mm">
+
+            <ImageView
+                android:id="@+id/iv_img1"
+                android:layout_width="100mm"
+                android:layout_height="100mm"
+                android:src="@mipmap/img_add" />
+
+            <ImageView
+                android:id="@+id/iv_img2"
+                android:layout_width="100mm"
+                android:layout_height="100mm"
+                android:layout_marginHorizontal="15mm"
+                android:src="@mipmap/img_add" />
+
+            <ImageView
+                android:id="@+id/iv_img3"
+                android:layout_width="100mm"
+                android:layout_height="100mm"
+                android:src="@mipmap/img_add" />
+        </LinearLayout>
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@android:color/white"
             android:paddingVertical="15mm"
             android:paddingLeft="18mm"
             android:text="备注"
@@ -355,6 +385,8 @@
             android:background="@drawable/shape_input_white"
             android:gravity="top"
             android:minLines="3"
+            android:hint="请输入"
+            android:layout_marginBottom="100mm"
             android:padding="5mm"
             android:textSize="14sp" />
     </LinearLayout>