Skip to content

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

1.用户反馈 新增 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改,用户反馈 新增没通
上级 cec5a05f
隐藏空白字符变更
内嵌 并排
正在显示 包含 586 行增加 和 346 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ f7c3ced1
...@@ -1254,11 +1254,11 @@ ...@@ -1254,11 +1254,11 @@
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.mes.ticket.MesTicketLogActivity" android:name=".ui.activity.mes.ticket.MesTicketLogActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="工作日志" android:label="工作日志"
android:launchMode="singleTop" android:launchMode="singleTop"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:configChanges="orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.mes.ticket.MesTicketAddLogActivity" android:name=".ui.activity.mes.ticket.MesTicketAddLogActivity"
...@@ -1477,6 +1477,14 @@ ...@@ -1477,6 +1477,14 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.user.MesMiddleAddActivity"
android:configChanges="keyboardHidden|orientation"
android:label="中间包承包与结算情况"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.mes.search.MesSearchActivity" android:name=".ui.activity.mes.search.MesSearchActivity"
......
app/src/main/java/com/wd/workoffice/bean/event/AddUserDataEvent.java 0 → 100644
浏览文件 @ f7c3ced1
package com.wd.workoffice.bean.event;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class AddUserDataEvent {
public AddUserDataEvent() {
}
}
app/src/main/java/com/wd/workoffice/bean/mesBean/UserDataBean.java
浏览文件 @ f7c3ced1
...@@ -11,372 +11,372 @@ import java.util.List; ...@@ -11,372 +11,372 @@ import java.util.List;
**/ **/
public class UserDataBean extends BaseMesPageBean { public class UserDataBean extends BaseMesPageBean {
/**
* pageNum : 1
* pageSize : 10
* size : 10
* startRow : 1
* endRow : 10
* total : 18
* pages : 2
* list : [{"id":"30","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20040100036","customerUserCode":"KN00185","customerUserName":"客户1","salesCompanyCode":"company1","salesCompanyName":"公司1","salesManagerCode":"manager2","salesManagerName":"经理2","steelmakingInfoCode":"STEEL20040100036","feedbackDateTime":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","isCustomerArchives":true,"approvalUserId":"398c852b38e911ea8334fa163e1166bd","approvalUserName":"hello","approvalDateTime":"2020-04-09 16:54:20","approvalStatus":1,"remark":"","treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"lgc1","steelmakingWorksName":"Liangan7","annualOutput":"1111777","steelGrade":"88888777","continuousCasterName":"连铸机01","continuousCasterType":"铸机类型11","delete":null},{"id":"50","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042300006","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042300006","feedbackDateTime":"2020-04-23 15:00:38","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","isCustomerArchives":true,"approvalUserId":"398c852b38e911ea8334fa163e1166bd","approvalUserName":"hello","approvalDateTime":"2020-04-28 17:27:08","approvalStatus":1,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"lgc3","steelmakingWorksName":null,"annualOutput":null,"steelGrade":null,"continuousCasterName":"连铸机01","continuousCasterType":"铸机类型11","delete":null},{"id":"31","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20040100099","customerUserCode":"cust2","customerUserName":"客户2","salesCompanyCode":"company2","salesCompanyName":"公司2","salesManagerCode":"manager3","salesManagerName":"经理3","steelmakingInfoCode":"STEEL20040100099","feedbackDateTime":null,"createUserId":"","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","isCustomerArchives":false,"approvalUserId":"398c852b38e911ea8334fa163e1166bd","approvalUserName":"hello","approvalDateTime":"2020-04-07 17:54:21","approvalStatus":2,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"lgc2","steelmakingWorksName":"炼钢厂2","annualOutput":"200","steelGrade":"钢种","continuousCasterName":"212","continuousCasterType":"1","delete":null},{"id":"51","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042300007","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042300007","feedbackDateTime":"2020-04-23 16:06:12","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","isCustomerArchives":true,"approvalUserId":"398c852b38e911ea8334fa163e1166bd","approvalUserName":"hello","approvalDateTime":"2020-04-28 17:25:24","approvalStatus":1,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20042300004","steelmakingWorksName":"Lgc123","annualOutput":"1","steelGrade":"2","continuousCasterName":"Lzj123","continuousCasterType":"1","delete":null},{"id":"53","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900009","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900009","feedbackDateTime":"2020-04-29 16:29:58","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"isCustomerArchives":false,"approvalUserId":null,"approvalUserName":null,"approvalDateTime":null,"approvalStatus":0,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20040900002","steelmakingWorksName":"炼钢厂41","annualOutput":"100","steelGrade":"钢种","continuousCasterName":"Lzhji123","continuousCasterType":"1","delete":null},{"id":"52","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900008","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900008","feedbackDateTime":"2020-04-29 13:56:55","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"isCustomerArchives":false,"approvalUserId":null,"approvalUserName":null,"approvalDateTime":null,"approvalStatus":0,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20042900005","steelmakingWorksName":"Lgc009","annualOutput":"1","steelGrade":"2","continuousCasterName":"Lzhji009","continuousCasterType":"1","delete":null},{"id":"54","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900010","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900010","feedbackDateTime":"2020-04-29 16:38:50","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"isCustomerArchives":false,"approvalUserId":null,"approvalUserName":null,"approvalDateTime":null,"approvalStatus":0,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20042900006","steelmakingWorksName":"Lgc777","annualOutput":"1","steelGrade":"2","continuousCasterName":"Lzhuji7777","continuousCasterType":"1","delete":null},{"id":"55","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900011","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900011","feedbackDateTime":"2020-04-29 16:59:56","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"isCustomerArchives":false,"approvalUserId":null,"approvalUserName":null,"approvalDateTime":null,"approvalStatus":0,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20042900007","steelmakingWorksName":"Lgc555","annualOutput":"1","steelGrade":"2","continuousCasterName":"Lzhuji123","continuousCasterType":"1","delete":null},{"id":"57","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900012","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900012","feedbackDateTime":"2020-04-29 17:54:10","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"isCustomerArchives":false,"approvalUserId":null,"approvalUserName":null,"approvalDateTime":null,"approvalStatus":0,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20040900002","steelmakingWorksName":"炼钢厂41","annualOutput":"100","steelGrade":"钢种","continuousCasterName":"Lzhuji876","continuousCasterType":"1","delete":null},{"id":"58","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900013","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900013","feedbackDateTime":"2020-04-29 17:55:42","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","isCustomerArchives":true,"approvalUserId":"398c852b38e911ea8334fa163e1166bd","approvalUserName":"hello","approvalDateTime":"2020-04-30 09:26:58","approvalStatus":1,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20042900008","steelmakingWorksName":"Lgc3333","annualOutput":"1","steelGrade":"2","continuousCasterName":"Lzhj3333","continuousCasterType":"1","delete":null}]
* prePage : 0
* nextPage : 2
* isFirstPage : true
* isLastPage : false
* hasPreviousPage : false
* hasNextPage : true
* navigatePages : 8
* navigatepageNums : [1,2]
* navigateFirstPage : 1
* navigateLastPage : 2
* firstPage : 1
* lastPage : 2
*/
private List<ListBean> list;
public List<ListBean> getList() {
return list;
}
public void setList(List<ListBean> list) {
this.list = list;
}
public static class ListBean {
/** /**
* pageNum : 1 * id : 30
* pageSize : 10 * createDateTime : null
* size : 10 * updateDateTime : null
* startRow : 1 * feedbackInfoNo : FEED20040100036
* endRow : 10 * customerUserCode : KN00185
* total : 18 * customerUserName : 客户1
* pages : 2 * salesCompanyCode : company1
* list : [{"id":"30","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20040100036","customerUserCode":"KN00185","customerUserName":"客户1","salesCompanyCode":"company1","salesCompanyName":"公司1","salesManagerCode":"manager2","salesManagerName":"经理2","steelmakingInfoCode":"STEEL20040100036","feedbackDateTime":null,"createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","isCustomerArchives":true,"approvalUserId":"398c852b38e911ea8334fa163e1166bd","approvalUserName":"hello","approvalDateTime":"2020-04-09 16:54:20","approvalStatus":1,"remark":"","treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"lgc1","steelmakingWorksName":"Liangan7","annualOutput":"1111777","steelGrade":"88888777","continuousCasterName":"连铸机01","continuousCasterType":"铸机类型11","delete":null},{"id":"50","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042300006","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042300006","feedbackDateTime":"2020-04-23 15:00:38","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","isCustomerArchives":true,"approvalUserId":"398c852b38e911ea8334fa163e1166bd","approvalUserName":"hello","approvalDateTime":"2020-04-28 17:27:08","approvalStatus":1,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"lgc3","steelmakingWorksName":null,"annualOutput":null,"steelGrade":null,"continuousCasterName":"连铸机01","continuousCasterType":"铸机类型11","delete":null},{"id":"31","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20040100099","customerUserCode":"cust2","customerUserName":"客户2","salesCompanyCode":"company2","salesCompanyName":"公司2","salesManagerCode":"manager3","salesManagerName":"经理3","steelmakingInfoCode":"STEEL20040100099","feedbackDateTime":null,"createUserId":"","createUserName":null,"updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","isCustomerArchives":false,"approvalUserId":"398c852b38e911ea8334fa163e1166bd","approvalUserName":"hello","approvalDateTime":"2020-04-07 17:54:21","approvalStatus":2,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"lgc2","steelmakingWorksName":"炼钢厂2","annualOutput":"200","steelGrade":"钢种","continuousCasterName":"212","continuousCasterType":"1","delete":null},{"id":"51","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042300007","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042300007","feedbackDateTime":"2020-04-23 16:06:12","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","isCustomerArchives":true,"approvalUserId":"398c852b38e911ea8334fa163e1166bd","approvalUserName":"hello","approvalDateTime":"2020-04-28 17:25:24","approvalStatus":1,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20042300004","steelmakingWorksName":"Lgc123","annualOutput":"1","steelGrade":"2","continuousCasterName":"Lzj123","continuousCasterType":"1","delete":null},{"id":"53","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900009","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900009","feedbackDateTime":"2020-04-29 16:29:58","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"isCustomerArchives":false,"approvalUserId":null,"approvalUserName":null,"approvalDateTime":null,"approvalStatus":0,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20040900002","steelmakingWorksName":"炼钢厂41","annualOutput":"100","steelGrade":"钢种","continuousCasterName":"Lzhji123","continuousCasterType":"1","delete":null},{"id":"52","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900008","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900008","feedbackDateTime":"2020-04-29 13:56:55","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"isCustomerArchives":false,"approvalUserId":null,"approvalUserName":null,"approvalDateTime":null,"approvalStatus":0,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20042900005","steelmakingWorksName":"Lgc009","annualOutput":"1","steelGrade":"2","continuousCasterName":"Lzhji009","continuousCasterType":"1","delete":null},{"id":"54","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900010","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900010","feedbackDateTime":"2020-04-29 16:38:50","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"isCustomerArchives":false,"approvalUserId":null,"approvalUserName":null,"approvalDateTime":null,"approvalStatus":0,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20042900006","steelmakingWorksName":"Lgc777","annualOutput":"1","steelGrade":"2","continuousCasterName":"Lzhuji7777","continuousCasterType":"1","delete":null},{"id":"55","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900011","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900011","feedbackDateTime":"2020-04-29 16:59:56","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"isCustomerArchives":false,"approvalUserId":null,"approvalUserName":null,"approvalDateTime":null,"approvalStatus":0,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20042900007","steelmakingWorksName":"Lgc555","annualOutput":"1","steelGrade":"2","continuousCasterName":"Lzhuji123","continuousCasterType":"1","delete":null},{"id":"57","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900012","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900012","feedbackDateTime":"2020-04-29 17:54:10","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":null,"updateUserName":null,"isCustomerArchives":false,"approvalUserId":null,"approvalUserName":null,"approvalDateTime":null,"approvalStatus":0,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20040900002","steelmakingWorksName":"炼钢厂41","annualOutput":"100","steelGrade":"钢种","continuousCasterName":"Lzhuji876","continuousCasterType":"1","delete":null},{"id":"58","createDateTime":null,"updateDateTime":null,"feedbackInfoNo":"FEED20042900013","customerUserCode":"KN00185","customerUserName":"西宁特殊钢股份有限公司","salesCompanyCode":"GK31","salesCompanyName":"销售六公司","salesManagerCode":"EM1606001","salesManagerName":"袁安波","steelmakingInfoCode":"STEEL20042900013","feedbackDateTime":"2020-04-29 17:55:42","createUserId":"398c852b38e911ea8334fa163e1166bd","createUserName":"hello","updateUserId":"398c852b38e911ea8334fa163e1166bd","updateUserName":"hello","isCustomerArchives":true,"approvalUserId":"398c852b38e911ea8334fa163e1166bd","approvalUserName":"hello","approvalDateTime":"2020-04-30 09:26:58","approvalStatus":1,"remark":null,"treeId":null,"treeName":null,"treeParentId":null,"steelmakingWorksCode":"FACTORY20042900008","steelmakingWorksName":"Lgc3333","annualOutput":"1","steelGrade":"2","continuousCasterName":"Lzhj3333","continuousCasterType":"1","delete":null}] * salesCompanyName : 公司1
* prePage : 0 * salesManagerCode : manager2
* nextPage : 2 * salesManagerName : 经理2
* isFirstPage : true * steelmakingInfoCode : STEEL20040100036
* isLastPage : false * feedbackDateTime : null
* hasPreviousPage : false * createUserId : 398c852b38e911ea8334fa163e1166bd
* hasNextPage : true * createUserName : null
* navigatePages : 8 * updateUserId : 398c852b38e911ea8334fa163e1166bd
* navigatepageNums : [1,2] * updateUserName : hello
* navigateFirstPage : 1 * isCustomerArchives : true
* navigateLastPage : 2 * approvalUserId : 398c852b38e911ea8334fa163e1166bd
* firstPage : 1 * approvalUserName : hello
* lastPage : 2 * approvalDateTime : 2020-04-09 16:54:20
* approvalStatus : 1
* remark :
* treeId : null
* treeName : null
* treeParentId : null
* steelmakingWorksCode : lgc1
* steelmakingWorksName : Liangan7
* annualOutput : 1111777
* steelGrade : 88888777
* continuousCasterName : 连铸机01
* continuousCasterType : 铸机类型11
* delete : null
*/ */
private List<ListBean> list; private String id;
private Object createDateTime;
private Object updateDateTime;
public List<ListBean> getList() { private String feedbackInfoNo;
return list; private String customerUserCode;
} private String customerUserName;
private String salesCompanyCode;
public void setList(List<ListBean> list) { private String salesCompanyName;
this.list = list; private String salesManagerCode;
} private String salesManagerName;
private String steelmakingInfoCode;
public static class ListBean { private Object feedbackDateTime;
/** private String createUserId;
* id : 30 private Object createUserName;
* createDateTime : null private String updateUserId;
* updateDateTime : null private String updateUserName;
* feedbackInfoNo : FEED20040100036 private Boolean isCustomerArchives;
* customerUserCode : KN00185 private String approvalUserId;
* customerUserName : 客户1 private String approvalUserName;
* salesCompanyCode : company1 private String approvalDateTime;
* salesCompanyName : 公司1 private Integer approvalStatus;
* salesManagerCode : manager2 private String remark;
* salesManagerName : 经理2 private Object treeId;
* steelmakingInfoCode : STEEL20040100036 private Object treeName;
* feedbackDateTime : null private Object treeParentId;
* createUserId : 398c852b38e911ea8334fa163e1166bd private String steelmakingWorksCode;
* createUserName : null private String steelmakingWorksName;
* updateUserId : 398c852b38e911ea8334fa163e1166bd private String annualOutput;
* updateUserName : hello private String steelGrade;
* isCustomerArchives : true private String continuousCasterName;
* approvalUserId : 398c852b38e911ea8334fa163e1166bd private String continuousCasterCode;
* approvalUserName : hello private String continuousCasterType;
* approvalDateTime : 2020-04-09 16:54:20 private Object delete;
* approvalStatus : 1
* remark : public String getContinuousCasterCode() {
* treeId : null return continuousCasterCode;
* treeName : null }
* treeParentId : null
* steelmakingWorksCode : lgc1
* steelmakingWorksName : Liangan7
* annualOutput : 1111777
* steelGrade : 88888777
* continuousCasterName : 连铸机01
* continuousCasterType : 铸机类型11
* delete : null
*/
private String id;
private Object createDateTime;
private Object updateDateTime;
private String feedbackInfoNo;
private String customerUserCode;
private String customerUserName;
private String salesCompanyCode;
private String salesCompanyName;
private String salesManagerCode;
private String salesManagerName;
private String steelmakingInfoCode;
private Object feedbackDateTime;
private String createUserId;
private Object createUserName;
private String updateUserId;
private String updateUserName;
private boolean isCustomerArchives;
private String approvalUserId;
private String approvalUserName;
private String approvalDateTime;
private int approvalStatus;
private String remark;
private Object treeId;
private Object treeName;
private Object treeParentId;
private String steelmakingWorksCode;
private String steelmakingWorksName;
private String annualOutput;
private String steelGrade;
private String continuousCasterName;
private String continuousCasterCode;
private String continuousCasterType;
private Object delete;
public String getContinuousCasterCode() {
return continuousCasterCode;
}
public void setContinuousCasterCode(String continuousCasterCode) {
this.continuousCasterCode = continuousCasterCode;
}
public String getId() {
return id;
}
public void setId(String 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 String getFeedbackInfoNo() {
return feedbackInfoNo;
}
public void setFeedbackInfoNo(String feedbackInfoNo) {
this.feedbackInfoNo = feedbackInfoNo;
}
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 getSalesCompanyCode() {
return salesCompanyCode;
}
public void setSalesCompanyCode(String salesCompanyCode) {
this.salesCompanyCode = salesCompanyCode;
}
public String getSalesCompanyName() {
return salesCompanyName;
}
public void setSalesCompanyName(String salesCompanyName) {
this.salesCompanyName = salesCompanyName;
}
public String getSalesManagerCode() {
return salesManagerCode;
}
public void setSalesManagerCode(String salesManagerCode) {
this.salesManagerCode = salesManagerCode;
}
public String getSalesManagerName() {
return salesManagerName;
}
public void setSalesManagerName(String salesManagerName) {
this.salesManagerName = salesManagerName;
}
public String getSteelmakingInfoCode() {
return steelmakingInfoCode;
}
public void setSteelmakingInfoCode(String steelmakingInfoCode) {
this.steelmakingInfoCode = steelmakingInfoCode;
}
public Object getFeedbackDateTime() { public void setContinuousCasterCode(String continuousCasterCode) {
return feedbackDateTime; this.continuousCasterCode = continuousCasterCode;
} }
public void setFeedbackDateTime(Object feedbackDateTime) { public String getId() {
this.feedbackDateTime = feedbackDateTime; return id;
} }
public String getCreateUserId() { public void setId(String id) {
return createUserId; this.id = id;
} }
public void setCreateUserId(String createUserId) { public Object getCreateDateTime() {
this.createUserId = createUserId; return createDateTime;
} }
public Object getCreateUserName() { public void setCreateDateTime(Object createDateTime) {
return createUserName; this.createDateTime = createDateTime;
} }
public void setCreateUserName(Object createUserName) { public Object getUpdateDateTime() {
this.createUserName = createUserName; return updateDateTime;
} }
public String getUpdateUserId() { public void setUpdateDateTime(Object updateDateTime) {
return updateUserId; this.updateDateTime = updateDateTime;
} }
public void setUpdateUserId(String updateUserId) { public String getFeedbackInfoNo() {
this.updateUserId = updateUserId; return feedbackInfoNo;
} }
public String getUpdateUserName() { public void setFeedbackInfoNo(String feedbackInfoNo) {
return updateUserName; this.feedbackInfoNo = feedbackInfoNo;
} }
public void setUpdateUserName(String updateUserName) { public String getCustomerUserCode() {
this.updateUserName = updateUserName; return customerUserCode;
} }
public boolean isIsCustomerArchives() { public void setCustomerUserCode(String customerUserCode) {
return isCustomerArchives; this.customerUserCode = customerUserCode;
} }
public void setIsCustomerArchives(boolean isCustomerArchives) { public String getCustomerUserName() {
this.isCustomerArchives = isCustomerArchives; return customerUserName;
} }
public String getApprovalUserId() { public void setCustomerUserName(String customerUserName) {
return approvalUserId; this.customerUserName = customerUserName;
} }
public void setApprovalUserId(String approvalUserId) { public String getSalesCompanyCode() {
this.approvalUserId = approvalUserId; return salesCompanyCode;
} }
public String getApprovalUserName() { public void setSalesCompanyCode(String salesCompanyCode) {
return approvalUserName; this.salesCompanyCode = salesCompanyCode;
} }
public void setApprovalUserName(String approvalUserName) { public String getSalesCompanyName() {
this.approvalUserName = approvalUserName; return salesCompanyName;
} }
public String getApprovalDateTime() { public void setSalesCompanyName(String salesCompanyName) {
return approvalDateTime; this.salesCompanyName = salesCompanyName;
} }
public void setApprovalDateTime(String approvalDateTime) { public String getSalesManagerCode() {
this.approvalDateTime = approvalDateTime; return salesManagerCode;
} }
public int getApprovalStatus() { public void setSalesManagerCode(String salesManagerCode) {
return approvalStatus; this.salesManagerCode = salesManagerCode;
} }
public void setApprovalStatus(int approvalStatus) { public String getSalesManagerName() {
this.approvalStatus = approvalStatus; return salesManagerName;
} }
public String getRemark() { public void setSalesManagerName(String salesManagerName) {
return remark; this.salesManagerName = salesManagerName;
} }
public void setRemark(String remark) { public String getSteelmakingInfoCode() {
this.remark = remark; return steelmakingInfoCode;
} }
public Object getTreeId() { public void setSteelmakingInfoCode(String steelmakingInfoCode) {
return treeId; this.steelmakingInfoCode = steelmakingInfoCode;
} }
public void setTreeId(Object treeId) { public Object getFeedbackDateTime() {
this.treeId = treeId; return feedbackDateTime;
} }
public Object getTreeName() { public void setFeedbackDateTime(Object feedbackDateTime) {
return treeName; this.feedbackDateTime = feedbackDateTime;
} }
public void setTreeName(Object treeName) { public String getCreateUserId() {
this.treeName = treeName; return createUserId;
} }
public Object getTreeParentId() { public void setCreateUserId(String createUserId) {
return treeParentId; this.createUserId = createUserId;
} }
public void setTreeParentId(Object treeParentId) { public Object getCreateUserName() {
this.treeParentId = treeParentId; return createUserName;
} }
public String getSteelmakingWorksCode() { public void setCreateUserName(Object createUserName) {
return steelmakingWorksCode; this.createUserName = createUserName;
} }
public void setSteelmakingWorksCode(String steelmakingWorksCode) { public String getUpdateUserId() {
this.steelmakingWorksCode = steelmakingWorksCode; return updateUserId;
} }
public String getSteelmakingWorksName() { public void setUpdateUserId(String updateUserId) {
return steelmakingWorksName; this.updateUserId = updateUserId;
} }
public void setSteelmakingWorksName(String steelmakingWorksName) { public String getUpdateUserName() {
this.steelmakingWorksName = steelmakingWorksName; return updateUserName;
} }
public String getAnnualOutput() { public void setUpdateUserName(String updateUserName) {
return annualOutput; this.updateUserName = updateUserName;
} }
public void setAnnualOutput(String annualOutput) { public Boolean isIsCustomerArchives() {
this.annualOutput = annualOutput; return isCustomerArchives;
} }
public String getSteelGrade() { public void setIsCustomerArchives(Boolean isCustomerArchives) {
return steelGrade; this.isCustomerArchives = isCustomerArchives;
} }
public void setSteelGrade(String steelGrade) { public String getApprovalUserId() {
this.steelGrade = steelGrade; return approvalUserId;
} }
public String getContinuousCasterName() { public void setApprovalUserId(String approvalUserId) {
return continuousCasterName; this.approvalUserId = approvalUserId;
} }
public void setContinuousCasterName(String continuousCasterName) { public String getApprovalUserName() {
this.continuousCasterName = continuousCasterName; return approvalUserName;
} }
public String getContinuousCasterType() { public void setApprovalUserName(String approvalUserName) {
return continuousCasterType; this.approvalUserName = approvalUserName;
} }
public void setContinuousCasterType(String continuousCasterType) { public String getApprovalDateTime() {
this.continuousCasterType = continuousCasterType; return approvalDateTime;
} }
public Object getDelete() { public void setApprovalDateTime(String approvalDateTime) {
return delete; this.approvalDateTime = approvalDateTime;
} }
public void setDelete(Object delete) { public Integer getApprovalStatus() {
this.delete = delete; return approvalStatus;
} }
public void setApprovalStatus(Integer approvalStatus) {
this.approvalStatus = approvalStatus;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Object getTreeId() {
return treeId;
}
public void setTreeId(Object treeId) {
this.treeId = treeId;
}
public Object getTreeName() {
return treeName;
}
public void setTreeName(Object treeName) {
this.treeName = treeName;
}
public Object getTreeParentId() {
return treeParentId;
}
public void setTreeParentId(Object treeParentId) {
this.treeParentId = treeParentId;
}
public String getSteelmakingWorksCode() {
return steelmakingWorksCode;
}
public void setSteelmakingWorksCode(String steelmakingWorksCode) {
this.steelmakingWorksCode = steelmakingWorksCode;
}
public String getSteelmakingWorksName() {
return steelmakingWorksName;
}
public void setSteelmakingWorksName(String steelmakingWorksName) {
this.steelmakingWorksName = steelmakingWorksName;
}
public String getAnnualOutput() {
return annualOutput;
}
public void setAnnualOutput(String annualOutput) {
this.annualOutput = annualOutput;
}
public String getSteelGrade() {
return steelGrade;
}
public void setSteelGrade(String steelGrade) {
this.steelGrade = steelGrade;
}
public String getContinuousCasterName() {
return continuousCasterName;
}
public void setContinuousCasterName(String continuousCasterName) {
this.continuousCasterName = continuousCasterName;
}
public String getContinuousCasterType() {
return continuousCasterType;
}
public void setContinuousCasterType(String continuousCasterType) {
this.continuousCasterType = continuousCasterType;
}
public Object getDelete() {
return delete;
}
public void setDelete(Object delete) {
this.delete = delete;
}
} }
} }
app/src/main/java/com/wd/workoffice/retrofit/MesApiService.java
浏览文件 @ f7c3ced1
...@@ -211,4 +211,21 @@ public interface MesApiService { ...@@ -211,4 +211,21 @@ public interface MesApiService {
@POST("/himes/api/msLadleRefractoryRecord/save.json") @POST("/himes/api/msLadleRefractoryRecord/save.json")
Observable<BaseMesBean> packageAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody); Observable<BaseMesBean> packageAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
/**
* otherSupplierAdd
*
* @return
*/
@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/msSceneFeedback/save.json")
Observable<BaseMesBean> userDataAdd(@Query("functionId") String functionId,@Query("option") String option, @Body RequestBody requestBody);
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseClientActivity.java
浏览文件 @ f7c3ced1
...@@ -13,6 +13,7 @@ import com.wd.workoffice.app.BaseBean; ...@@ -13,6 +13,7 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.BaseMesBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ClientBean; import com.wd.workoffice.bean.ClientBean;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.MesClientBean; import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.UserDataBean; import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
...@@ -22,6 +23,9 @@ import com.wd.workoffice.ui.adapter.StoreClientAdapter; ...@@ -22,6 +23,9 @@ import com.wd.workoffice.ui.adapter.StoreClientAdapter;
import com.wd.workoffice.ui.adapter.UserDataClientAdapter; import com.wd.workoffice.ui.adapter.UserDataClientAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -148,4 +152,21 @@ public class MesChooseClientActivity extends WorkToolBarActivity { ...@@ -148,4 +152,21 @@ public class MesChooseClientActivity extends WorkToolBarActivity {
page = 1; page = 1;
getData(); 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();
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryActivity.java
浏览文件 @ f7c3ced1
...@@ -17,6 +17,7 @@ import com.wd.workoffice.app.WorkToolBarActivity; ...@@ -17,6 +17,7 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ClientBean; import com.wd.workoffice.bean.ClientBean;
import com.wd.workoffice.bean.event.AddDepEvent; import com.wd.workoffice.bean.event.AddDepEvent;
import com.wd.workoffice.bean.event.AddFactoryEvent; import com.wd.workoffice.bean.event.AddFactoryEvent;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.FactoryBean; import com.wd.workoffice.bean.mesBean.FactoryBean;
import com.wd.workoffice.bean.mesBean.MesClientBean; import com.wd.workoffice.bean.mesBean.MesClientBean;
import com.wd.workoffice.bean.mesBean.UserDataBean; import com.wd.workoffice.bean.mesBean.UserDataBean;
...@@ -168,4 +169,9 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity { ...@@ -168,4 +169,9 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
@Subscribe @Subscribe
public void refresh(AddFactoryEvent event) { public void refresh(AddFactoryEvent event) {
} }
@Subscribe
public void finish(AddUserDataEvent event) {
finish();
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineActivity.java
浏览文件 @ f7c3ced1
...@@ -15,6 +15,7 @@ import com.wd.workoffice.app.BaseMesBean; ...@@ -15,6 +15,7 @@ import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ClientBean; import com.wd.workoffice.bean.ClientBean;
import com.wd.workoffice.bean.event.AddFactoryEvent; import com.wd.workoffice.bean.event.AddFactoryEvent;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.FactoryBean; import com.wd.workoffice.bean.mesBean.FactoryBean;
import com.wd.workoffice.bean.mesBean.MachineBean; import com.wd.workoffice.bean.mesBean.MachineBean;
import com.wd.workoffice.bean.mesBean.UserDataBean; import com.wd.workoffice.bean.mesBean.UserDataBean;
...@@ -159,4 +160,10 @@ public class MesChooseMachineActivity extends WorkToolBarActivity { ...@@ -159,4 +160,10 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
@Subscribe @Subscribe
public void refresh(AddFactoryEvent event) { public void refresh(AddFactoryEvent event) {
} }
@Subscribe
public void finish(AddUserDataEvent event) {
finish();
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java
浏览文件 @ f7c3ced1
package com.wd.workoffice.ui.activity.mes.user; package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
...@@ -12,7 +14,9 @@ import com.wd.workoffice.R; ...@@ -12,7 +14,9 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddTicketEvent; import com.wd.workoffice.bean.event.AddTicketEvent;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.event.RefreshMachineEvent; import com.wd.workoffice.bean.event.RefreshMachineEvent;
import com.wd.workoffice.bean.mesBean.MachineBean;
import com.wd.workoffice.bean.mesBean.MchineDetailBean; import com.wd.workoffice.bean.mesBean.MchineDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataBean; import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
...@@ -35,6 +39,8 @@ import butterknife.OnClick; ...@@ -35,6 +39,8 @@ import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils; import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
/** /**
* 用户数据采集，连铸机详情 * 用户数据采集，连铸机详情
...@@ -288,7 +294,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -288,7 +294,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
startActivity(MesPackageAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode()); startActivity(MesPackageAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break; break;
case R.id.rl_add: case R.id.rl_add:
startActivity(MesMiddleAddActivity.class, "data", JSON.toJSONString(data)); startActivity(MesMiddleAddActivity.class, "continuousCasterCode", data.getContinuousCasterCode());
break; break;
case R.id.rl_middle: case R.id.rl_middle:
if (llMiddle.getVisibility() == View.VISIBLE) { if (llMiddle.getVisibility() == View.VISIBLE) {
...@@ -330,4 +336,48 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity { ...@@ -330,4 +336,48 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
public void refresh(RefreshMachineEvent event) { public void refresh(RefreshMachineEvent event) {
getData(); getData();
} }
@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() {
data.setSteelmakingInfoCode("steelmakingInfoCode");
RtfUtils.getMesRtf().userDataAdd("1", "1", RequestBody.create(MediaType.parse("application/json; charset=utf-8"), JSON.toJSONString(data))).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMsg());
return;
}
toast("添加成功");
EventBus.getDefault().post(new AddUserDataEvent());
finish();
}
});
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesMiddleAddActivity.java
浏览文件 @ f7c3ced1
package com.wd.workoffice.ui.activity.mes.user; package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddFactoryEvent; import com.wd.workoffice.bean.event.AddFactoryEvent;
import com.wd.workoffice.bean.mesBean.MchineDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
/** /**
* author : flexible * author : flexible
...@@ -20,6 +35,13 @@ import butterknife.ButterKnife; ...@@ -20,6 +35,13 @@ import butterknife.ButterKnife;
public class MesMiddleAddActivity extends WorkToolBarActivity { public class MesMiddleAddActivity extends WorkToolBarActivity {
@BindView(R.id.et_middle_status)
EditText etMiddleStatus;
@BindView(R.id.et_three_status)
EditText etThreeStatus;
@BindView(R.id.et_type)
EditText etType;
private Map<String, Object> param;
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
...@@ -27,6 +49,8 @@ public class MesMiddleAddActivity extends WorkToolBarActivity { ...@@ -27,6 +49,8 @@ public class MesMiddleAddActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
param = WorkUtils.simpleParam();
param.put("continuousCasterCode", getIntent().getStringExtra("continuousCasterCode"));
} }
...@@ -36,7 +60,7 @@ public class MesMiddleAddActivity extends WorkToolBarActivity { ...@@ -36,7 +60,7 @@ public class MesMiddleAddActivity extends WorkToolBarActivity {
@Override @Override
protected int layoutId() { protected int layoutId() {
return R.layout.activity_mes_user_data_other_supplier; return R.layout.activity_mes_user_data_other_middle;
} }
...@@ -50,26 +74,42 @@ public class MesMiddleAddActivity extends WorkToolBarActivity { ...@@ -50,26 +74,42 @@ public class MesMiddleAddActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.finish: case R.id.finish:
finish(); submit();
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@Override private void submit() {
public void onStart() { String middleStatus = etMiddleStatus.getText().toString();
super.onStart(); String threeStatus = etThreeStatus.getText().toString();
EventBus.getDefault().register(this); String type = etType.getText().toString();
} param.put("ladleContractSituation", middleStatus);
param.put("continuousCastingContractSituation", threeStatus);
@Override param.put("settlementMethod", type);
public void onStop() { RtfUtils.getMesRtf().middleAdd("1", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
super.onStop(); @Override
EventBus.getDefault().unregister(this); public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseMesBean data) {
hideLoading();
if (!data.isSuccess()) {
toast(data.getMsg());
return;
}
finish();
toast("添加成功");
}
});
} }
@Subscribe
public void refresh(AddFactoryEvent event) {
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd2Activity.java
浏览文件 @ f7c3ced1
...@@ -12,10 +12,14 @@ import com.wd.workoffice.R; ...@@ -12,10 +12,14 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean; import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.UserDataBean; import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
...@@ -131,5 +135,20 @@ public class MesUserDataAdd2Activity extends WorkToolBarActivity { ...@@ -131,5 +135,20 @@ public class MesUserDataAdd2Activity extends WorkToolBarActivity {
// startActivityForResult(MesChooseFactoryActivity.class, 10001); // startActivityForResult(MesChooseFactoryActivity.class, 10001);
startActivity(MesChooseFactoryActivity.class, "data", JSON.toJSONString(data)); startActivity(MesChooseFactoryActivity.class, "data", JSON.toJSONString(data));
} }
@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();
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd3Activity.java
浏览文件 @ f7c3ced1
...@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSON; ...@@ -11,6 +11,7 @@ import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean; import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataBean; import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
...@@ -20,6 +21,9 @@ import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter; ...@@ -20,6 +21,9 @@ import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter; import com.wd.workoffice.ui.adapter.UserDataAdd3RefAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -175,5 +179,20 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity { ...@@ -175,5 +179,20 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
public void onViewClicked() { public void onViewClicked() {
startActivity(MesChooseMachineActivity.class,"data",JSON.toJSONString(data)); startActivity(MesChooseMachineActivity.class,"data",JSON.toJSONString(data));
} }
@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();
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAddActivity.java
浏览文件 @ f7c3ced1
...@@ -12,9 +12,13 @@ import com.wd.workoffice.R; ...@@ -12,9 +12,13 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean; import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
...@@ -76,13 +80,21 @@ public class MesUserDataAddActivity extends WorkToolBarActivity { ...@@ -76,13 +80,21 @@ public class MesUserDataAddActivity extends WorkToolBarActivity {
startActivity(MesChooseClientActivity.class); startActivity(MesChooseClientActivity.class);
} }
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { public void onStart() {
super.onActivityResult(requestCode, resultCode, data); super.onStart();
if (requestCode == 10001 && resultCode == 10001) { EventBus.getDefault().register(this);
String clientName = data.getStringExtra("clientName"); }
// clientId = data.getIntExtra("id", 0);
// tvClient.setText(clientName); @Override
} public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(AddUserDataEvent event) {
finish();
} }
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.java
浏览文件 @ f7c3ced1
...@@ -14,6 +14,8 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout; ...@@ -14,6 +14,8 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddTicketEvent;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.listener.FiveMenuClickListener; import com.wd.workoffice.bean.listener.FiveMenuClickListener;
import com.wd.workoffice.bean.mesBean.UserDataBean; import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
...@@ -25,6 +27,9 @@ import com.wd.workoffice.ui.adapter.MesUserDataAdapter; ...@@ -25,6 +27,9 @@ import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.MesUserDataListFilterData; import com.wd.workoffice.util.ddmfilter.MesUserDataListFilterData;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -171,4 +176,23 @@ public class MesUserDataListActivity extends WorkToolBarActivity { ...@@ -171,4 +176,23 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
break; break;
} }
} }
@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) {
page = 1;
param.put("pageNum", page);
getData();
}
} }
app/src/main/res/layout/activity_mes_user_data_other_middle.xml
浏览文件 @ f7c3ced1
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
<EditText <EditText
android:id="@+id/et_middle_status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -51,6 +52,7 @@ ...@@ -51,6 +52,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <EditText
android:id="@+id/et_three_status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -77,6 +79,7 @@ ...@@ -77,6 +79,7 @@
android:textSize="14sp" /> android:textSize="14sp" />
<EditText <EditText
android:id="@+id/et_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论