Skip to content

W
workoffice
提交 c319e55b authored 作者: lgd's avatar lgd
浏览文件
操作

1.用户数据采集，添加7小件 

2.//TODO 设备三个子菜单,坩埚下单，mes其他页面，编辑任务担当无法修改.支数参数
上级 352408f4
显示空白字符变更
内嵌 并排
正在显示 包含 2528 行增加 和 610 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ c319e55b
......@@ -1252,6 +1252,14 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesUserClientActivity"
android:configChanges="keyboardHidden|orientation"
android:label="选择客户"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.ticket.MesTicketLogActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
......@@ -1921,6 +1929,31 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesSpeedAddActivity"
android:configChanges="keyboardHidden|orientation"
android:label="连铸机钢种"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesSpeedModifyActivity"
android:configChanges="keyboardHidden|orientation"
android:label="连铸机钢种"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesSpeedDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="连铸机钢种"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/bean/mesBean/MachineDetailBean.java
浏览文件 @ c319e55b
......@@ -9,21 +9,19 @@ import java.util.List;
**/
public class MachineDetailBean {
/**
* 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}]
* castInfo : {"id":"19","isDelete":null,"createDateTime":1585721647000,"updateDateTime":1589253248000,"continuousCasterCode":"lzj111","continuousCasterName":"连铸机0001","steelmakingWorksCode":"lgc1","steelmakingWorksName":"炼钢厂1","continuousCasterType":"铸机类型222221","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":1589253248000,"ladleCode":"zjb1","capacity":"10001","lifeSpan":"1001","liquidLevel":"液位1","liquidSteelTemperature":"30001","bakingMethod":"小火1","bakingTemperature":"5001","bakingDateTime":0,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":false}
* speeds : [{"id":"90","createDateTime":1590116733000,"updateDateTime":1590135153000,"continuousCasterCode":"lzj111","steelGrade":"333","castingSpeed":"2222","ladleCoveringAgentCode":"COV20052200022","mouldFluxesCode":"FLUX20052200022","covAgent":{"id":null,"createDateTime":null,"updateDateTime":null,"ladleCoveringAgentCode":null,"ladleCoveringAgentName":"中包覆盖名称2215555555","acidAlkaliDegreeCov":"10","chemicalCompositionCov":"O-S","supplierCodeCov":"gys1","supplierNameCov":"供应商122","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"mouldFlu":{"id":null,"createDateTime":null,"updateDateTime":null,"mouldFluxesCode":null,"mouldFluxesName":"结晶保护2221","acidAlkaliDegreeFlu":"10","chemicalCompositionFlu":"O-S","supplierCodeFlu":"gys1","supplierNameFlu":"供应商122","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"remark":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","delete":false},{"id":"92","createDateTime":1590132996000,"updateDateTime":null,"continuousCasterCode":"lzj111","steelGrade":"Qqqq","castingSpeed":"1","ladleCoveringAgentCode":"COV20052200038","mouldFluxesCode":"FLUX20052200038","covAgent":{"id":null,"createDateTime":null,"updateDateTime":null,"ladleCoveringAgentCode":null,"ladleCoveringAgentName":"2","acidAlkaliDegreeCov":"3","chemicalCompositionCov":"4","supplierCodeCov":"KN00208","supplierNameCov":"张家港乐方物资有限公司","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"mouldFlu":{"id":null,"createDateTime":null,"updateDateTime":null,"mouldFluxesCode":null,"mouldFluxesName":"6","acidAlkaliDegreeFlu":"7","chemicalCompositionFlu":"8","supplierCodeFlu":"KN00208","supplierNameFlu":"张家港乐方物资有限公司","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"remark":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"delete":false},{"id":"93","createDateTime":1590133834000,"updateDateTime":null,"continuousCasterCode":"lzj111","steelGrade":"Rrrr","castingSpeed":"`","ladleCoveringAgentCode":"COV20052200039","mouldFluxesCode":"FLUX20052200039","covAgent":{"id":null,"createDateTime":null,"updateDateTime":null,"ladleCoveringAgentCode":null,"ladleCoveringAgentName":"2","acidAlkaliDegreeCov":"3","chemicalCompositionCov":"4","supplierCodeCov":"KN00208","supplierNameCov":"张家港乐方物资有限公司","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"mouldFlu":{"id":null,"createDateTime":null,"updateDateTime":null,"mouldFluxesCode":null,"mouldFluxesName":"5","acidAlkaliDegreeFlu":"6","chemicalCompositionFlu":"7","supplierCodeFlu":"KN00185","supplierNameFlu":"西宁特殊钢股份有限公司","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"remark":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"delete":false},{"id":"94","createDateTime":1590133976000,"updateDateTime":null,"continuousCasterCode":"lzj111","steelGrade":"1","castingSpeed":"3","ladleCoveringAgentCode":"COV20052200040","mouldFluxesCode":"FLUX20052200040","covAgent":{"id":null,"createDateTime":null,"updateDateTime":null,"ladleCoveringAgentCode":null,"ladleCoveringAgentName":"4","acidAlkaliDegreeCov":"56","chemicalCompositionCov":"7","supplierCodeCov":"KN00185","supplierNameCov":"西宁特殊钢股份有限公司","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"mouldFlu":{"id":null,"createDateTime":null,"updateDateTime":null,"mouldFluxesCode":null,"mouldFluxesName":"1","acidAlkaliDegreeFlu":"11","chemicalCompositionFlu":"111","supplierCodeFlu":"KN00340","supplierNameFlu":" 江苏沙钢集团有限公司","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"remark":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"delete":false},{"id":"95","createDateTime":1590135179000,"updateDateTime":null,"continuousCasterCode":"lzj111","steelGrade":"111u","castingSpeed":"2","ladleCoveringAgentCode":"COV20052200041","mouldFluxesCode":"FLUX20052200041","covAgent":{"id":null,"createDateTime":null,"updateDateTime":null,"ladleCoveringAgentCode":null,"ladleCoveringAgentName":"1","acidAlkaliDegreeCov":"2","chemicalCompositionCov":"3","supplierCodeCov":"KN00185","supplierNameCov":"西宁特殊钢股份有限公司","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"mouldFlu":{"id":null,"createDateTime":null,"updateDateTime":null,"mouldFluxesCode":null,"mouldFluxesName":"4","acidAlkaliDegreeFlu":"5","chemicalCompositionFlu":"6","supplierCodeFlu":"KN00122","supplierNameFlu":"山东莱德机械有限公司","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"remark":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"delete":false},{"id":"96","createDateTime":1590135621000,"updateDateTime":null,"continuousCasterCode":"lzj111","steelGrade":"11e","castingSpeed":"2","ladleCoveringAgentCode":"COV20052200042","mouldFluxesCode":"FLUX20052200042","covAgent":{"id":null,"createDateTime":null,"updateDateTime":null,"ladleCoveringAgentCode":null,"ladleCoveringAgentName":"1","acidAlkaliDegreeCov":"2","chemicalCompositionCov":"3","supplierCodeCov":"KW00005","supplierNameCov":"Duferco","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"mouldFlu":{"id":null,"createDateTime":null,"updateDateTime":null,"mouldFluxesCode":null,"mouldFluxesName":"4","acidAlkaliDegreeFlu":"5","chemicalCompositionFlu":"6","supplierCodeFlu":"KN00340","supplierNameFlu":" 江苏沙钢集团有限公司","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null},"remark":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"delete":false}]
* productList : [{"id":"18","createDateTime":1585721647000,"updateDateTime":1588905766000,"continuousCasterCode":"lzj111","productsCode":"1233","productsName":"型号A","figureNumber":"11-11","productsType":"类别1","productsStandards":null,"materialsUsed":"用料非常","useRequirement":"使用详情见","useLife":"109","slagLineLocation":"高","bakingMethod":"中火","bakingTemperature":"300","bakingDateTime":100,"useProblemFeedback":"使用详情","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"91c7f1d7722d11ea8334fa163e1166bd","updateUserName":"吴同得","remark":null,"delete":false},{"id":"36","createDateTime":1587353909000,"updateDateTime":1588905350000,"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":"91c7f1d7722d11ea8334fa163e1166bd","updateUserName":"吴同得","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":1588904955000,"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":"91c7f1d7722d11ea8334fa163e1166bd","updateUserName":"吴同得","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},{"id":"62","createDateTime":1588580826000,"updateDateTime":1588608901000,"continuousCasterCode":"lzj111","productsCode":"7701010023L","productsName":"AaBbCc","figureNumber":"adadad","productsType":"0","productsStandards":null,"materialsUsed":"12","useRequirement":"34","useLife":"56","slagLineLocation":"78","bakingMethod":"90","bakingTemperature":"22","bakingDateTime":0,"useProblemFeedback":"zzz","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":false},{"id":"63","createDateTime":1588734427000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7701010023L","productsName":"AaBbCc","figureNumber":"adadad","productsType":"0","productsStandards":null,"materialsUsed":"12","useRequirement":"33","useLife":"4","slagLineLocation":"4","bakingMethod":"5","bakingTemperature":"6","bakingDateTime":6,"useProblemFeedback":null,"attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false},{"id":"73","createDateTime":1589178928000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7301050001B","productsName":"1#挡板DB1","figureNumber":"DB1","productsType":"0","productsStandards":null,"materialsUsed":null,"useRequirement":null,"useLife":null,"slagLineLocation":null,"bakingMethod":null,"bakingTemperature":null,"bakingDateTime":null,"useProblemFeedback":null,"attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":false}]
* supplyList : [{"id":"9","createDateTime":1585721647000,"updateDateTime":1588995999000,"continuousCasterCode":"lzj111","productsCode":"7301050001B","productsName":"型号A","figureNumber":"图号","deliveryDateTime":1584933071000,"deliveryNumber":21,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"custCode":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,"custCode":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,"custCode":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,"custCode":null,"delete":false},{"id":"25","createDateTime":1588146604000,"updateDateTime":1588996101000,"continuousCasterCode":"lzj111","productsCode":"7104010142L","productsName":"快换中包水口ZB145-A","figureNumber":"ZB145-A","deliveryDateTime":null,"deliveryNumber":12,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"custCode":null,"delete":false},{"id":"27","createDateTime":1588994219000,"updateDateTime":1588996523000,"continuousCasterCode":"lzj111","productsCode":"7701010023L","productsName":"AaBbCc","figureNumber":"adadad","deliveryDateTime":1588994000,"deliveryNumber":122,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"custCode":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,"custCode":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,"custCode":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,"custCode":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,"custCode":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,"custCode":null,"delete":false},{"id":"27","createDateTime":1588646660000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":null,"productsName":"AaBbCc","figureNumber":"adadad","stockNumber":null,"otherInformationExplain":"12123","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"custCode":null,"delete":false},{"id":"28","createDateTime":1588647309000,"updateDateTime":null,"continuousCasterCode":"lzj111","productsCode":"7301050001B","productsName":"1#挡板DB1","figureNumber":"DB1","stockNumber":null,"otherInformationExplain":"12123","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"custCode":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":1589269505000,"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":1588608940000,"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},{"id":"30","createDateTime":1588582099000,"updateDateTime":1588608928000,"continuousCasterCode":"lzj111","supplierCode":null,"supplierName":"3333","useLife":"10","supplyNumber":"333","stockNumber":"444","otherSituationDescription":"123","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":1589269599000,"continuousCasterCode":"lzj111","refractoryName":"滑块2","figureNumber":"图号2","materialsUsed":"用料2","useRequirement":null,"useLife":"10","useProblemFeedback":"说明2","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","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},{"id":"28","createDateTime":1588582727000,"updateDateTime":1588607978000,"continuousCasterCode":"lzj111","refractoryName":"AaBbCc","figureNumber":"adadad","materialsUsed":"123","useRequirement":null,"useLife":"212","useProblemFeedback":"333","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":false},{"id":"29","createDateTime":1588607664000,"updateDateTime":1588608956000,"continuousCasterCode":"lzj111","refractoryName":"AaBbCc","figureNumber":"adadad","materialsUsed":"22","useRequirement":null,"useLife":"212","useProblemFeedback":"333","attachmentId":null,"attachments":[],"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":false}]
* settleList : [{"id":"9","isDelete":null,"createDateTime":1585721648000,"updateDateTime":1588648077000,"continuousCasterCode":"lzj111","ladleContractSituation":"中包情况11122","continuousCastingContractSituation":"承包情况222","settlementMethod":"结算方式333444","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","remark":null,"delete":null},{"id":"10","isDelete":null,"createDateTime":1585721648000,"updateDateTime":1589269639000,"continuousCasterCode":"lzj111","ladleContractSituation":"中包情况2","continuousCastingContractSituation":"承包情况2","settlementMethod":"结算方式2","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","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},{"id":"33","isDelete":null,"createDateTime":1588583851000,"updateDateTime":null,"continuousCasterCode":"lzj111","ladleContractSituation":"123","continuousCastingContractSituation":"345111","settlementMethod":"2222","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"remark":null,"delete":null}]
* delete : null
*/
......@@ -32,9 +30,8 @@ public class MachineDetailBean {
private Object updateDateTime;
private CastInfoBean castInfo;
private CastLadleBean castLadle;
private CovAgentBean covAgent;
private MouldFluBean mouldFlu;
private Object delete;
private List<SpeedsBean> speeds;
private List<ProductListBean> productList;
private List<SupplyListBean> supplyList;
private List<StockListBean> stockList;
......@@ -82,22 +79,6 @@ public class MachineDetailBean {
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;
}
......@@ -106,6 +87,14 @@ public class MachineDetailBean {
this.delete = delete;
}
public List<SpeedsBean> getSpeeds() {
return speeds;
}
public void setSpeeds(List<SpeedsBean> speeds) {
this.speeds = speeds;
}
public List<ProductListBean> getProductList() {
return productList;
}
......@@ -159,12 +148,12 @@ public class MachineDetailBean {
* id : 19
* isDelete : null
* createDateTime : 1585721647000
* updateDateTime : 1587460675000
* updateDateTime : 1589253248000
* continuousCasterCode : lzj111
* continuousCasterName : 连铸机01
* continuousCasterName : 连铸机0001
* steelmakingWorksCode : lgc1
* steelmakingWorksName : 炼钢厂1
* continuousCasterType : 铸机类型11
* continuousCasterType : 铸机类型222221
* fractureSurface : 断面1
* steelGrade : 钢种1
* castingSpeed : 拉速1
......@@ -384,15 +373,15 @@ public class MachineDetailBean {
/**
* id : 17
* createDateTime : null
* updateDateTime : 1587460675000
* updateDateTime : 1589253248000
* ladleCode : zjb1
* capacity : 1001
* capacity : 10001
* lifeSpan : 1001
* liquidLevel : 液位1
* liquidSteelTemperature : 30001
* bakingMethod : 小火1
* bakingTemperature : 5001
* bakingDateTime : 1001
* bakingDateTime : 0
* createUserId : 398c852b38e911ea8334fa163e1166bd
* createUserName : null
* updateUserId : 398c852b38e911ea8334fa163e1166bd
......@@ -556,42 +545,42 @@ public class MachineDetailBean {
}
}
public static class CovAgentBean {
public static class SpeedsBean {
/**
* id : 18
* isDelete : null
* createDateTime : 1585721647000
* updateDateTime : 1587460675000
* ladleCoveringAgentCode : zjbfgj1
* ladleCoveringAgentName : 中包覆盖名称11
* acidAlkaliDegree : 101
* chemicalComposition : O-S1
* supplierCode : gys1
* supplierName : 供应商11
* id : 90
* createDateTime : 1590116733000
* updateDateTime : 1590135153000
* continuousCasterCode : lzj111
* steelGrade : 333
* castingSpeed : 2222
* ladleCoveringAgentCode : COV20052200022
* mouldFluxesCode : FLUX20052200022
* covAgent : {"id":null,"createDateTime":null,"updateDateTime":null,"ladleCoveringAgentCode":null,"ladleCoveringAgentName":"中包覆盖名称2215555555","acidAlkaliDegreeCov":"10","chemicalCompositionCov":"O-S","supplierCodeCov":"gys1","supplierNameCov":"供应商122","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null}
* mouldFlu : {"id":null,"createDateTime":null,"updateDateTime":null,"mouldFluxesCode":null,"mouldFluxesName":"结晶保护2221","acidAlkaliDegreeFlu":"10","chemicalCompositionFlu":"O-S","supplierCodeFlu":"gys1","supplierNameFlu":"供应商122","createUserId":null,"createUserName":null,"updateUserId":null,"updateUserName":null,"remark":null,"delete":null}
* remark : null
* createUserId : 398c852b38e911ea8334fa163e1166bd
* createUserName : null
* createUserName : hello
* updateUserId : 398c852b38e911ea8334fa163e1166bd
* updateUserName : hello
* remark : null
* delete : null
* delete : false
*/
private String id;
private Object isDelete;
private long createDateTime;
private long updateDateTime;
private String continuousCasterCode;
private String steelGrade;
private String castingSpeed;
private String ladleCoveringAgentCode;
private String ladleCoveringAgentName;
private String acidAlkaliDegree;
private String chemicalComposition;
private String supplierCode;
private String supplierName;
private String mouldFluxesCode;
private CovAgentBean covAgent;
private MouldFluBean mouldFlu;
private Object remark;
private String createUserId;
private Object createUserName;
private String createUserName;
private String updateUserId;
private String updateUserName;
private Object remark;
private Object delete;
private boolean delete;
public String getId() {
return id;
......@@ -601,14 +590,6 @@ public class MachineDetailBean {
this.id = id;
}
public Object getIsDelete() {
return isDelete;
}
public void setIsDelete(Object isDelete) {
this.isDelete = isDelete;
}
public long getCreateDateTime() {
return createDateTime;
}
......@@ -625,6 +606,30 @@ public class MachineDetailBean {
this.updateDateTime = updateDateTime;
}
public String getContinuousCasterCode() {
return continuousCasterCode;
}
public void setContinuousCasterCode(String continuousCasterCode) {
this.continuousCasterCode = continuousCasterCode;
}
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 getLadleCoveringAgentCode() {
return ladleCoveringAgentCode;
}
......@@ -633,6 +638,145 @@ public class MachineDetailBean {
this.ladleCoveringAgentCode = ladleCoveringAgentCode;
}
public String getMouldFluxesCode() {
return mouldFluxesCode;
}
public void setMouldFluxesCode(String mouldFluxesCode) {
this.mouldFluxesCode = mouldFluxesCode;
}
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 getRemark() {
return remark;
}
public void setRemark(Object remark) {
this.remark = remark;
}
public String getCreateUserId() {
return createUserId;
}
public void setCreateUserId(String createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String 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 boolean isDelete() {
return delete;
}
public void setDelete(boolean delete) {
this.delete = delete;
}
public static class CovAgentBean {
/**
* id : null
* createDateTime : null
* updateDateTime : null
* ladleCoveringAgentCode : null
* ladleCoveringAgentName : 中包覆盖名称2215555555
* acidAlkaliDegreeCov : 10
* chemicalCompositionCov : O-S
* supplierCodeCov : gys1
* supplierNameCov : 供应商122
* createUserId : null
* createUserName : null
* updateUserId : null
* updateUserName : null
* remark : null
* delete : null
*/
private Object id;
private Object createDateTime;
private Object updateDateTime;
private Object ladleCoveringAgentCode;
private String ladleCoveringAgentName;
private String acidAlkaliDegreeCov;
private String chemicalCompositionCov;
private String supplierCodeCov;
private String supplierNameCov;
private Object createUserId;
private Object createUserName;
private Object updateUserId;
private Object updateUserName;
private Object remark;
private Object delete;
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 Object getLadleCoveringAgentCode() {
return ladleCoveringAgentCode;
}
public void setLadleCoveringAgentCode(Object ladleCoveringAgentCode) {
this.ladleCoveringAgentCode = ladleCoveringAgentCode;
}
public String getLadleCoveringAgentName() {
return ladleCoveringAgentName;
}
......@@ -641,43 +785,43 @@ public class MachineDetailBean {
this.ladleCoveringAgentName = ladleCoveringAgentName;
}
public String getAcidAlkaliDegree() {
return acidAlkaliDegree;
public String getAcidAlkaliDegreeCov() {
return acidAlkaliDegreeCov;
}
public void setAcidAlkaliDegree(String acidAlkaliDegree) {
this.acidAlkaliDegree = acidAlkaliDegree;
public void setAcidAlkaliDegreeCov(String acidAlkaliDegreeCov) {
this.acidAlkaliDegreeCov = acidAlkaliDegreeCov;
}
public String getChemicalComposition() {
return chemicalComposition;
public String getChemicalCompositionCov() {
return chemicalCompositionCov;
}
public void setChemicalComposition(String chemicalComposition) {
this.chemicalComposition = chemicalComposition;
public void setChemicalCompositionCov(String chemicalCompositionCov) {
this.chemicalCompositionCov = chemicalCompositionCov;
}
public String getSupplierCode() {
return supplierCode;
public String getSupplierCodeCov() {
return supplierCodeCov;
}
public void setSupplierCode(String supplierCode) {
this.supplierCode = supplierCode;
public void setSupplierCodeCov(String supplierCodeCov) {
this.supplierCodeCov = supplierCodeCov;
}
public String getSupplierName() {
return supplierName;
public String getSupplierNameCov() {
return supplierNameCov;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
public void setSupplierNameCov(String supplierNameCov) {
this.supplierNameCov = supplierNameCov;
}
public String getCreateUserId() {
public Object getCreateUserId() {
return createUserId;
}
public void setCreateUserId(String createUserId) {
public void setCreateUserId(Object createUserId) {
this.createUserId = createUserId;
}
......@@ -689,19 +833,19 @@ public class MachineDetailBean {
this.createUserName = createUserName;
}
public String getUpdateUserId() {
public Object getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(String updateUserId) {
public void setUpdateUserId(Object updateUserId) {
this.updateUserId = updateUserId;
}
public String getUpdateUserName() {
public Object getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(String updateUserName) {
public void setUpdateUserName(Object updateUserName) {
this.updateUserName = updateUserName;
}
......@@ -724,78 +868,68 @@ public class MachineDetailBean {
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
* id : null
* createDateTime : null
* updateDateTime : null
* mouldFluxesCode : null
* mouldFluxesName : 结晶保护2221
* acidAlkaliDegreeFlu : 10
* chemicalCompositionFlu : O-S
* supplierCodeFlu : gys1
* supplierNameFlu : 供应商122
* createUserId : null
* createUserName : null
* updateUserId : 398c852b38e911ea8334fa163e1166bd
* updateUserName : hello
* updateUserId : null
* updateUserName : null
* remark : null
* delete : null
*/
private String id;
private Object isDelete;
private long createDateTime;
private long updateDateTime;
private String mouldFluxesCode;
private Object id;
private Object createDateTime;
private Object updateDateTime;
private Object mouldFluxesCode;
private String mouldFluxesName;
private String acidAlkaliDegree;
private String chemicalComposition;
private String supplierCode;
private String supplierName;
private String createUserId;
private String acidAlkaliDegreeFlu;
private String chemicalCompositionFlu;
private String supplierCodeFlu;
private String supplierNameFlu;
private Object createUserId;
private Object createUserName;
private String updateUserId;
private String updateUserName;
private Object updateUserId;
private Object updateUserName;
private Object remark;
private Object delete;
public String getId() {
public Object getId() {
return id;
}
public void setId(String id) {
public void setId(Object id) {
this.id = id;
}
public Object getIsDelete() {
return isDelete;
}
public void setIsDelete(Object isDelete) {
this.isDelete = isDelete;
}
public long getCreateDateTime() {
public Object getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(long createDateTime) {
public void setCreateDateTime(Object createDateTime) {
this.createDateTime = createDateTime;
}
public long getUpdateDateTime() {
public Object getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(long updateDateTime) {
public void setUpdateDateTime(Object updateDateTime) {
this.updateDateTime = updateDateTime;
}
public String getMouldFluxesCode() {
public Object getMouldFluxesCode() {
return mouldFluxesCode;
}
public void setMouldFluxesCode(String mouldFluxesCode) {
public void setMouldFluxesCode(Object mouldFluxesCode) {
this.mouldFluxesCode = mouldFluxesCode;
}
......@@ -807,43 +941,43 @@ public class MachineDetailBean {
this.mouldFluxesName = mouldFluxesName;
}
public String getAcidAlkaliDegree() {
return acidAlkaliDegree;
public String getAcidAlkaliDegreeFlu() {
return acidAlkaliDegreeFlu;
}
public void setAcidAlkaliDegree(String acidAlkaliDegree) {
this.acidAlkaliDegree = acidAlkaliDegree;
public void setAcidAlkaliDegreeFlu(String acidAlkaliDegreeFlu) {
this.acidAlkaliDegreeFlu = acidAlkaliDegreeFlu;
}
public String getChemicalComposition() {
return chemicalComposition;
public String getChemicalCompositionFlu() {
return chemicalCompositionFlu;
}
public void setChemicalComposition(String chemicalComposition) {
this.chemicalComposition = chemicalComposition;
public void setChemicalCompositionFlu(String chemicalCompositionFlu) {
this.chemicalCompositionFlu = chemicalCompositionFlu;
}
public String getSupplierCode() {
return supplierCode;
public String getSupplierCodeFlu() {
return supplierCodeFlu;
}
public void setSupplierCode(String supplierCode) {
this.supplierCode = supplierCode;
public void setSupplierCodeFlu(String supplierCodeFlu) {
this.supplierCodeFlu = supplierCodeFlu;
}
public String getSupplierName() {
return supplierName;
public String getSupplierNameFlu() {
return supplierNameFlu;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
public void setSupplierNameFlu(String supplierNameFlu) {
this.supplierNameFlu = supplierNameFlu;
}
public String getCreateUserId() {
public Object getCreateUserId() {
return createUserId;
}
public void setCreateUserId(String createUserId) {
public void setCreateUserId(Object createUserId) {
this.createUserId = createUserId;
}
......@@ -855,19 +989,19 @@ public class MachineDetailBean {
this.createUserName = createUserName;
}
public String getUpdateUserId() {
public Object getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(String updateUserId) {
public void setUpdateUserId(Object updateUserId) {
this.updateUserId = updateUserId;
}
public String getUpdateUserName() {
public Object getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(String updateUserName) {
public void setUpdateUserName(Object updateUserName) {
this.updateUserName = updateUserName;
}
......@@ -887,21 +1021,22 @@ public class MachineDetailBean {
this.delete = delete;
}
}
}
public static class ProductListBean {
/**
* id : 18
* createDateTime : 1585721647000
* updateDateTime : 1587429741000
* updateDateTime : 1588905766000
* continuousCasterCode : lzj111
* productsCode : 1233
* productsName : 型号A
* figureNumber : 11-11
* productsType : 类别1
* productsStandards : null
* materialsUsed : 用料
* useRequirement : 使用详情
* useLife : 10
* materialsUsed : 用料非常
* useRequirement : 使用详情见
* useLife : 109
* slagLineLocation : 高
* bakingMethod : 中火
* bakingTemperature : 300
......@@ -911,8 +1046,8 @@ public class MachineDetailBean {
* attachments : []
* createUserId : 398c852b38e911ea8334fa163e1166bd
* createUserName : null
* updateUserId : 398c852b38e911ea8334fa163e1166bd
* updateUserName : hello
* updateUserId : 91c7f1d7722d11ea8334fa163e1166bd
* updateUserName : 吴同得
* remark : null
* delete : false
*/
......@@ -1148,35 +1283,37 @@ public class MachineDetailBean {
/**
* id : 9
* createDateTime : 1585721647000
* updateDateTime : null
* updateDateTime : 1588995999000
* continuousCasterCode : lzj111
* productsCode : 7301050001B
* productsName : 型号A
* figureNumber : 图号
* deliveryDateTime : 1584933071000
* deliveryNumber : 20
* deliveryNumber : 21
* createUserId : 398c852b38e911ea8334fa163e1166bd
* createUserName : null
* updateUserId : null
* updateUserName : null
* updateUserId : 398c852b38e911ea8334fa163e1166bd
* updateUserName : hello
* remark : null
* custCode : null
* delete : false
*/
private String id;
private long createDateTime;
private Object updateDateTime;
private long updateDateTime;
private String continuousCasterCode;
private String productsCode;
private String productsName;
private String figureNumber;
private long deliveryDateTime;
private String deliveryNumber;
private int deliveryNumber;
private String createUserId;
private Object createUserName;
private Object updateUserId;
private Object updateUserName;
private String updateUserId;
private String updateUserName;
private Object remark;
private Object custCode;
private boolean delete;
public String getId() {
......@@ -1195,11 +1332,11 @@ public class MachineDetailBean {
this.createDateTime = createDateTime;
}
public Object getUpdateDateTime() {
public long getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(Object updateDateTime) {
public void setUpdateDateTime(long updateDateTime) {
this.updateDateTime = updateDateTime;
}
......@@ -1243,11 +1380,11 @@ public class MachineDetailBean {
this.deliveryDateTime = deliveryDateTime;
}
public String getDeliveryNumber() {
public int getDeliveryNumber() {
return deliveryNumber;
}
public void setDeliveryNumber(String deliveryNumber) {
public void setDeliveryNumber(int deliveryNumber) {
this.deliveryNumber = deliveryNumber;
}
......@@ -1267,19 +1404,19 @@ public class MachineDetailBean {
this.createUserName = createUserName;
}
public Object getUpdateUserId() {
public String getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(Object updateUserId) {
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
public Object getUpdateUserName() {
public String getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(Object updateUserName) {
public void setUpdateUserName(String updateUserName) {
this.updateUserName = updateUserName;
}
......@@ -1291,6 +1428,14 @@ public class MachineDetailBean {
this.remark = remark;
}
public Object getCustCode() {
return custCode;
}
public void setCustCode(Object custCode) {
this.custCode = custCode;
}
public boolean isDelete() {
return delete;
}
......@@ -1316,6 +1461,7 @@ public class MachineDetailBean {
* updateUserId : null
* updateUserName : null
* remark : null
* custCode : null
* delete : false
*/
......@@ -1326,13 +1472,14 @@ public class MachineDetailBean {
private String productsCode;
private String productsName;
private String figureNumber;
private String stockNumber;
private int stockNumber;
private String otherInformationExplain;
private String createUserId;
private Object createUserName;
private Object updateUserId;
private Object updateUserName;
private Object remark;
private Object custCode;
private boolean delete;
public String getId() {
......@@ -1391,11 +1538,11 @@ public class MachineDetailBean {
this.figureNumber = figureNumber;
}
public String getStockNumber() {
public int getStockNumber() {
return stockNumber;
}
public void setStockNumber(String stockNumber) {
public void setStockNumber(int stockNumber) {
this.stockNumber = stockNumber;
}
......@@ -1447,6 +1594,14 @@ public class MachineDetailBean {
this.remark = remark;
}
public Object getCustCode() {
return custCode;
}
public void setCustCode(Object custCode) {
this.custCode = custCode;
}
public boolean isDelete() {
return delete;
}
......@@ -1833,11 +1988,11 @@ public class MachineDetailBean {
* id : 9
* isDelete : null
* createDateTime : 1585721648000
* updateDateTime : 1587367515000
* updateDateTime : 1588648077000
* continuousCasterCode : lzj111
* ladleContractSituation : 中包情况11122
* continuousCastingContractSituation : 承包情况222
* settlementMethod : 结算方式333
* settlementMethod : 结算方式333444
* createUserId : 398c852b38e911ea8334fa163e1166bd
* createUserName : null
* updateUserId : 398c852b38e911ea8334fa163e1166bd
......
app/src/main/java/com/wd/workoffice/bean/mesBean/MesClientBean.java
浏览文件 @ c319e55b
......@@ -58,6 +58,25 @@ public class MesClientBean extends BaseMesPageBean {
private Object updateUserName;
private String remark;
private Object delete;
private String customerUserCode;
private String customerUserName;
public String getCustomerUserCode() {
return customerUserCode;
}
public void setCustomerUserCode(String customerUserCode) {
this.customerUserCode = customerUserCode;
}
public String getCustomerUserName() {
return customerUserName;
}
public void setCustomerUserName(String customerUserName) {
this.customerUserName = customerUserName;
}
public String getId() {
return id;
......
app/src/main/java/com/wd/workoffice/bean/mesBean/UserDataDetailBean.java
浏览文件 @ c319e55b
......@@ -33,14 +33,15 @@ public class UserDataDetailBean {
*/
private MachineDetailBean.CastInfoBean castInfo;
private MachineDetailBean.CastLadleBean castLadle;
private MachineDetailBean.CovAgentBean covAgent;
private MachineDetailBean.MouldFluBean mouldFlu;
// private MachineDetailBean.CovAgentBean covAgent;
// private MachineDetailBean.MouldFluBean mouldFlu;
private List<MachineDetailBean.ProductListBean> productList;
private List<MachineDetailBean.SupplyListBean> supplyList;
private List<MachineDetailBean.StockListBean> stockList;
private List<MachineDetailBean.OtherSupListBean> otherSupList;
private List<MachineDetailBean.OtherLadleListBean> otherLadleList;
private List<MachineDetailBean.SettleListBean> settleList;
private List<MachineDetailBean.SpeedsBean> speeds;
private Object id;
private Object createDateTime;
private Object updateDateTime;
......@@ -52,6 +53,14 @@ public class UserDataDetailBean {
private List<FactoryDetailBean.SteelLadleListBean> steelLadleList;
private Object delete;
public List<MachineDetailBean.SpeedsBean> getSpeeds() {
return speeds;
}
public void setSpeeds(List<MachineDetailBean.SpeedsBean> speeds) {
this.speeds = speeds;
}
public MachineDetailBean.CastInfoBean getCastInfo() {
return castInfo;
}
......@@ -68,21 +77,21 @@ public class UserDataDetailBean {
this.castLadle = castLadle;
}
public MachineDetailBean.CovAgentBean getCovAgent() {
return covAgent;
}
public void setCovAgent(MachineDetailBean.CovAgentBean covAgent) {
this.covAgent = covAgent;
}
public MachineDetailBean.MouldFluBean getMouldFlu() {
return mouldFlu;
}
public void setMouldFlu(MachineDetailBean.MouldFluBean mouldFlu) {
this.mouldFlu = mouldFlu;
}
// public MachineDetailBean.CovAgentBean getCovAgent() {
// return covAgent;
// }
//
// public void setCovAgent(MachineDetailBean.CovAgentBean covAgent) {
// this.covAgent = covAgent;
// }
//
// public MachineDetailBean.MouldFluBean getMouldFlu() {
// return mouldFlu;
// }
//
// public void setMouldFlu(MachineDetailBean.MouldFluBean mouldFlu) {
// this.mouldFlu = mouldFlu;
// }
public List<MachineDetailBean.ProductListBean> getProductList() {
return productList;
......
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ c319e55b
......@@ -4,6 +4,7 @@ package com.wd.workoffice.retrofit;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.ui.activity.mes.user.MesChooseClientActivity;
import io.reactivex.Observable;
import okhttp3.MultipartBody;
......@@ -124,6 +125,15 @@ public interface MesApiService {
@POST("/himes/api/msCustomerSales/show/page.json")
Observable<BaseMesBean> clientList(@Query("functionId") String functionId, @Body RequestBody requestBody);
/**
* 新建选择客户
*
* @return
*/
@POST("/himes/api/msSceneFeedback/createByWorkOrder.json")
Observable<BaseMesBean> userClientList(@Query("functionId") String functionId,@Body RequestBody requestBody);
/**
* 工作总结新增
*
......@@ -239,6 +249,16 @@ public interface MesApiService {
@POST("/himes/api/msContractAndSettlement/save.json")
Observable<BaseMesBean> middleAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/**
* otherSupplierAdd
*
* @return
*/
@POST("/himes/api/msContinuousCasterSpeed/save.json")
Observable<BaseMesBean> speedAdd(@Query("functionId") String functionId, @Query("option") String option, @Body RequestBody requestBody);
/**
* otherSupplierAdd
*
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineActivity.java
浏览文件 @ c319e55b
......@@ -40,6 +40,7 @@ import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 搜索连铸机
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.java
浏览文件 @ c319e55b
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
......@@ -22,7 +20,6 @@ import com.wd.workoffice.bean.event.AddMachineEvent;
import com.wd.workoffice.bean.event.AddMachineModifyChildEvent;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -36,13 +33,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.LogUtils;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
......@@ -138,6 +135,12 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
EditText tvMachineName;
@BindView(R.id.tv_add2)
TextView tvAdd2;
@BindView(R.id.rv_data7)
RecyclerView rvData7;
@BindView(R.id.tv_add7)
TextView tvAdd7;
@BindView(R.id.tv_next)
TextView tvNext;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -150,8 +153,10 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
private MachineDetailBean machineDetailBean = new MachineDetailBean();
private UserDataMachineAdapter data5Adapter;
private UserDataMachineAdapter data6Adapter;
private UserDataMachineAdapter data7Adapter;
private List<String> data5List;
private List<String> data6List;
private List<String> data7List;
@Override
protected void initView() {
......@@ -162,6 +167,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData6.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData7.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
......@@ -174,19 +180,21 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
data4List = new ArrayList<>();
data5List = new ArrayList<>();
data6List = new ArrayList<>();
data7List = 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);
data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data6Adapter = new UserDataMachineAdapter(R.layout.item_machine, data6List);
data7Adapter = new UserDataMachineAdapter(R.layout.item_machine, data7List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
data6Adapter.bindToRecyclerView(rvData6);
data7Adapter.bindToRecyclerView(rvData7);
}
......@@ -238,6 +246,13 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
}
});
data7Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSpeedModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position)));
}
});
}
@Override
......@@ -276,26 +291,26 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
}
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
covAgent.setLadleCoveringAgentName(tvCover1.getText().toString());
covAgent.setAcidAlkaliDegree(tvCover2.getText().toString());
covAgent.setChemicalComposition(tvCover3.getText().toString());
covAgent.setSupplierName(tvCover4.getText().toString());
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
mouldFlu.setAcidAlkaliDegree(tvProtection2.getText().toString());
mouldFlu.setChemicalComposition(tvProtection3.getText().toString());
mouldFlu.setSupplierName(tvProtection4.getText().toString());
// MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
// if (covAgent == null) {
// covAgent = new MachineDetailBean.CovAgentBean();
// machineDetailBean.setCovAgent(covAgent);
// }
// covAgent.setLadleCoveringAgentName(tvCover1.getText().toString());
// covAgent.setAcidAlkaliDegree(tvCover2.getText().toString());
// covAgent.setChemicalComposition(tvCover3.getText().toString());
// covAgent.setSupplierName(tvCover4.getText().toString());
//
//
// MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
// if (mouldFlu == null) {
// mouldFlu = new MachineDetailBean.MouldFluBean();
// machineDetailBean.setMouldFlu(mouldFlu);
// }
// mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
// mouldFlu.setAcidAlkaliDegree(tvProtection2.getText().toString());
// mouldFlu.setChemicalComposition(tvProtection3.getText().toString());
// mouldFlu.setSupplierName(tvProtection4.getText().toString());
}
private void changeList() {
......@@ -305,6 +320,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
data4List.clear();
data5List.clear();
data6List.clear();
data7List.clear();
if (machineDetailBean.getProductList() != null) {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName());
......@@ -341,9 +357,15 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
}
data6Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSpeeds() != null) {
for (MachineDetailBean.SpeedsBean productListBean : machineDetailBean.getSpeeds()) {
data7List.add(productListBean.getSteelGrade());
}
data7Adapter.notifyDataSetChanged();
}
}
@OnClick({R.id.tv_next,R.id.tv_add2, R.id.rl_cover4, R.id.rl_protection4, R.id.tv_add5, R.id.tv_add6, 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})
@OnClick({R.id.tv_next, R.id.tv_add7, R.id.tv_add2, R.id.rl_cover4, R.id.rl_protection4, R.id.tv_add5, R.id.tv_add6, 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_next:
......@@ -356,6 +378,10 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
startActivityForResult(MesChooseClientActivity.class,
10002, "from", "1");
break;
case R.id.tv_add7:
startActivity(MesSpeedAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode());
break;
case R.id.tv_add1:
startActivity(MesThreeAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode());
......@@ -467,6 +493,13 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
}
machineDetailBean.getSettleList().add(JSON.parseObject(event.getData(), MachineDetailBean.SettleListBean.class));
break;
case 7:
List<MachineDetailBean.SpeedsBean> speedList = machineDetailBean.getSpeeds();
if (speedList == null) {
machineDetailBean.setSpeeds(new ArrayList<>());
}
machineDetailBean.getSpeeds().add(JSON.parseObject(event.getData(), MachineDetailBean.SpeedsBean.class));
break;
}
changeList();
}
......@@ -522,6 +555,14 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
settleList.remove(event.getPosition());
settleList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.SettleListBean.class));
break;
case 7:
List<MachineDetailBean.SpeedsBean> speedList = machineDetailBean.getSpeeds();
if (speedList == null) {
machineDetailBean.setSpeeds(new ArrayList<>());
}
speedList.remove(event.getPosition());
speedList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.SpeedsBean.class));
break;
}
changeList();
}
......@@ -536,7 +577,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
if (TextUtils.isEmpty(tvMachineName.getText().toString())){
if (TextUtils.isEmpty(tvMachineName.getText().toString())) {
toast("请输入连铸机名称");
return super.onOptionsItemSelected(item);
}
......@@ -569,9 +610,9 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
for (Map.Entry<String, Object> machineEntry : machineMap.entrySet()) {
param.put(machineEntry.getKey(), machineEntry.getValue());
}
startActivity(MesUserDataDetailAddActivity.class,"from","1"
,"data",JSON.toJSONString(param));
LogUtils.LOGE("flexible", JSON.toJSONString(param, true));
startActivity(MesUserDataDetailAddActivity.class, "from", "1"
, "data", JSON.toJSONString(param));
// showLoading();
// RtfUtils.getMesRtf().userDataAdd("1", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
......@@ -627,40 +668,9 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
});
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case 10001:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
tvCover4.setText(modifyClient.getCustomerName());
covAgent.setSupplierCode(modifyClient.getCustomerCode());
covAgent.setSupplierName(modifyClient.getCustomerName());
}
break;
case 10002:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
tvProtection4.setText(modifyClient.getCustomerName());
mouldFlu.setSupplierCode(modifyClient.getCustomerCode());
mouldFlu.setSupplierCode(modifyClient.getCustomerName());
}
break;
}
}
@Subscribe
public void refresh(AddUserDataEvent event) {
finish();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java
浏览文件 @ c319e55b
......@@ -125,6 +125,12 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
TextView tvMachineName;
@BindView(R.id.tv_add2)
TextView tvAdd2;
@BindView(R.id.rv_data7)
RecyclerView rvData7;
@BindView(R.id.tv_add7)
TextView tvAdd7;
@BindView(R.id.tv_next)
TextView tvNext;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -137,9 +143,10 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
private MachineDetailBean machineDetailBean;
private UserDataMachineAdapter data5Adapter;
private UserDataMachineAdapter data6Adapter;
private UserDataMachineAdapter data7Adapter;
private List<String> data5List;
private List<String> data6List;
private List<String> data7List;
@Override
protected void initView() {
ButterKnife.bind(this);
......@@ -149,6 +156,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData6.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData7.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
......@@ -160,6 +168,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data4List = new ArrayList<>();
data5List = new ArrayList<>();
data6List = new ArrayList<>();
data7List = new ArrayList<>();
data1Adapter = new UserDataMachineAdapter(R.layout.item_machine, data1List);
data2Adapter = new UserDataMachineAdapter(R.layout.item_machine, data2List);
......@@ -167,12 +176,15 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data6Adapter = new UserDataMachineAdapter(R.layout.item_machine, data6List);
data7Adapter = new UserDataMachineAdapter(R.layout.item_machine, data7List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
data6Adapter.bindToRecyclerView(rvData6);
data7Adapter.bindToRecyclerView(rvData7);
getData();
}
......@@ -218,20 +230,20 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
tvMiddle7.setText(castLadle.getBakingTemperature());
tvMiddle8.setText(String.valueOf(castLadle.getBakingDateTime()));
}
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent != null) {
tvCover1.setText(covAgent.getLadleCoveringAgentName());
tvCover2.setText(covAgent.getAcidAlkaliDegree());
tvCover3.setText(covAgent.getChemicalComposition());
tvCover4.setText(covAgent.getSupplierName());
}
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu != null) {
tvProtection1.setText(mouldFlu.getMouldFluxesName());
tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
tvProtection3.setText(mouldFlu.getChemicalComposition());
tvProtection4.setText(mouldFlu.getSupplierName());
}
// MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
// if (covAgent != null) {
// tvCover1.setText(covAgent.getLadleCoveringAgentName());
// tvCover2.setText(covAgent.getAcidAlkaliDegree());
// tvCover3.setText(covAgent.getChemicalComposition());
// tvCover4.setText(covAgent.getSupplierName());
// }
// MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
// if (mouldFlu != null) {
// tvProtection1.setText(mouldFlu.getMouldFluxesName());
// tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
// tvProtection3.setText(mouldFlu.getChemicalComposition());
// tvProtection4.setText(mouldFlu.getSupplierName());
// }
changeList();
}
});
......@@ -244,6 +256,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
data4List.clear();
data5List.clear();
data6List.clear();
data7List.clear();
if (machineDetailBean.getProductList() != null) {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName());
......@@ -280,6 +293,12 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
}
data6Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSpeeds() != null) {
for (MachineDetailBean.SpeedsBean productListBean : machineDetailBean.getSpeeds()) {
data7List.add(productListBean.getSteelGrade());
}
data7Adapter.notifyDataSetChanged();
}
}
@Override
......@@ -323,6 +342,12 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
}
});
data7Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position)));
}
});
}
@Override
......@@ -331,7 +356,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_next,R.id.tv_add2, R.id.tv_add5, R.id.tv_add6, 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})
@OnClick({R.id.tv_next, R.id.tv_add7,R.id.tv_add2, R.id.tv_add5, R.id.tv_add6, 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_next:
......@@ -341,8 +366,8 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
steelInfo.put("steelmakingWorksCode", data.getSteelmakingWorksCode());
steelInfo.put("continuousCasterCode", data.getContinuousCasterCode());
param.put("steelInfo", steelInfo);
startActivity(MesUserDataDetailAddActivity.class,"form","0"
,"data",JSON.toJSONString(param));
startActivity(MesUserDataDetailAddActivity.class, "from", "0"
, "data", JSON.toJSONString(param));
break;
case R.id.tv_add1:
startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
......@@ -362,6 +387,9 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
case R.id.tv_add6:
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break;
case R.id.tv_add7:
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break;
case R.id.rl_add:
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break;
......@@ -425,7 +453,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
// break;
case R.id.modify:
startActivity(MesChooseMachineModifyActivity.class,
"data",JSON.toJSONString(data));
"data", JSON.toJSONString(data));
break;
}
return super.onOptionsItemSelected(item);
......@@ -466,4 +494,5 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineModifyActivity.java
浏览文件 @ c319e55b
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
......@@ -16,19 +15,11 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.ModifyMachineEvent;
import com.wd.workoffice.bean.event.ModifyUserDataEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter;
import com.wd.workoffice.ui.adapter.UserDataDetailFactory1Adapter;
import com.wd.workoffice.ui.adapter.UserDataDetailFactory2Adapter;
import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
import com.wd.workoffice.util.WorkUtils;
......@@ -39,14 +30,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
......@@ -142,6 +131,10 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
TextView tvAdd6;
@BindView(R.id.rl_add)
RelativeLayout rlAdd;
@BindView(R.id.rv_data7)
RecyclerView rvData7;
@BindView(R.id.tv_add7)
TextView tvAdd7;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -153,8 +146,10 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
private List<String> data4List;
private UserDataMachineAdapter data5Adapter;
private UserDataMachineAdapter data6Adapter;
private UserDataMachineAdapter data7Adapter;
private List<String> data5List;
private List<String> data6List;
private List<String> data7List;
private boolean canFinish;
private UserDataBean.ListBean data;
......@@ -167,6 +162,7 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData6.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData7.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
......@@ -180,18 +176,21 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
data4List = new ArrayList<>();
data5List = new ArrayList<>();
data6List = new ArrayList<>();
data7List = 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);
data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data6Adapter = new UserDataMachineAdapter(R.layout.item_machine, data6List);
data7Adapter = new UserDataMachineAdapter(R.layout.item_machine, data7List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
data6Adapter.bindToRecyclerView(rvData6);
data7Adapter.bindToRecyclerView(rvData7);
getMachineData(data.getContinuousCasterCode());
}
......@@ -237,20 +236,20 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
tvMiddle7.setText(castLadle.getBakingTemperature());
tvMiddle8.setText(String.valueOf(castLadle.getBakingDateTime()));
}
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent != null) {
tvCover1.setText(covAgent.getLadleCoveringAgentName());
tvCover2.setText(covAgent.getAcidAlkaliDegree());
tvCover3.setText(covAgent.getChemicalComposition());
tvCover4.setText(covAgent.getSupplierName());
}
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu != null) {
tvProtection1.setText(mouldFlu.getMouldFluxesName());
tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
tvProtection3.setText(mouldFlu.getChemicalComposition());
tvProtection4.setText(mouldFlu.getSupplierName());
}
// MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
// if (covAgent != null) {
// tvCover1.setText(covAgent.getLadleCoveringAgentName());
// tvCover2.setText(covAgent.getAcidAlkaliDegree());
// tvCover3.setText(covAgent.getChemicalComposition());
// tvCover4.setText(covAgent.getSupplierName());
// }
// MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
// if (mouldFlu != null) {
// tvProtection1.setText(mouldFlu.getMouldFluxesName());
// tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
// tvProtection3.setText(mouldFlu.getChemicalComposition());
// tvProtection4.setText(mouldFlu.getSupplierName());
// }
changeList();
}
});
......@@ -263,6 +262,7 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
data4List.clear();
data5List.clear();
data6List.clear();
data7List.clear();
if (machineDetailBean.getProductList() != null) {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName());
......@@ -299,6 +299,12 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
}
data6Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSpeeds() != null) {
for (MachineDetailBean.SpeedsBean productListBean : machineDetailBean.getSpeeds()) {
data7List.add(productListBean.getSteelGrade());
}
data7Adapter.notifyDataSetChanged();
}
}
@Override
......@@ -349,7 +355,7 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
@OnClick({R.id.rl_cover4, R.id.rl_protection4,
R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
R.id.tv_add7, R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
R.id.tv_add4})
public void onViewClicked(View view) {
switch (view.getId()) {
......@@ -368,6 +374,13 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
}
startActivity(MesThreeAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break;
case R.id.tv_add7:
if (machineDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break;
case R.id.tv_add2:
if (machineDetailBean == null) {
toast("数据加载中，请稍后");
......@@ -472,28 +485,29 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
castLadle.setLiquidSteelTemperature(tvMiddle5.getText().toString());
castLadle.setBakingMethod(tvMiddle6.getText().toString());
castLadle.setBakingTemperature(tvMiddle7.getText().toString());
if (!TextUtils.isEmpty(tvMiddle8.getText().toString()))
if (!TextUtils.isEmpty(tvMiddle8.getText().toString())) {
castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
covAgent.setLadleCoveringAgentName(tvCover1.getText().toString());
covAgent.setAcidAlkaliDegree(tvCover2.getText().toString());
covAgent.setChemicalComposition(tvCover3.getText().toString());
covAgent.setSupplierName(tvCover4.getText().toString());
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
mouldFlu.setAcidAlkaliDegree(tvProtection2.getText().toString());
mouldFlu.setChemicalComposition(tvProtection3.getText().toString());
mouldFlu.setSupplierName(tvProtection4.getText().toString());
// MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
// if (covAgent == null) {
// covAgent = new MachineDetailBean.CovAgentBean();
// machineDetailBean.setCovAgent(covAgent);
// }
// covAgent.setLadleCoveringAgentName(tvCover1.getText().toString());
// covAgent.setAcidAlkaliDegree(tvCover2.getText().toString());
// covAgent.setChemicalComposition(tvCover3.getText().toString());
// covAgent.setSupplierName(tvCover4.getText().toString());
//
// MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
// if (mouldFlu == null) {
// mouldFlu = new MachineDetailBean.MouldFluBean();
// machineDetailBean.setMouldFlu(mouldFlu);
// }
// mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
// mouldFlu.setAcidAlkaliDegree(tvProtection2.getText().toString());
// mouldFlu.setChemicalComposition(tvProtection3.getText().toString());
// mouldFlu.setSupplierName(tvProtection4.getText().toString());
}
private void submitMachine() {
......@@ -542,37 +556,4 @@ public class MesChooseMachineModifyActivity extends WorkToolBarActivity {
getMachineData(data.getContinuousCasterCode());
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case 10001:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
tvCover4.setText(modifyClient.getCustomerName());
covAgent.setSupplierCode(modifyClient.getCustomerCode());
covAgent.setSupplierName(modifyClient.getCustomerName());
}
break;
case 10002:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
tvProtection4.setText(modifyClient.getCustomerName());
mouldFlu.setSupplierCode(modifyClient.getCustomerCode());
mouldFlu.setSupplierCode(modifyClient.getCustomerName());
}
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesSpeedAddActivity.java 0 → 100644
浏览文件 @ c319e55b
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
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.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddMachineAddChildEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import org.greenrobot.eventbus.EventBus;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesSpeedAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_steel_type)
EditText tvSteelType;
@BindView(R.id.tv_speed)
EditText tvSpeed;
@BindView(R.id.rl_cover)
RelativeLayout rlCover;
@BindView(R.id.tv_cover1)
EditText tvCover1;
@BindView(R.id.tv_cover2)
EditText tvCover2;
@BindView(R.id.tv_cover3)
EditText tvCover3;
@BindView(R.id.tv_cover4)
TextView tvCover4;
@BindView(R.id.rl_cover4)
RelativeLayout rlCover4;
@BindView(R.id.ll_cover)
LinearLayout llCover;
@BindView(R.id.rl_protection)
RelativeLayout rlProtection;
@BindView(R.id.tv_protection1)
EditText tvProtection1;
@BindView(R.id.tv_protection2)
EditText tvProtection2;
@BindView(R.id.tv_protection3)
EditText tvProtection3;
@BindView(R.id.tv_protection4)
TextView tvProtection4;
@BindView(R.id.rl_protection4)
RelativeLayout rlProtection4;
@BindView(R.id.ll_protection)
LinearLayout llProtection;
// private Map<String, Object> param;
private String from;
private MachineDetailBean.SpeedsBean machineDetailBean;
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
from = getIntent().getStringExtra("from");
machineDetailBean = new MachineDetailBean.SpeedsBean();
machineDetailBean.setContinuousCasterCode(getIntent().getStringExtra("continuousCasterCode"));
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_speed_add;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
submit();
break;
}
return super.onOptionsItemSelected(item);
}
private void submit() {
String speed = tvSpeed.getText().toString();
String steelType = tvSteelType.getText().toString();
if (TextUtils.isEmpty(speed)) {
toast("请输入拉速");
return;
}
if (TextUtils.isEmpty(steelType)) {
toast("请输入钢种");
return;
}
machineDetailBean.setCastingSpeed(speed);
machineDetailBean.setSteelGrade(steelType );
MachineDetailBean.SpeedsBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.SpeedsBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
covAgent.setLadleCoveringAgentName(tvCover1.getText().toString());
covAgent.setAcidAlkaliDegreeCov(tvCover2.getText().toString());
covAgent.setChemicalCompositionCov(tvCover3.getText().toString());
MachineDetailBean.SpeedsBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.SpeedsBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
mouldFlu.setAcidAlkaliDegreeFlu(tvProtection2.getText().toString());
mouldFlu.setChemicalCompositionFlu(tvProtection3.getText().toString());
if (TextUtils.equals(from, "1")) {
EventBus.getDefault().post(new AddMachineAddChildEvent(7, JSON.toJSONString(machineDetailBean)));
finish();
} else {
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), JSON.toJSONString(machineDetailBean));
RtfUtils.getMesRtf().speedAdd("1", "1", requestBody).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("添加成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case 10001:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.SpeedsBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.SpeedsBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
tvCover4.setText(modifyClient.getCustomerName());
covAgent.setSupplierCodeCov(modifyClient.getCustomerCode());
covAgent.setSupplierNameCov(modifyClient.getCustomerName());
}
break;
case 10002:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.SpeedsBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.SpeedsBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
tvProtection4.setText(modifyClient.getCustomerName());
mouldFlu.setSupplierCodeFlu(modifyClient.getCustomerCode());
mouldFlu.setSupplierNameFlu(modifyClient.getCustomerName());
}
break;
}
}
@OnClick({R.id.rl_cover4, R.id.rl_protection4})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_cover4:
startActivityForResult(MesChooseClientActivity.class,
10001, "from", "1");
break;
case R.id.rl_protection4:
startActivityForResult(MesChooseClientActivity.class,
10002, "from", "1");
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesSpeedDetailActivity.java 0 → 100644
浏览文件 @ c319e55b
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddMachineModifyChildEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import org.greenrobot.eventbus.EventBus;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesSpeedDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_steel_type)
TextView tvSteelType;
@BindView(R.id.tv_speed)
TextView tvSpeed;
@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;
private String from;
private MachineDetailBean.SpeedsBean machineDetailBean;
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
from = getIntent().getStringExtra("from");
machineDetailBean = JSON.parseObject(getIntent().getStringExtra("data"), MachineDetailBean.SpeedsBean.class);
MachineDetailBean.SpeedsBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent != null) {
tvCover1.setText(covAgent.getLadleCoveringAgentName());
tvCover2.setText(covAgent.getAcidAlkaliDegreeCov());
tvCover3.setText(covAgent.getChemicalCompositionCov());
tvCover4.setText(covAgent.getSupplierNameCov());
}
MachineDetailBean.SpeedsBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu != null) {
tvProtection1.setText(mouldFlu.getMouldFluxesName());
tvProtection2.setText(mouldFlu.getAcidAlkaliDegreeFlu());
tvProtection3.setText(mouldFlu.getChemicalCompositionFlu());
tvProtection4.setText(mouldFlu.getSupplierNameFlu());
}
tvSpeed.setText(machineDetailBean.getCastingSpeed());
tvSteelType.setText(machineDetailBean.getSteelGrade());
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_speed_detail;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesSpeedModifyActivity.java 0 → 100644
浏览文件 @ c319e55b
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
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.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddMachineModifyChildEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import org.greenrobot.eventbus.EventBus;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesSpeedModifyActivity extends WorkToolBarActivity {
@BindView(R.id.tv_steel_type)
EditText tvSteelType;
@BindView(R.id.tv_speed)
EditText tvSpeed;
@BindView(R.id.rl_cover)
RelativeLayout rlCover;
@BindView(R.id.tv_cover1)
EditText tvCover1;
@BindView(R.id.tv_cover2)
EditText tvCover2;
@BindView(R.id.tv_cover3)
EditText tvCover3;
@BindView(R.id.tv_cover4)
TextView tvCover4;
@BindView(R.id.rl_cover4)
RelativeLayout rlCover4;
@BindView(R.id.ll_cover)
LinearLayout llCover;
@BindView(R.id.rl_protection)
RelativeLayout rlProtection;
@BindView(R.id.tv_protection1)
EditText tvProtection1;
@BindView(R.id.tv_protection2)
EditText tvProtection2;
@BindView(R.id.tv_protection3)
EditText tvProtection3;
@BindView(R.id.tv_protection4)
TextView tvProtection4;
@BindView(R.id.rl_protection4)
RelativeLayout rlProtection4;
@BindView(R.id.ll_protection)
LinearLayout llProtection;
private String from;
private MachineDetailBean.SpeedsBean machineDetailBean;
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
from = getIntent().getStringExtra("from");
machineDetailBean = JSON.parseObject(getIntent().getStringExtra("data"), MachineDetailBean.SpeedsBean.class);
MachineDetailBean.SpeedsBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent != null) {
tvCover1.setText(covAgent.getLadleCoveringAgentName());
tvCover2.setText(covAgent.getAcidAlkaliDegreeCov());
tvCover3.setText(covAgent.getChemicalCompositionCov());
tvCover4.setText(covAgent.getSupplierNameCov());
}
MachineDetailBean.SpeedsBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu != null) {
tvProtection1.setText(mouldFlu.getMouldFluxesName());
tvProtection2.setText(mouldFlu.getAcidAlkaliDegreeFlu());
tvProtection3.setText(mouldFlu.getChemicalCompositionFlu());
tvProtection4.setText(mouldFlu.getSupplierNameFlu());
}
tvSpeed.setText(machineDetailBean.getCastingSpeed());
tvSteelType.setText(machineDetailBean.getSteelGrade());
}
private void submit() {
String speed = tvSpeed.getText().toString();
String steelType = tvSteelType.getText().toString();
if (TextUtils.isEmpty(speed)) {
toast("请输入拉速");
return;
}
if (TextUtils.isEmpty(steelType)) {
toast("请输入钢种");
return;
}
machineDetailBean.setCastingSpeed(speed);
machineDetailBean.setSteelGrade(steelType);
if (TextUtils.equals(from, "1")) {
EventBus.getDefault().post(new AddMachineModifyChildEvent(7, JSON.toJSONString(machineDetailBean)
, Integer.valueOf(getIntent().getStringExtra("position"))));
finish();
return;
}
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), JSON.toJSONString(machineDetailBean));
RtfUtils.getMesRtf().speedAdd("1", "2", requestBody).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
finish();
toast("编辑成功");
EventBus.getDefault().post(new RefreshMachineEvent());
}
});
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_user_data_speed_add;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
submit();
break;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case 10001:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.SpeedsBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.SpeedsBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
tvCover4.setText(modifyClient.getCustomerName());
covAgent.setSupplierCodeCov(modifyClient.getCustomerCode());
covAgent.setSupplierNameCov(modifyClient.getCustomerName());
}
break;
case 10002:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.SpeedsBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.SpeedsBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
tvProtection4.setText(modifyClient.getCustomerName());
mouldFlu.setSupplierCodeFlu(modifyClient.getCustomerCode());
mouldFlu.setSupplierNameFlu(modifyClient.getCustomerName());
}
break;
}
}
@OnClick({R.id.rl_cover4, R.id.rl_protection4})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_cover4:
startActivityForResult(MesChooseClientActivity.class,
10001, "from", "1");
break;
case R.id.rl_protection4:
startActivityForResult(MesChooseClientActivity.class,
10002, "from", "1");
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserClientActivity.java 0 → 100644
浏览文件 @ c319e55b
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.MesClientBean;
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.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.disposables.Disposable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesUserClientActivity extends WorkToolBarActivity {
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.btn_search)
Button btnSearch;
@BindView(R.id.rv_client)
RecyclerView rvClient;
private Map<String, Object> param;
private List<MesClientBean.ListBean> clientList;
private UserDataClientAdapter clientAdapter;
private int page = 1;
private Map<String, Object> paramMap;
@Override
protected void initView() {
ButterKnife.bind(this);
rvClient.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
clientList = new ArrayList<>();
clientAdapter = new UserDataClientAdapter(R.layout.item_user_data_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
param = WorkUtils.pageMesKey();
paramMap = WorkUtils.simpleParam();
// param.put("pageNum", 1);
// param.put("paramMap",paramMap);
getData();
}
private void getData() {
RtfUtils.getMesRtf().userClientList("1",WorkUtils.convertMapToBody(paramMap)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMessage());
return;
}
List<MesClientBean.ListBean> getList = JSON.parseArray(data.getData().toString(), MesClientBean.ListBean.class);
// if (page == 1) {
clientList.clear();
clientList.addAll(getList);
clientAdapter.notifyDataSetChanged();
// clientAdapter.loadMoreComplete();
// } else {
// clientAdapter.loadMoreComplete();
// clientList.addAll(getList);
// clientAdapter.notifyDataSetChanged();
// }
// if (getList.size() == 0) {
// clientAdapter.loadMoreEnd();
// } else {
// page++;
// }
toast("搜索成功");
}
});
}
@Override
protected void initEvent() {
// clientAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
// @Override
// public void onLoadMoreRequested() {
// param.put("pageNum", page);
// getData();
// }
// }, rvClient);
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
MesClientBean.ListBean chooseClient = clientList.get(position);
if (TextUtils.equals("1",getIntent().getStringExtra("from"))){//
Intent intent =new Intent();
intent.putExtra("data",JSON.toJSONString(chooseClient));
setResult(10001,intent);
finish();
}else{
UserDataBean.ListBean userDataBean = new UserDataBean.ListBean();
userDataBean.setCustomerUserCode(chooseClient.getCustomerUserCode());
userDataBean.setCustomerUserName(chooseClient.getCustomerUserName());
userDataBean.setSalesCompanyCode(chooseClient.getSalesCompanyCode());
userDataBean.setSalesCompanyName(chooseClient.getSalesCompanyName());
userDataBean.setSalesManagerCode(chooseClient.getSalesManagerCode());
userDataBean.setSalesManagerName(chooseClient.getSalesManagerName());
startActivity(MesUserDataAdd2Activity.class, "data", JSON.toJSONString(userDataBean));
}
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_bat_sale_client;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
paramMap.put("customerName", etKey.getText().toString());
param.put("pageNum", 1);
page = 1;
getData();
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(AddUserDataEvent event) {
finish();
}
}
\ No newline at end of file
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd2Activity.java
浏览文件 @ c319e55b
......@@ -60,38 +60,8 @@ public class MesUserDataAdd2Activity extends WorkToolBarActivity {
tvClient.setText(data.getCustomerUserName());
tvCompany.setText(data.getSalesCompanyName());
tvManager.setText(data.getSalesManagerName());
// getData();
}
private void getData() {
RtfUtils.getRtf().getAccount().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
dataBean = JSON.parseObject(data.getData().toString(), AccountBean.class);
// tvName.setText(dataBean.getName());
// tvDpeName.setText(dataBean.getName());
// tvDpePrice.setText(MathUtils.converData(dataBean.getBalance(), 2));
// tvDpeFreezePrice.setText(String.valueOf(dataBean.getFrozenAmount()));
}
});
}
@Override
protected void initEvent() {
......@@ -102,33 +72,6 @@ public class MesUserDataAdd2Activity extends WorkToolBarActivity {
return R.layout.activity_mes_user_data_add2;
}
// @Override
// public boolean onCreateOptionsMenu(Menu menu) {
// getMenuInflater().inflate(R.menu.menu_finish, menu);
// return super.onCreateOptionsMenu(menu);
// }
//
// @Override
// public boolean onOptionsItemSelected(MenuItem item) {
// switch (item.getItemId()) {
// case R.id.finish:
// startActivity(MesUserDataAdd3Activity.class);
// break;
// }
// return super.onOptionsItemSelected(item);
// }
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
String clientName = data.getStringExtra("clientName");
// clientId = data.getIntExtra("id", 0);
// tvClient.setText(clientName);
}
}
@OnClick(R.id.rl_factory)
public void onViewClicked() {
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAddActivity.java
浏览文件 @ c319e55b
......@@ -26,7 +26,6 @@ public class MesUserDataAddActivity extends WorkToolBarActivity {
TextView tvClient;
@BindView(R.id.rl_client)
RelativeLayout rlClient;
private AccountBean dataBean;
@Override
protected void initView() {
......@@ -66,7 +65,7 @@ public class MesUserDataAddActivity extends WorkToolBarActivity {
@OnClick(R.id.rl_client)
public void onViewClicked() {
// startActivityForResult(MesChooseClientActivity.class, 10001);
startActivity(MesChooseClientActivity.class);
startActivity(MesUserClientActivity.class);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ c319e55b
package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.Menu;
......@@ -25,13 +26,8 @@ import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.UserDataAdd3Adapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3AddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataDetailFactory1Adapter;
import com.wd.workoffice.ui.adapter.UserDataDetailFactory2Adapter;
import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
import com.wd.workoffice.util.WorkUtils;
......@@ -181,6 +177,10 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
TextView tvAdd2;
@BindView(R.id.tv_machine_name)
TextView tvMachineName;
@BindView(R.id.rv_data7)
RecyclerView rvData7;
@BindView(R.id.tv_add7)
TextView tvAdd7;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -199,8 +199,10 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
private UserDataMachineAdapter data5Adapter;
private UserDataMachineAdapter data6Adapter;
private UserDataMachineAdapter data7Adapter;
private List<String> data5List;
private List<String> data6List;
private List<String> data7List;
private UserDataDetailBean userDataDetailBean;
......@@ -216,12 +218,14 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
tvAdd4.setVisibility(View.GONE);
tvAdd5.setVisibility(View.GONE);
tvAdd6.setVisibility(View.GONE);
tvAdd7.setVisibility(View.GONE);
rvData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData6.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData7.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
......@@ -236,18 +240,21 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
data4List = new ArrayList<>();
data5List = new ArrayList<>();
data6List = new ArrayList<>();
data7List = 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);
data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data6Adapter = new UserDataMachineAdapter(R.layout.item_machine, data6List);
data7Adapter = new UserDataMachineAdapter(R.layout.item_machine, data7List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
data6Adapter.bindToRecyclerView(rvData6);
data7Adapter.bindToRecyclerView(rvData7);
dataFactory1List = new ArrayList<>();
dataFactory2List = new ArrayList<>();
dataFactory3List = new ArrayList<>();
......@@ -401,20 +408,20 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
tvMiddle7.setText(castLadle.getBakingTemperature());
tvMiddle8.setText(TimeUtils.millis2String(castLadle.getBakingDateTime()));
}
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent != null) {
tvCover1.setText(covAgent.getLadleCoveringAgentName());
tvCover2.setText(covAgent.getAcidAlkaliDegree());
tvCover3.setText(covAgent.getChemicalComposition());
tvCover4.setText(covAgent.getSupplierName());
}
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu != null) {
tvProtection1.setText(mouldFlu.getMouldFluxesName());
tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
tvProtection3.setText(mouldFlu.getChemicalComposition());
tvProtection4.setText(mouldFlu.getSupplierName());
}
// MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
// if (covAgent != null) {
// tvCover1.setText(covAgent.getLadleCoveringAgentName());
// tvCover2.setText(covAgent.getAcidAlkaliDegree());
// tvCover3.setText(covAgent.getChemicalComposition());
// tvCover4.setText(covAgent.getSupplierName());
// }
// MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
// if (mouldFlu != null) {
// tvProtection1.setText(mouldFlu.getMouldFluxesName());
// tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
// tvProtection3.setText(mouldFlu.getChemicalComposition());
// tvProtection4.setText(mouldFlu.getSupplierName());
// }
changeList();
}
});
......@@ -427,6 +434,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
data4List.clear();
data5List.clear();
data6List.clear();
data7List.clear();
if (machineDetailBean.getProductList() != null) {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName());
......@@ -463,6 +471,12 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
}
data6Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSpeeds() != null) {
for (MachineDetailBean.SpeedsBean productListBean : machineDetailBean.getSpeeds()) {
data7List.add(productListBean.getSteelGrade());
}
data7Adapter.notifyDataSetChanged();
}
}
@Override
......@@ -503,6 +517,12 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
startActivity(MesMiddleDetailActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
}
});
data7Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSpeedDetailActivity.class, "data", JSON.toJSONString(machineDetailBean.getSpeeds().get(position)));
}
});
}
@Override
......@@ -511,10 +531,17 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_add5, R.id.tv_add6, R.id.btn_agree,
R.id.btn_refuse, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add,R.id.rl_middle,R.id.rl_cover,R.id.rl_protection})
@OnClick({R.id.tv_add7,R.id.tv_add5, R.id.tv_add6, R.id.btn_agree,
R.id.btn_refuse, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_add7:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add1:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailAddActivity.java
浏览文件 @ c319e55b
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
......@@ -24,7 +25,6 @@ import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -194,6 +194,10 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
TextView tvFactoryAdd2;
@BindView(R.id.tv_factory_add3)
TextView tvFactoryAdd3;
@BindView(R.id.rv_data7)
RecyclerView rvData7;
@BindView(R.id.tv_add7)
TextView tvAdd7;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -212,8 +216,10 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
private UserDataMachineAdapter data5Adapter;
private UserDataMachineAdapter data6Adapter;
private UserDataMachineAdapter data7Adapter;
private List<String> data5List;
private List<String> data6List;
private List<String> data7List;
private UserDataDetailBean dataParam;
@Override
......@@ -227,7 +233,7 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData6.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData7.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData3.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
......@@ -245,18 +251,21 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
data4List = new ArrayList<>();
data5List = new ArrayList<>();
data6List = new ArrayList<>();
data7List = 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);
data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data6Adapter = new UserDataMachineAdapter(R.layout.item_machine, data6List);
data7Adapter = new UserDataMachineAdapter(R.layout.item_machine, data7List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
data6Adapter.bindToRecyclerView(rvData6);
data7Adapter.bindToRecyclerView(rvData7);
dataFactory1List = new ArrayList<>();
dataFactory2List = new ArrayList<>();
dataFactory3List = new ArrayList<>();
......@@ -270,7 +279,6 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
}
private void changeInfo() {
UserDataDetailBean.MainInfoBean mainInfo = dataParam.getMainInfo();
if (mainInfo != null) {
......@@ -282,7 +290,7 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
if (!TextUtils.equals("1", getIntent().getStringExtra("from"))) {//不是多步新增，需获取数据
getMachineData(dataParam.getSteelInfo().getContinuousCasterCode());
getFactoryData(dataParam.getSteelInfo().getSteelmakingWorksCode());
}else {
} else {
changeFactoryInfo();
changeList();
}
......@@ -368,8 +376,15 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
MachineDetailBean machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
dataParam.setCastInfo(machineDetailBean.getCastInfo());
dataParam.setCastLadle(machineDetailBean.getCastLadle());
dataParam.setCovAgent(machineDetailBean.getCovAgent());
dataParam.setMouldFlu(machineDetailBean.getMouldFlu());
// dataParam.setCovAgent(machineDetailBean.getCovAgent());
// dataParam.setMouldFlu(machineDetailBean.getMouldFlu());
dataParam.setSpeeds(machineDetailBean.getSpeeds());
dataParam.setProductList(machineDetailBean.getProductList());
dataParam.setSettleList(machineDetailBean.getSettleList());
dataParam.setStockList(machineDetailBean.getStockList());
dataParam.setSupplyList(machineDetailBean.getSupplyList());
dataParam.setOtherLadleList(machineDetailBean.getOtherLadleList());
dataParam.setOtherSupList(machineDetailBean.getOtherSupList());
changeList();
}
});
......@@ -395,26 +410,27 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
tvMiddle7.setText(castLadle.getBakingTemperature());
tvMiddle8.setText(String.valueOf(castLadle.getBakingDateTime()));
}
MachineDetailBean.CovAgentBean covAgent = dataParam.getCovAgent();
if (covAgent != null) {
tvCover1.setText(covAgent.getLadleCoveringAgentName());
tvCover2.setText(covAgent.getAcidAlkaliDegree());
tvCover3.setText(covAgent.getChemicalComposition());
tvCover4.setText(covAgent.getSupplierName());
}
MachineDetailBean.MouldFluBean mouldFlu = dataParam.getMouldFlu();
if (mouldFlu != null) {
tvProtection1.setText(mouldFlu.getMouldFluxesName());
tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
tvProtection3.setText(mouldFlu.getChemicalComposition());
tvProtection4.setText(mouldFlu.getSupplierName());
}
// MachineDetailBean.CovAgentBean covAgent = dataParam.getCovAgent();
// if (covAgent != null) {
// tvCover1.setText(covAgent.getLadleCoveringAgentName());
// tvCover2.setText(covAgent.getAcidAlkaliDegree());
// tvCover3.setText(covAgent.getChemicalComposition());
// tvCover4.setText(covAgent.getSupplierName());
// }
// MachineDetailBean.MouldFluBean mouldFlu = dataParam.getMouldFlu();
// if (mouldFlu != null) {
// tvProtection1.setText(mouldFlu.getMouldFluxesName());
// tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
// tvProtection3.setText(mouldFlu.getChemicalComposition());
// tvProtection4.setText(mouldFlu.getSupplierName());
// }
data1List.clear();
data2List.clear();
data3List.clear();
data4List.clear();
data5List.clear();
data6List.clear();
data7List.clear();
if (dataParam.getProductList() != null) {
for (MachineDetailBean.ProductListBean productListBean : dataParam.getProductList()) {
data1List.add(productListBean.getProductsName());
......@@ -451,6 +467,12 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
}
data6Adapter.notifyDataSetChanged();
}
if (dataParam.getSpeeds() != null) {
for (MachineDetailBean.SpeedsBean speedsBean : dataParam.getSpeeds()) {
data7List.add(speedsBean.getSteelGrade());
}
data7Adapter.notifyDataSetChanged();
}
}
@Override
......@@ -557,6 +579,17 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
}
}
});
data7Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(from, "1")) {
startActivity(MesSpeedModifyActivity.class,
"position", position + "", "from", "1", "data", JSON.toJSONString(dataParam.getSettleList().get(position)));
} else {
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(dataParam.getSettleList().get(position)));
}
}
});
}
@Override
......@@ -567,8 +600,8 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
@OnClick({R.id.tv_factory_add1, R.id.tv_factory_add2, R.id.tv_factory_add3,
R.id.rl_cover4, R.id.rl_protection4, R.id.iv_modify_client,
R.id.iv_modify_machine, R.id.iv_modify_steel,
R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
R.id.tv_add4,R.id.rl_middle,R.id.rl_cover,R.id.rl_protection})
R.id.tv_add7, R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
R.id.tv_add4, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection})
public void onViewClicked(View view) {
String from = getIntent().getStringExtra("from");//1 .多步骤新增（同时新增）
switch (view.getId()) {
......@@ -611,6 +644,14 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
submitFactory();
}
break;
case R.id.tv_add7:
if (TextUtils.equals("1", from)) {
startActivity(MesSpeedAddActivity.class,
"from", "1", "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
} else {
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
}
break;
case R.id.tv_add1:
if (TextUtils.equals("1", from)) {
startActivity(MesThreeAddActivity.class,
......@@ -626,7 +667,6 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
} else {
startActivity(MesSupplierAddActivity.class, "continuousCasterCode", dataParam.getSteelInfo().getContinuousCasterCode());
}
// startActivity(MesSupplierAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add3:
if (TextUtils.equals("1", from)) {
......@@ -832,26 +872,26 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
}
MachineDetailBean.CovAgentBean covAgent = dataParam.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.CovAgentBean();
dataParam.setCovAgent(covAgent);
}
covAgent.setLadleCoveringAgentName(tvCover1.getText().toString());
covAgent.setAcidAlkaliDegree(tvCover2.getText().toString());
covAgent.setChemicalComposition(tvCover3.getText().toString());
covAgent.setSupplierName(tvCover4.getText().toString());
MachineDetailBean.MouldFluBean mouldFlu = dataParam.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.MouldFluBean();
dataParam.setMouldFlu(mouldFlu);
}
mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
mouldFlu.setAcidAlkaliDegree(tvProtection2.getText().toString());
mouldFlu.setChemicalComposition(tvProtection3.getText().toString());
mouldFlu.setSupplierName(tvProtection4.getText().toString());
// MachineDetailBean.CovAgentBean covAgent = dataParam.getCovAgent();
// if (covAgent == null) {
// covAgent = new MachineDetailBean.CovAgentBean();
// dataParam.setCovAgent(covAgent);
// }
// covAgent.setLadleCoveringAgentName(tvCover1.getText().toString());
// covAgent.setAcidAlkaliDegree(tvCover2.getText().toString());
// covAgent.setChemicalComposition(tvCover3.getText().toString());
// covAgent.setSupplierName(tvCover4.getText().toString());
//
//
// MachineDetailBean.MouldFluBean mouldFlu = dataParam.getMouldFlu();
// if (mouldFlu == null) {
// mouldFlu = new MachineDetailBean.MouldFluBean();
// dataParam.setMouldFlu(mouldFlu);
// }
// mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
// mouldFlu.setAcidAlkaliDegree(tvProtection2.getText().toString());
// mouldFlu.setChemicalComposition(tvProtection3.getText().toString());
// mouldFlu.setSupplierName(tvProtection4.getText().toString());
}
private void changeFactoryParam() {
......@@ -1025,6 +1065,13 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
}
dataParam.getSettleList().add(JSON.parseObject(event.getData(), MachineDetailBean.SettleListBean.class));
break;
case 7:
List<MachineDetailBean.SpeedsBean> speedsList = dataParam.getSpeeds();
if (speedsList == null) {
dataParam.setSpeeds(new ArrayList<>());
}
dataParam.getSpeeds().add(JSON.parseObject(event.getData(), MachineDetailBean.SpeedsBean.class));
break;
}
changeList();
}
......@@ -1080,6 +1127,14 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
settleList.remove(event.getPosition());
settleList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.SettleListBean.class));
break;
case 7:
List<MachineDetailBean.SpeedsBean> speedList = dataParam.getSpeeds();
if (speedList == null) {
dataParam.setSpeeds(new ArrayList<>());
}
speedList.remove(event.getPosition());
speedList.add(event.getPosition(), JSON.parseObject(event.getData(), MachineDetailBean.SpeedsBean.class));
break;
}
changeList();
}
......@@ -1094,32 +1149,38 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case 10001:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.CovAgentBean covAgent = dataParam.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.CovAgentBean();
dataParam.setCovAgent(covAgent);
}
tvCover4.setText(modifyClient.getCustomerName());
covAgent.setSupplierCode(modifyClient.getCustomerCode());
covAgent.setSupplierName(modifyClient.getCustomerName());
}
// if (resultCode == 10001) {
// MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
// MachineDetailBean.CovAgentBean covAgent = dataParam.getCovAgent();
// if (covAgent == null) {
// covAgent = new MachineDetailBean.CovAgentBean();
// dataParam.setCovAgent(covAgent);
// }
// tvCover4.setText(modifyClient.getCustomerName());
// covAgent.setSupplierCode(modifyClient.getCustomerCode());
// covAgent.setSupplierName(modifyClient.getCustomerName());
// }
break;
case 10002:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.MouldFluBean mouldFlu = dataParam.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.MouldFluBean();
dataParam.setMouldFlu(mouldFlu);
}
tvProtection4.setText(modifyClient.getCustomerName());
mouldFlu.setSupplierCode(modifyClient.getCustomerCode());
mouldFlu.setSupplierCode(modifyClient.getCustomerName());
}
// if (resultCode == 10001) {
// MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
// MachineDetailBean.MouldFluBean mouldFlu = dataParam.getMouldFlu();
// if (mouldFlu == null) {
// mouldFlu = new MachineDetailBean.MouldFluBean();
// dataParam.setMouldFlu(mouldFlu);
// }
// tvProtection4.setText(modifyClient.getCustomerName());
// mouldFlu.setSupplierCode(modifyClient.getCustomerCode());
// mouldFlu.setSupplierCode(modifyClient.getCustomerName());
// }
break;
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailModifyActivity.java
浏览文件 @ c319e55b
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
......@@ -24,16 +23,12 @@ import com.wd.workoffice.bean.event.ModifyUserDataEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.MachineDetailBean;
import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.UserDataDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.UserDataAdd3AddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataDetailFactory1Adapter;
import com.wd.workoffice.ui.adapter.UserDataDetailFactory2Adapter;
import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
......@@ -46,7 +41,6 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
......@@ -197,6 +191,10 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
TextView tvFactoryAdd2;
@BindView(R.id.tv_factory_add3)
TextView tvFactoryAdd3;
@BindView(R.id.rv_data7)
RecyclerView rvData7;
@BindView(R.id.tv_add7)
TextView tvAdd7;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -212,12 +210,12 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
private UserDataAdd3AddAdapter factory1Adapter;
private UserDataAdd3RefAddAdapter factory2Adapter;
private UserDataAdd3LabelAddAdapter factory3Adapter;
private UserDataMachineAdapter data5Adapter;
private UserDataMachineAdapter data6Adapter;
private UserDataMachineAdapter data7Adapter;
private List<String> data5List;
private List<String> data6List;
private List<String> data7List;
private UserDataDetailBean userDataDetailBean;
private FactoryDetailBean factoryDetailBean;
private boolean canFinish;
......@@ -233,6 +231,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
rvData4.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData5.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData6.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvData7.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData1.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvFactoryData2.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
......@@ -250,18 +249,21 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
data4List = new ArrayList<>();
data5List = new ArrayList<>();
data6List = new ArrayList<>();
data7List = 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);
data4Adapter = new UserDataMachineAdapter(R.layout.item_machine, data4List);
data5Adapter = new UserDataMachineAdapter(R.layout.item_machine, data5List);
data6Adapter = new UserDataMachineAdapter(R.layout.item_machine, data6List);
data7Adapter = new UserDataMachineAdapter(R.layout.item_machine, data7List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
data3Adapter.bindToRecyclerView(rvData3);
data4Adapter.bindToRecyclerView(rvData4);
data5Adapter.bindToRecyclerView(rvData5);
data6Adapter.bindToRecyclerView(rvData6);
data7Adapter.bindToRecyclerView(rvData7);
dataFactory1List = new ArrayList<>();
dataFactory2List = new ArrayList<>();
dataFactory3List = new ArrayList<>();
......@@ -402,20 +404,20 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
tvMiddle7.setText(castLadle.getBakingTemperature());
tvMiddle8.setText(String.valueOf(castLadle.getBakingDateTime()));
}
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent != null) {
tvCover1.setText(covAgent.getLadleCoveringAgentName());
tvCover2.setText(covAgent.getAcidAlkaliDegree());
tvCover3.setText(covAgent.getChemicalComposition());
tvCover4.setText(covAgent.getSupplierName());
}
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu != null) {
tvProtection1.setText(mouldFlu.getMouldFluxesName());
tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
tvProtection3.setText(mouldFlu.getChemicalComposition());
tvProtection4.setText(mouldFlu.getSupplierName());
}
// MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
// if (covAgent != null) {
// tvCover1.setText(covAgent.getLadleCoveringAgentName());
// tvCover2.setText(covAgent.getAcidAlkaliDegree());
// tvCover3.setText(covAgent.getChemicalComposition());
// tvCover4.setText(covAgent.getSupplierName());
// }
// MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
// if (mouldFlu != null) {
// tvProtection1.setText(mouldFlu.getMouldFluxesName());
// tvProtection2.setText(mouldFlu.getAcidAlkaliDegree());
// tvProtection3.setText(mouldFlu.getChemicalComposition());
// tvProtection4.setText(mouldFlu.getSupplierName());
// }
changeList();
}
});
......@@ -428,6 +430,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
data4List.clear();
data5List.clear();
data6List.clear();
data7List.clear();
if (machineDetailBean.getProductList() != null) {
for (MachineDetailBean.ProductListBean productListBean : machineDetailBean.getProductList()) {
data1List.add(productListBean.getProductsName());
......@@ -464,6 +467,12 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
}
data6Adapter.notifyDataSetChanged();
}
if (machineDetailBean.getSpeeds() != null) {
for (MachineDetailBean.SpeedsBean productListBean : machineDetailBean.getSpeeds()) {
data7List.add(productListBean.getSteelGrade());
}
data7Adapter.notifyDataSetChanged();
}
}
@Override
......@@ -541,6 +550,12 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
startActivity(MesMiddleModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
}
});
data7Adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesSpeedModifyActivity.class, "data", JSON.toJSONString(machineDetailBean.getSettleList().get(position)));
}
});
}
@Override
......@@ -550,8 +565,8 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
@OnClick({R.id.tv_factory_add1, R.id.tv_factory_add2, R.id.tv_factory_add3, R.id.rl_cover4, R.id.rl_protection4, R.id.iv_modify_client, R.id.iv_modify_machine, R.id.iv_modify_steel,
R.id.tv_add5, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
R.id.tv_add4,R.id.rl_middle,R.id.rl_cover,R.id.rl_protection})
R.id.tv_add5,R.id.tv_add7, R.id.tv_add6, R.id.tv_add1, R.id.tv_add3,
R.id.tv_add4, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_factory_add1:
......@@ -643,6 +658,13 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
}
startActivity(MesMiddleAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.tv_add7:
if (userDataDetailBean == null) {
toast("数据加载中，请稍后");
return;
}
startActivity(MesSpeedAddActivity.class, "continuousCasterCode", userDataDetailBean.getSteelInfo().getContinuousCasterCode());
break;
case R.id.rl_middle:
if (llMiddle.getVisibility() == View.VISIBLE) {
llMiddle.setVisibility(View.GONE);
......@@ -782,29 +804,29 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
castLadle.setLiquidSteelTemperature(tvMiddle5.getText().toString());
castLadle.setBakingMethod(tvMiddle6.getText().toString());
castLadle.setBakingTemperature(tvMiddle7.getText().toString());
if (!TextUtils.isEmpty(tvMiddle8.getText().toString()))
castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
covAgent.setLadleCoveringAgentName(tvCover1.getText().toString());
covAgent.setAcidAlkaliDegree(tvCover2.getText().toString());
covAgent.setChemicalComposition(tvCover3.getText().toString());
covAgent.setSupplierName(tvCover4.getText().toString());
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
mouldFlu.setAcidAlkaliDegree(tvProtection2.getText().toString());
mouldFlu.setChemicalComposition(tvProtection3.getText().toString());
mouldFlu.setSupplierName(tvProtection4.getText().toString());
// if (!TextUtils.isEmpty(tvMiddle8.getText().toString()))
// castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
// MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
// if (covAgent == null) {
// covAgent = new MachineDetailBean.CovAgentBean();
// machineDetailBean.setCovAgent(covAgent);
// }
// covAgent.setLadleCoveringAgentName(tvCover1.getText().toString());
// covAgent.setAcidAlkaliDegree(tvCover2.getText().toString());
// covAgent.setChemicalComposition(tvCover3.getText().toString());
// covAgent.setSupplierName(tvCover4.getText().toString());
//
//
// MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
// if (mouldFlu == null) {
// mouldFlu = new MachineDetailBean.MouldFluBean();
// machineDetailBean.setMouldFlu(mouldFlu);
// }
// mouldFlu.setMouldFluxesName(tvProtection1.getText().toString());
// mouldFlu.setAcidAlkaliDegree(tvProtection2.getText().toString());
// mouldFlu.setChemicalComposition(tvProtection3.getText().toString());
// mouldFlu.setSupplierName(tvProtection4.getText().toString());
}
private void submitMachine() {
......@@ -934,37 +956,11 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
getData();
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
switch (requestCode) {
case 10001:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent == null) {
covAgent = new MachineDetailBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
tvCover4.setText(modifyClient.getCustomerName());
covAgent.setSupplierCode(modifyClient.getCustomerCode());
covAgent.setSupplierName(modifyClient.getCustomerName());
}
break;
case 10002:
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
tvProtection4.setText(modifyClient.getCustomerName());
mouldFlu.setSupplierCode(modifyClient.getCustomerCode());
mouldFlu.setSupplierCode(modifyClient.getCustomerName());
}
break;
}
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataClientAdapter.java
浏览文件 @ c319e55b
package com.wd.workoffice.ui.adapter;
import android.text.TextUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
......@@ -20,7 +22,7 @@ public class UserDataClientAdapter extends BaseQuickAdapter<MesClientBean.ListBe
@Override
protected void convert(BaseViewHolder helper, MesClientBean.ListBean item) {
helper.setText(R.id.tv_name, item.getCustomerName());
helper.setText(R.id.tv_name, TextUtils.isEmpty(item.getCustomerUserName())?item.getCustomerName():item.getCustomerUserName());
helper.setText(R.id.tv_person, item.getSalesCompanyName());
helper.setText(R.id.tv_sale, item.getSalesManagerName());
......
app/src/main/res/layout/activity_mes_user_data_detail.xml
浏览文件 @ c319e55b
......@@ -289,7 +289,6 @@
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="horizontal"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
......@@ -315,7 +314,6 @@
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="horizontal"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
......@@ -340,7 +338,6 @@
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
......@@ -462,6 +459,7 @@
<View style="@style/dividerX" />
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -485,9 +483,10 @@
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -511,7 +510,7 @@
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:id="@+id/rl_middle"
......@@ -756,9 +755,10 @@
</RelativeLayout>
</LinearLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:visibility="gone"
android:id="@+id/rl_cover"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -781,9 +781,10 @@
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_cover"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -897,9 +898,10 @@
</RelativeLayout>
</LinearLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:visibility="gone"
android:id="@+id/rl_protection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -927,6 +929,7 @@
<LinearLayout
android:id="@+id/ll_protection"
android:layout_width="match_parent"
android:visibility="gone"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
......@@ -1036,12 +1039,48 @@
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
<RelativeLayout
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"
android:layout_alignParentLeft="true"
android:text="连铸机钢种"
android:textSize="15sp" />
<LinearLayout
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_data7"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:text="添加 +"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:layout_marginTop="10mm"
android:paddingVertical="9mm">
<TextView
......
app/src/main/res/layout/activity_mes_user_data_detail_modify.xml
浏览文件 @ c319e55b
......@@ -491,6 +491,7 @@
<View style="@style/dividerX" />
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -514,9 +515,10 @@
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -540,7 +542,7 @@
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:id="@+id/rl_middle"
......@@ -789,6 +791,7 @@
<RelativeLayout
android:id="@+id/rl_cover"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -810,10 +813,11 @@
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<LinearLayout
android:id="@+id/ll_cover"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -926,12 +930,13 @@
</RelativeLayout>
</LinearLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:id="@+id/rl_protection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
......@@ -951,10 +956,11 @@
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<LinearLayout
android:id="@+id/ll_protection"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -1066,12 +1072,47 @@
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
<RelativeLayout
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"
android:layout_alignParentLeft="true"
android:text="连铸机钢种"
android:textSize="15sp" />
<LinearLayout
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_data7"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:text="添加 +"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:layout_marginTop="10mm"
android:paddingVertical="9mm">
<TextView
......
app/src/main/res/layout/activity_mes_user_data_factory_add.xml
浏览文件 @ c319e55b
......@@ -129,6 +129,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data3"
android:layout_width="match_parent"
android:layout_marginTop="10mm"
android:layout_height="wrap_content"
/>
......
app/src/main/res/layout/activity_mes_user_data_machine_add.xml
浏览文件 @ c319e55b
......@@ -97,6 +97,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:visibility="gone"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
......@@ -125,6 +126,7 @@
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:visibility="gone"
android:paddingVertical="9mm">
<TextView
......@@ -145,7 +147,7 @@
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:id="@+id/rl_middle"
......@@ -398,13 +400,14 @@
</RelativeLayout>
</LinearLayout>
<View style="@style/dividerX" />
<!--<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"
android:visibility="gone"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
......@@ -423,10 +426,11 @@
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<LinearLayout
android:id="@+id/ll_cover"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -556,6 +560,7 @@
android:id="@+id/rl_protection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
......@@ -575,9 +580,10 @@
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_protection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -701,12 +707,47 @@
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<RelativeLayout
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"
android:layout_alignParentLeft="true"
android:text="连铸机钢种"
android:textSize="15sp" />
<LinearLayout
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_data7"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:text="添加 +"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:layout_marginTop="10mm"
android:paddingVertical="9mm">
<TextView
......
app/src/main/res/layout/activity_mes_user_data_machine_detail.xml
浏览文件 @ c319e55b
......@@ -93,6 +93,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
......@@ -114,13 +115,14 @@
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:visibility="gone"
android:paddingVertical="9mm">
<TextView
......@@ -140,13 +142,14 @@
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<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">
......@@ -172,6 +175,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
......@@ -392,6 +396,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:visibility="gone"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
......@@ -410,12 +415,13 @@
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<LinearLayout
android:id="@+id/ll_cover"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
......@@ -526,13 +532,14 @@
</RelativeLayout>
</LinearLayout>
<View style="@style/dividerX" />
<!--<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"
android:visibility="gone"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
......@@ -551,12 +558,13 @@
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<LinearLayout
android:id="@+id/ll_protection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
......@@ -673,6 +681,43 @@
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="15sp" />
<LinearLayout
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_data7"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:text="添加 +"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:layout_marginTop="10mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
app/src/main/res/layout/activity_mes_user_data_machine_modify.xml
浏览文件 @ c319e55b
......@@ -14,11 +14,6 @@
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -113,9 +108,10 @@
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -139,9 +135,10 @@
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -410,10 +407,11 @@
</RelativeLayout>
</LinearLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<RelativeLayout
android:id="@+id/rl_cover"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -435,10 +433,11 @@
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<LinearLayout
android:id="@+id/ll_cover"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -554,6 +553,7 @@
<View style="@style/dividerX" />
<RelativeLayout
android:visibility="gone"
android:id="@+id/rl_protection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -576,9 +576,10 @@
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<View style="@style/dividerX" />
<!--<View style="@style/dividerX" />-->
<LinearLayout
android:visibility="gone"
android:id="@+id/ll_protection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -691,7 +692,41 @@
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
<RelativeLayout
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"
android:layout_alignParentLeft="true"
android:text="连铸机钢种"
android:textSize="15sp" />
<LinearLayout
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_data7"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tv_add7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:text="添加 +"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
app/src/main/res/layout/activity_mes_user_data_speed_add.xml 0 → 100644
浏览文件 @ c319e55b
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:gravity="center_horizontal"
android:orientation="vertical">
<RelativeLayout
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"
android:layout_alignParentLeft="true"
android:text="钢种"
android:textSize="14sp" />
<EditText
android:hint="请输入"
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:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
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"
android:layout_alignParentLeft="true"
android:text="拉速"
android:textSize="14sp" />
<EditText
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:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
<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"
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" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:visibility="gone"
android:layout_marginRight="3mm"
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<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"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<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" />
<EditText android:hint="请输入"
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: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" />
<EditText android:hint="请输入"
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: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" />
<EditText android:hint="请输入"
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:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_cover4"
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:hint="请输入"
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:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
<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"
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" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:visibility="gone"
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<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"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<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" />
<EditText android:hint="请输入"
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: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" />
<EditText android:hint="请输入"
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: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" />
<EditText android:hint="请输入"
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:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_protection4"
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:hint="请输入"
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:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/activity_mes_user_data_speed_detail.xml 0 → 100644
浏览文件 @ c319e55b
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:gravity="center_horizontal"
android:orientation="vertical">
<View style="@style/dividerX" />
<RelativeLayout
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"
android:layout_alignParentLeft="true"
android:text="钢种"
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:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
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"
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_cover"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:visibility="gone"
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" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<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"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<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_cover1"
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_cover2"
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_cover3"
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_cover4"
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>
</LinearLayout>
<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"
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" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:visibility="gone"
android:layout_marginRight="3mm"
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<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"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<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_protection1"
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_protection2"
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_protection3"
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_protection4"
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>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论