提交 5c3b17ff authored 作者: lgd's avatar lgd

1.bat页面商店 两步下单

2.//TODO erp用户激活,忘记密码测试,bat,mes,消息,我的,刷新token
上级 b56d982b
......@@ -161,6 +161,14 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.StoreTradingActivity"
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"
......
package com.wd.workoffice.bean;
import java.util.List;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class UserInfoBean {
/**
* code : 0
* message : null
* data : {"createdBy":null,"createdByName":null,"createdTime":"2019-07-29 10:13:51","updatedBy":675,"updatedByName":null,"updatedTime":"2020-03-03 10:04:52","id":111,"userName":"fengfan","nickName":"冯帆","identifier":null,"phone":"15020055118","email":"1232@qq.com","type":"2","status":"1","erpId":"111","roles":[{"createdBy":1,"createdByName":null,"createdTime":"2019-08-27 14:17:33","updatedBy":111,"updatedByName":null,"updatedTime":"2019-11-22 10:39:44","id":3,"code":"SUPER_ADMIN","name":"超级管理员","level":0,"status":"1","dataScope":7,"customizeDataScope":"2,101,1","dataScopeName":"全系统","noticeIds":null,"createdUser":null}],"permissionList":["order:po:invoice-apply:audit","common","order:purchase-order:apply","finance:dept-ar-ap-part-flow:page:list","order:fo:receipt-invoice-apply:apply:save","app:order:io:enter-store-apply:page:list","finance:money-back-apply:page:list","order:purchase-order:details","app:order:so:enter-store-apply:page:list","app:finance:dept-ar-ap-part-detail:details","base:product:page:list","app:base:stock-type:list","order:po:use-apply:apply:save","order:fo:receipt-invoice-apply:audit","app:base:transit-part-manage:page:list","finance:money-pay-apply:apply","order:ao:use-apply:apply:save","order:so:enter-store-apply:apply:save","base:customer-branch-factory:page:list","order:fo:enter-store-apply:apply:save","market:inspection:page:list","app:order:sale-order:page:list","order:io:enter-store-apply:audit","base:product:shelf","order:supplier-order:start","order:return-apply-flow:list","app:order:po:enter-store-apply:page:list","order:po:return-apply:edit","finance:money-back-apply:exam","order:po:receipt-invoice-apply:page:list","order:po:receipt-invoice-apply:audit","order:ao:invoice-apply:audit","order:co:invoice-apply:page:list","app:order:fo:enter-store-apply:page:list","order:so:invoice-apply:audit","order:purchase-order:audit","order:po:advance-finish-apply:page:list","order:co:out-store-apply:page:list","order:package-order:details","finance:dept-account-balance:page:list","base:product:transit:log","order:so:advance-finish-apply:apply:save","order:po:receipt-invoice-apply:apply:save","base:transit-part-manage:details","order:po:invoice-apply:apply:save","order:po:out-store-apply:page:list","order:po:advance-finish-apply:audit","order:fo:quality-inspection:audit","base:product:price:update","order:so:out-store-apply:page:list","finance:logistics-apply:page:list","order:ao:invoice-apply:page:list","order:io:enter-store-apply:apply:save","order:crucible-order:audit","stockQuantity:order:page:list","order:co:out-store-apply:apply:save","order:so:advance-finish-apply:audit","finance:finance-tax:page:list","finance:money-pay-apply:page:list","order:ao:use-apply:page:list","base:finance-type:page:list","order:so:out-store-apply:apply:audit","app:sys:dept:details","order:po:out-store-apply:apply:save","app:base:transit-part-manage:update","order:po:return-apply:apply:save","finance:finance-tax:page:add","stock:stock:page:list","stockQuantity:page:list","finance:money-back-apply:apply","order:so:enter-store-apply:audit","order:inside-order:start","order:so:out-store-apply:apply:save","order:ao:package-apply:apply:save","stockQuantityDetailFlow:page:list","equipment:equipment:page:list","app:order:co:enter-store-apply:page:list","order:so:return-apply:apply:save","order:ao:invoice-apply:apply:save","order:sale:return-apply:edit:dept-admin","order:suppplier-order:details","finance:finance-dept-flow:page:list","order:so:advance-finish-apply:page:list","order:po:advance-finish-apply:apply:save","order:po:enter-stock-type:update","order:po:invoice-apply:page:list","finance:money-pay-apply:exam","order:ao:use-apply:audit","finance:finance-tax:page:detail","order:sale-order:details","order:so:invoice-apply:page:list","order:sale:return-apply:edit:business-department","order:sale:return-apply:edit:group","app:order:ao:package-order:page:list","market:dispatch:receive","order:supplier-order:audit","order:po:enter-store-apply:audit","order:co:invoice-apply:audit","order:so:use-apply:audit","order:inside-product-list:page:list","app:order:supplier-order:page:list","app:finance:dept-account-balance:details","order:so:use-apply:page:list","order:co:invoice-apply:apply:save","finance:finance-tax:page:update","order:inside-order:details","app:finance:dept-account-balance:balance:update-shelf","order:po:return-apply:page:list","base:sub-process:list","order:po:use-apply:audit","order:co:enter-store-apply:apply:save","order:co:out-store-apply:apply:audit","order:fo:quality-inspection:page:list","order:fo:enter-store-apply:audit","order:supplier-order:apply","market:inspection:save","app:order:crucible-order:page:list","order:fo:receipt-invoice-apply:page:list","finance:logistics-apply:save","finance:logistics-flow:page:list","app:order:ao:package-apply:page:list","order:sale-order:apply","order:co:enter-store-apply:audit","equipment:spare-part:page:list","finance:dept-account-balance:balance:update","order:sale-order:audit","stockQuantityFlow:page:list","order:crucible-order:start","order:po:out-store-apply:apply:audit","market:dispatch:page:list","finance:logistics:page:list","order:crucible-order:apply","order:po:enter-store-apply:apply:save","app:order:purchase-order:page:list","finance:logistics-apply:update","order:po:use-apply:page:list","order:so:invoice-apply:apply:save","app:finance:finance-dept-flow:shelf:page:list","order:purchase-order:start","order:ao:package-apply:audit","order:inside-order:audit","sys:dept:ruler:update","market:dispatch:save","app:order:inside-order:page:list","order:so:return-apply:page:list","order:so:use-apply:apply:save","order:inside-order:apply","order:crucible-order:details","order:sale-order:start","order:sale:return-apply:edit:finance-dept","stockQuantityDetail:page:list"],"ofDept":{"createdBy":1,"createdByName":null,"createdTime":"2019-09-02 10:53:47","updatedBy":1,"updatedByName":null,"updatedTime":"2020-01-06 08:54:41","id":120,"parentId":"CO001","status":"1","type":2,"typeString":null,"outdeptLedger":"{\"gk\":\"\",\"gt\":\"\"}","permission":null,"permissionString":null,"tag":null,"code":"0701","name":"销售一公司","level":2,"erpId":"GK26","children":null,"deptRulers":null,"deptRulerList":null,"deptUserList":null,"targetUserOfRuler":"1","deptRulerTotal":null,"gk":null,"gt":null},"access":"SUPER_ADMIN","ofDeptRuler":"1","roleNames":null,"deptName":null,"roleId":null,"deptId":null}
* httpStatus : 0
* path : null
* ext : null
*/
/**
* createdBy : null
* createdByName : null
* createdTime : 2019-07-29 10:13:51
* updatedBy : 675
* updatedByName : null
* updatedTime : 2020-03-03 10:04:52
* id : 111
* userName : fengfan
* nickName : 冯帆
* identifier : null
* phone : 15020055118
* email : 1232@qq.com
* type : 2
* status : 1
* erpId : 111
* roles : [{"createdBy":1,"createdByName":null,"createdTime":"2019-08-27 14:17:33","updatedBy":111,"updatedByName":null,"updatedTime":"2019-11-22 10:39:44","id":3,"code":"SUPER_ADMIN","name":"超级管理员","level":0,"status":"1","dataScope":7,"customizeDataScope":"2,101,1","dataScopeName":"全系统","noticeIds":null,"createdUser":null}]
* permissionList : ["order:po:invoice-apply:audit","common","order:purchase-order:apply","finance:dept-ar-ap-part-flow:page:list","order:fo:receipt-invoice-apply:apply:save","app:order:io:enter-store-apply:page:list","finance:money-back-apply:page:list","order:purchase-order:details","app:order:so:enter-store-apply:page:list","app:finance:dept-ar-ap-part-detail:details","base:product:page:list","app:base:stock-type:list","order:po:use-apply:apply:save","order:fo:receipt-invoice-apply:audit","app:base:transit-part-manage:page:list","finance:money-pay-apply:apply","order:ao:use-apply:apply:save","order:so:enter-store-apply:apply:save","base:customer-branch-factory:page:list","order:fo:enter-store-apply:apply:save","market:inspection:page:list","app:order:sale-order:page:list","order:io:enter-store-apply:audit","base:product:shelf","order:supplier-order:start","order:return-apply-flow:list","app:order:po:enter-store-apply:page:list","order:po:return-apply:edit","finance:money-back-apply:exam","order:po:receipt-invoice-apply:page:list","order:po:receipt-invoice-apply:audit","order:ao:invoice-apply:audit","order:co:invoice-apply:page:list","app:order:fo:enter-store-apply:page:list","order:so:invoice-apply:audit","order:purchase-order:audit","order:po:advance-finish-apply:page:list","order:co:out-store-apply:page:list","order:package-order:details","finance:dept-account-balance:page:list","base:product:transit:log","order:so:advance-finish-apply:apply:save","order:po:receipt-invoice-apply:apply:save","base:transit-part-manage:details","order:po:invoice-apply:apply:save","order:po:out-store-apply:page:list","order:po:advance-finish-apply:audit","order:fo:quality-inspection:audit","base:product:price:update","order:so:out-store-apply:page:list","finance:logistics-apply:page:list","order:ao:invoice-apply:page:list","order:io:enter-store-apply:apply:save","order:crucible-order:audit","stockQuantity:order:page:list","order:co:out-store-apply:apply:save","order:so:advance-finish-apply:audit","finance:finance-tax:page:list","finance:money-pay-apply:page:list","order:ao:use-apply:page:list","base:finance-type:page:list","order:so:out-store-apply:apply:audit","app:sys:dept:details","order:po:out-store-apply:apply:save","app:base:transit-part-manage:update","order:po:return-apply:apply:save","finance:finance-tax:page:add","stock:stock:page:list","stockQuantity:page:list","finance:money-back-apply:apply","order:so:enter-store-apply:audit","order:inside-order:start","order:so:out-store-apply:apply:save","order:ao:package-apply:apply:save","stockQuantityDetailFlow:page:list","equipment:equipment:page:list","app:order:co:enter-store-apply:page:list","order:so:return-apply:apply:save","order:ao:invoice-apply:apply:save","order:sale:return-apply:edit:dept-admin","order:suppplier-order:details","finance:finance-dept-flow:page:list","order:so:advance-finish-apply:page:list","order:po:advance-finish-apply:apply:save","order:po:enter-stock-type:update","order:po:invoice-apply:page:list","finance:money-pay-apply:exam","order:ao:use-apply:audit","finance:finance-tax:page:detail","order:sale-order:details","order:so:invoice-apply:page:list","order:sale:return-apply:edit:business-department","order:sale:return-apply:edit:group","app:order:ao:package-order:page:list","market:dispatch:receive","order:supplier-order:audit","order:po:enter-store-apply:audit","order:co:invoice-apply:audit","order:so:use-apply:audit","order:inside-product-list:page:list","app:order:supplier-order:page:list","app:finance:dept-account-balance:details","order:so:use-apply:page:list","order:co:invoice-apply:apply:save","finance:finance-tax:page:update","order:inside-order:details","app:finance:dept-account-balance:balance:update-shelf","order:po:return-apply:page:list","base:sub-process:list","order:po:use-apply:audit","order:co:enter-store-apply:apply:save","order:co:out-store-apply:apply:audit","order:fo:quality-inspection:page:list","order:fo:enter-store-apply:audit","order:supplier-order:apply","market:inspection:save","app:order:crucible-order:page:list","order:fo:receipt-invoice-apply:page:list","finance:logistics-apply:save","finance:logistics-flow:page:list","app:order:ao:package-apply:page:list","order:sale-order:apply","order:co:enter-store-apply:audit","equipment:spare-part:page:list","finance:dept-account-balance:balance:update","order:sale-order:audit","stockQuantityFlow:page:list","order:crucible-order:start","order:po:out-store-apply:apply:audit","market:dispatch:page:list","finance:logistics:page:list","order:crucible-order:apply","order:po:enter-store-apply:apply:save","app:order:purchase-order:page:list","finance:logistics-apply:update","order:po:use-apply:page:list","order:so:invoice-apply:apply:save","app:finance:finance-dept-flow:shelf:page:list","order:purchase-order:start","order:ao:package-apply:audit","order:inside-order:audit","sys:dept:ruler:update","market:dispatch:save","app:order:inside-order:page:list","order:so:return-apply:page:list","order:so:use-apply:apply:save","order:inside-order:apply","order:crucible-order:details","order:sale-order:start","order:sale:return-apply:edit:finance-dept","stockQuantityDetail:page:list"]
* ofDept : {"createdBy":1,"createdByName":null,"createdTime":"2019-09-02 10:53:47","updatedBy":1,"updatedByName":null,"updatedTime":"2020-01-06 08:54:41","id":120,"parentId":"CO001","status":"1","type":2,"typeString":null,"outdeptLedger":"{\"gk\":\"\",\"gt\":\"\"}","permission":null,"permissionString":null,"tag":null,"code":"0701","name":"销售一公司","level":2,"erpId":"GK26","children":null,"deptRulers":null,"deptRulerList":null,"deptUserList":null,"targetUserOfRuler":"1","deptRulerTotal":null,"gk":null,"gt":null}
* access : SUPER_ADMIN
* ofDeptRuler : 1
* roleNames : null
* deptName : null
* roleId : null
* deptId : null
*/
private Object createdBy;
private Object createdByName;
private String createdTime;
private int updatedBy;
private Object updatedByName;
private String updatedTime;
private int id;
private String userName;
private String nickName;
private Object identifier;
private String phone;
private String email;
private String type;
private String status;
private String erpId;
private OfDeptBean ofDept;
private String access;
private String ofDeptRuler;
private Object roleNames;
private Object deptName;
private Object roleId;
private Object deptId;
private List<RolesBean> roles;
private List<String> permissionList;
public Object getCreatedBy() {
return createdBy;
}
public void setCreatedBy(Object createdBy) {
this.createdBy = createdBy;
}
public Object getCreatedByName() {
return createdByName;
}
public void setCreatedByName(Object createdByName) {
this.createdByName = createdByName;
}
public String getCreatedTime() {
return createdTime;
}
public void setCreatedTime(String createdTime) {
this.createdTime = createdTime;
}
public int getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(int updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public String getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public Object getIdentifier() {
return identifier;
}
public void setIdentifier(Object identifier) {
this.identifier = identifier;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getErpId() {
return erpId;
}
public void setErpId(String erpId) {
this.erpId = erpId;
}
public OfDeptBean getOfDept() {
return ofDept;
}
public void setOfDept(OfDeptBean ofDept) {
this.ofDept = ofDept;
}
public String getAccess() {
return access;
}
public void setAccess(String access) {
this.access = access;
}
public String getOfDeptRuler() {
return ofDeptRuler;
}
public void setOfDeptRuler(String ofDeptRuler) {
this.ofDeptRuler = ofDeptRuler;
}
public Object getRoleNames() {
return roleNames;
}
public void setRoleNames(Object roleNames) {
this.roleNames = roleNames;
}
public Object getDeptName() {
return deptName;
}
public void setDeptName(Object deptName) {
this.deptName = deptName;
}
public Object getRoleId() {
return roleId;
}
public void setRoleId(Object roleId) {
this.roleId = roleId;
}
public Object getDeptId() {
return deptId;
}
public void setDeptId(Object deptId) {
this.deptId = deptId;
}
public List<RolesBean> getRoles() {
return roles;
}
public void setRoles(List<RolesBean> roles) {
this.roles = roles;
}
public List<String> getPermissionList() {
return permissionList;
}
public void setPermissionList(List<String> permissionList) {
this.permissionList = permissionList;
}
public static class OfDeptBean {
/**
* createdBy : 1
* createdByName : null
* createdTime : 2019-09-02 10:53:47
* updatedBy : 1
* updatedByName : null
* updatedTime : 2020-01-06 08:54:41
* id : 120
* parentId : CO001
* status : 1
* type : 2
* typeString : null
* outdeptLedger : {"gk":"","gt":""}
* permission : null
* permissionString : null
* tag : null
* code : 0701
* name : 销售一公司
* level : 2
* erpId : GK26
* children : null
* deptRulers : null
* deptRulerList : null
* deptUserList : null
* targetUserOfRuler : 1
* deptRulerTotal : null
* gk : null
* gt : null
*/
private int createdBy;
private Object createdByName;
private String createdTime;
private int updatedBy;
private Object updatedByName;
private String updatedTime;
private int id;
private String parentId;
private String status;
private int type;
private Object typeString;
private String outdeptLedger;
private Object permission;
private Object permissionString;
private Object tag;
private String code;
private String name;
private int level;
private String erpId;
private Object children;
private Object deptRulers;
private Object deptRulerList;
private Object deptUserList;
private String targetUserOfRuler;
private Object deptRulerTotal;
private Object gk;
private Object gt;
public int getCreatedBy() {
return createdBy;
}
public void setCreatedBy(int createdBy) {
this.createdBy = createdBy;
}
public Object getCreatedByName() {
return createdByName;
}
public void setCreatedByName(Object createdByName) {
this.createdByName = createdByName;
}
public String getCreatedTime() {
return createdTime;
}
public void setCreatedTime(String createdTime) {
this.createdTime = createdTime;
}
public int getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(int updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public String getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getParentId() {
return parentId;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public Object getTypeString() {
return typeString;
}
public void setTypeString(Object typeString) {
this.typeString = typeString;
}
public String getOutdeptLedger() {
return outdeptLedger;
}
public void setOutdeptLedger(String outdeptLedger) {
this.outdeptLedger = outdeptLedger;
}
public Object getPermission() {
return permission;
}
public void setPermission(Object permission) {
this.permission = permission;
}
public Object getPermissionString() {
return permissionString;
}
public void setPermissionString(Object permissionString) {
this.permissionString = permissionString;
}
public Object getTag() {
return tag;
}
public void setTag(Object tag) {
this.tag = tag;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getLevel() {
return level;
}
public void setLevel(int level) {
this.level = level;
}
public String getErpId() {
return erpId;
}
public void setErpId(String erpId) {
this.erpId = erpId;
}
public Object getChildren() {
return children;
}
public void setChildren(Object children) {
this.children = children;
}
public Object getDeptRulers() {
return deptRulers;
}
public void setDeptRulers(Object deptRulers) {
this.deptRulers = deptRulers;
}
public Object getDeptRulerList() {
return deptRulerList;
}
public void setDeptRulerList(Object deptRulerList) {
this.deptRulerList = deptRulerList;
}
public Object getDeptUserList() {
return deptUserList;
}
public void setDeptUserList(Object deptUserList) {
this.deptUserList = deptUserList;
}
public String getTargetUserOfRuler() {
return targetUserOfRuler;
}
public void setTargetUserOfRuler(String targetUserOfRuler) {
this.targetUserOfRuler = targetUserOfRuler;
}
public Object getDeptRulerTotal() {
return deptRulerTotal;
}
public void setDeptRulerTotal(Object deptRulerTotal) {
this.deptRulerTotal = deptRulerTotal;
}
public Object getGk() {
return gk;
}
public void setGk(Object gk) {
this.gk = gk;
}
public Object getGt() {
return gt;
}
public void setGt(Object gt) {
this.gt = gt;
}
}
public static class RolesBean {
/**
* createdBy : 1
* createdByName : null
* createdTime : 2019-08-27 14:17:33
* updatedBy : 111
* updatedByName : null
* updatedTime : 2019-11-22 10:39:44
* id : 3
* code : SUPER_ADMIN
* name : 超级管理员
* level : 0
* status : 1
* dataScope : 7
* customizeDataScope : 2,101,1
* dataScopeName : 全系统
* noticeIds : null
* createdUser : null
*/
private int createdBy;
private Object createdByName;
private String createdTime;
private int updatedBy;
private Object updatedByName;
private String updatedTime;
private int id;
private String code;
private String name;
private int level;
private String status;
private int dataScope;
private String customizeDataScope;
private String dataScopeName;
private Object noticeIds;
private Object createdUser;
public int getCreatedBy() {
return createdBy;
}
public void setCreatedBy(int createdBy) {
this.createdBy = createdBy;
}
public Object getCreatedByName() {
return createdByName;
}
public void setCreatedByName(Object createdByName) {
this.createdByName = createdByName;
}
public String getCreatedTime() {
return createdTime;
}
public void setCreatedTime(String createdTime) {
this.createdTime = createdTime;
}
public int getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(int updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public String getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(String updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getLevel() {
return level;
}
public void setLevel(int level) {
this.level = level;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public int getDataScope() {
return dataScope;
}
public void setDataScope(int dataScope) {
this.dataScope = dataScope;
}
public String getCustomizeDataScope() {
return customizeDataScope;
}
public void setCustomizeDataScope(String customizeDataScope) {
this.customizeDataScope = customizeDataScope;
}
public String getDataScopeName() {
return dataScopeName;
}
public void setDataScopeName(String dataScopeName) {
this.dataScopeName = dataScopeName;
}
public Object getNoticeIds() {
return noticeIds;
}
public void setNoticeIds(Object noticeIds) {
this.noticeIds = noticeIds;
}
public Object getCreatedUser() {
return createdUser;
}
public void setCreatedUser(Object createdUser) {
this.createdUser = createdUser;
}
}
}
......@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.bean.StockBean;
import com.wd.workoffice.contract.BatSaleContract;
import com.wd.workoffice.model.BatSaleModel;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -102,7 +103,7 @@ public class BatSalePresenter extends BasePresenter<BatSaleContract.View, BatSal
mView.onError(data.getMessage());
return;
}
// mView.getStock(JSON.parseArray(data.getData().toString(), DepBean.class));
mView.getStock(JSON.parseArray(data.getData().toString(), StockBean.class));
}
});
}
......
......@@ -252,11 +252,21 @@ public interface ApiService {
* @param deptId
* @param customerId
* @param sign 固定值send
* 内部交易和供应一样的 一个参数 deptId
* 坩埚的话参数是3个
* 供应 参数是3个
* 坩埚的话 内部交易一个参数 deptId
* @return
*/
@GET("/stock/search-list")
Observable<BaseBean> getStock(@QueryMap Map<String, Object> param);
/**
* 用户信息
*
* @return
*/
@GET("/sys/user/userInfo")
Observable<BaseBean> userInfo();
}
......@@ -17,6 +17,7 @@ import com.wd.workoffice.bean.workEnum.PermissionType;
import com.wd.workoffice.contract.BatSaleContract;
import com.wd.workoffice.presenter.BatSalePresenter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -53,10 +54,9 @@ public class StoreCrucibleActivity extends WorkToolBarActivity implements BatSal
private List<DepBean> depList;
List<String> depNameList = new ArrayList<>();
private DepBean chooseDep;
private Integer supplierId;
private Map<String, Object> stockParam;
private List<StockBean> stockList;
private List<String> stockNameList;
private List<String> stockNameList=new ArrayList<>();
private StockBean chooseStock;
@Override
......@@ -70,8 +70,12 @@ public class StoreCrucibleActivity extends WorkToolBarActivity implements BatSal
@Override
protected void initData() {
batSalePresenter.getDep(PermissionType.PROCESS_CRUCIBLE.getCode());
batSalePresenter.getDep(PermissionType.CRUCIBLE_SELL.getCode());
stockParam = WorkUtils.simpleParam();
stockParam.put("deptId", UserKeeper.getInstance().getUserDepId());
batSalePresenter.getStock(stockParam);
// stockParam.put("sign","send");
// stockParam.put("customerId", UserKeeper.getInstance().getUserId());
}
@Override
......@@ -91,10 +95,6 @@ public class StoreCrucibleActivity extends WorkToolBarActivity implements BatSal
depDialog.show();
break;
case R.id.rl_warehouse:
if (supplierId == null) {
toast("请先选择供应商");
return;
}
stockDialog.show();
break;
case R.id.rl_product:
......@@ -102,16 +102,12 @@ public class StoreCrucibleActivity extends WorkToolBarActivity implements BatSal
toast("请先选择接单部门");
return;
}
if (supplierId == null) {
toast("请先选择供应商");
return;
}
if (chooseStock == null) {
toast("请选择入库仓库");
return;
}
startActivity(StoreSaleProductActivity.class, "depId", chooseDep.getId() + "",
"depName", chooseDep.getName(), "transitPartId", supplierId.toString(), "code", PermissionType.PROCESS_SUPPLY.getCode());
"depName", chooseDep.getName(), "code", PermissionType.PROCESS_CRUCIBLE.getCode());
break;
}
}
......@@ -133,8 +129,6 @@ public class StoreCrucibleActivity extends WorkToolBarActivity implements BatSal
chooseDep = depList.get(which);
tvDep.setText(depNameList.get(which));
dialog.dismiss();
stockParam.put("deptId", chooseDep.getId());
batSalePresenter.getStock(stockParam);
}
});
}
......@@ -149,7 +143,7 @@ public class StoreCrucibleActivity extends WorkToolBarActivity implements BatSal
@Override
public void onClick(DialogInterface dialog, int which) {
chooseStock = stockList.get(which);
tvWarehouse.setText(depNameList.get(which));
tvWarehouse.setText(stockNameList.get(which));
dialog.dismiss();
}
});
......
......@@ -99,7 +99,11 @@ public class StoreOutsourcingActivity extends WorkToolBarActivity implements Bat
depDialog.show();
break;
case R.id.rl_supplier:
startActivityForResult(StoreSaleClientActivity.class, 10002,"code","SUPPLIER");
if (clientId == null) {
toast("请先选择客户");
return;
}
startActivityForResult(StoreSaleClientActivity.class, 10002,"code","SUPPLIER","supplier","选择供应商");
break;
case R.id.rl_process:
if (clientId == null) {
......
......@@ -28,6 +28,7 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 商店-销售-选择客户/供应商
* author : flexible
......@@ -56,6 +57,9 @@ public class StoreSaleClientActivity extends WorkToolBarActivity {
@Override
protected void initData() {
if (!TextUtils.isEmpty(getIntent().getStringExtra("supplier"))) {
setTitle(getIntent().getStringExtra("supplier"));
}
clientList = new ArrayList<>();
clientAdapter = new StoreClientAdapter(R.layout.item_store_client, clientList);
clientAdapter.bindToRecyclerView(rvClient);
......@@ -115,12 +119,12 @@ public class StoreSaleClientActivity extends WorkToolBarActivity {
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
if (TextUtils.equals(getIntent().getStringExtra("code"),"CUSTOMER")){
if (TextUtils.equals(getIntent().getStringExtra("code"), "CUSTOMER")) {
Intent intent = new Intent();
intent.putExtra("clientName", clientList.get(position).getName());
intent.putExtra("id", clientList.get(position).getId());
setResult(10001, intent);
}else {
} else {
Intent intent = new Intent();
intent.putExtra("clientName", clientList.get(position).getName());
intent.putExtra("id", clientList.get(position).getId());
......@@ -141,7 +145,7 @@ public class StoreSaleClientActivity extends WorkToolBarActivity {
public void onViewClicked() {
param.put("name", etKey.getText().toString());
param.put("current", 1);
page=1;
page = 1;
getData();
}
}
......@@ -16,6 +16,7 @@ import com.wd.workoffice.bean.workEnum.PermissionType;
import com.wd.workoffice.contract.BatSaleContract;
import com.wd.workoffice.presenter.BatSalePresenter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -76,6 +77,8 @@ public class StoreSupplierActivity extends WorkToolBarActivity implements BatSal
protected void initData() {
batSalePresenter.getDep(PermissionType.SUPPLY_SELL.getCode());
stockParam = WorkUtils.simpleParam();
stockParam.put("sign", "SEND");
stockParam.put("deptId", UserKeeper.getInstance().getUserDepId());
}
@Override
......@@ -92,11 +95,11 @@ public class StoreSupplierActivity extends WorkToolBarActivity implements BatSal
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_supplier:
if (supplierId == null) {
if (chooseDep == null) {
toast("请先选择接单部门");
return;
}
startActivityForResult(StoreSaleClientActivity.class, 10002,"code","SUPPLIER");
startActivityForResult(StoreSaleClientActivity.class, 10002, "code", "SUPPLIER", "supplier", "选择供应商");
break;
case R.id.rl_dep:
depDialog.show();
......@@ -144,8 +147,6 @@ public class StoreSupplierActivity extends WorkToolBarActivity implements BatSal
chooseDep = depList.get(which);
tvDep.setText(depNameList.get(which));
dialog.dismiss();
stockParam.put("deptId",chooseDep.getId());
batSalePresenter.getStock(stockParam);
}
});
}
......@@ -160,7 +161,7 @@ public class StoreSupplierActivity extends WorkToolBarActivity implements BatSal
@Override
public void onClick(DialogInterface dialog, int which) {
chooseStock = stockList.get(which);
tvWarehouse.setText(depNameList.get(which));
tvWarehouse.setText(stockNameList.get(which));
dialog.dismiss();
}
});
......@@ -169,10 +170,12 @@ public class StoreSupplierActivity extends WorkToolBarActivity implements BatSal
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10002 && resultCode == 10002){
if (requestCode == 10002 && resultCode == 10002) {
String clientName = data.getStringExtra("clientName");
supplierId = data.getIntExtra("id", 0);
tvSupplier.setText(clientName);
stockParam.put("customerId", supplierId);
batSalePresenter.getStock(stockParam);
}
}
......
package com.wd.workoffice.ui.activity.bat;
import android.content.DialogInterface;
import android.os.Bundle;
import android.view.View;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.DepBean;
import com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.bean.StockBean;
import com.wd.workoffice.bean.workEnum.PermissionType;
import com.wd.workoffice.contract.BatSaleContract;
import com.wd.workoffice.presenter.BatSalePresenter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 商店-坩埚
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class StoreTradingActivity extends WorkToolBarActivity implements BatSaleContract.View {
@BindView(R.id.tv_dep)
TextView tvDep;
@BindView(R.id.rl_dep)
RelativeLayout rlDep;
@BindView(R.id.tv_warehouse)
TextView tvWarehouse;
@BindView(R.id.rl_warehouse)
RelativeLayout rlWarehouse;
@BindView(R.id.tv_product)
TextView tvProduct;
@BindView(R.id.rl_product)
RelativeLayout rlProduct;
private BatSalePresenter batSalePresenter;
private QMUIDialog.MenuDialogBuilder depDialog;
private QMUIDialog.MenuDialogBuilder stockDialog;
private List<DepBean> depList;
List<String> depNameList = new ArrayList<>();
private DepBean chooseDep;
private Map<String, Object> stockParam;
private List<StockBean> stockList;
private List<String> stockNameList = new ArrayList<>();
private StockBean chooseStock;
@Override
protected void initView() {
ButterKnife.bind(this);
batSalePresenter = new BatSalePresenter();
batSalePresenter.onAttach(this);
depDialog = DialogUtils.listDialog(this);
stockDialog = DialogUtils.listDialog(this);
}
@Override
protected void initData() {
batSalePresenter.getDep(PermissionType.INSIDE_SELL.getCode());
stockParam = WorkUtils.simpleParam();
stockParam.put("deptId", UserKeeper.getInstance().getUserDepId());
batSalePresenter.getStock(stockParam);
// stockParam.put("sign","send");
// stockParam.put("customerId", UserKeeper.getInstance().getUserId());
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_bat_trading;
}
@OnClick({R.id.rl_product, R.id.rl_warehouse, R.id.rl_dep})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_dep:
depDialog.show();
break;
case R.id.rl_warehouse:
stockDialog.show();
break;
case R.id.rl_product:
if (chooseDep == null) {
toast("请先选择接单部门");
return;
}
if (chooseStock == null) {
toast("请选择入库仓库");
return;
}
startActivity(StoreSaleProductActivity.class, "depId", chooseDep.getId() + "",
"depName", chooseDep.getName(), "code", PermissionType.PROCESS_INSIDE.getCode());
break;
}
}
@Override
public void processList(List<ProcessBean> dataList) {
}
@Override
public void depList(List<DepBean> dataList) {
depList = dataList;
for (DepBean dep : dataList) {
depNameList.add(dep.getName());
}
depDialog.addItems(depNameList.toArray(new String[depNameList.size()]), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseDep = depList.get(which);
tvDep.setText(depNameList.get(which));
dialog.dismiss();
}
});
}
@Override
public void getStock(List<StockBean> dataList) {
stockList = dataList;
for (StockBean dep : dataList) {
stockNameList.add(dep.getName());
}
stockDialog.addItems(stockNameList.toArray(new String[stockNameList.size()]), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseStock = stockList.get(which);
tvWarehouse.setText(stockNameList.get(which));
dialog.dismiss();
}
});
}
}
......@@ -3,16 +3,24 @@ package com.wd.workoffice.ui.fg;
import android.view.View;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.StockBean;
import com.wd.workoffice.bean.UserInfoBean;
import com.wd.workoffice.bean.vo.BatLayoutVo;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.StoreCrucibleActivity;
import com.wd.workoffice.ui.activity.bat.StoreOutsourcingActivity;
import com.wd.workoffice.ui.activity.bat.StoreSaleActivity;
import com.wd.workoffice.ui.activity.bat.StoreSupplierActivity;
import com.wd.workoffice.ui.activity.bat.StoreTradingActivity;
import com.wd.workoffice.ui.adapter.BatLayoutAdapter;
import com.wd.workoffice.util.UserKeeper;
import java.util.ArrayList;
import java.util.List;
......@@ -21,6 +29,8 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
......@@ -86,6 +96,23 @@ public class MainFragment extends WorkBaseFg {
@Override
protected void initData() {
RtfUtils.getRtf().userInfo().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
}
@Override
public void onSuccess(BaseBean data) {
if (data.getCode() != 0) {
return;
}
UserKeeper.getInstance().keepUserInfo(data.getData().toString());
}
});
}
......@@ -156,6 +183,7 @@ public class MainFragment extends WorkBaseFg {
startActivity(StoreCrucibleActivity.class);
break;
case 6:
startActivity(StoreTradingActivity.class);
break;
}
......
......@@ -5,6 +5,7 @@ import android.text.TextUtils;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.bean.TokenBean;
import com.wd.workoffice.bean.UserInfoBean;
import flexible.xd.android_base.utils.SPUtils;
......@@ -16,7 +17,7 @@ public class UserKeeper {
private volatile static UserKeeper keeper;
private SPUtils sp = SPUtils.getInstance("UserKeeper");
private final String LOGIN_INFO = "_LOGIN_INFO";
private final String IS_LOGIN = "_IS_LOGIN";
private final String USER_INFO = "_USER_INFO";
private final String ACCOUNT = "_ACCOUNT";
private UserKeeper() {
......@@ -56,20 +57,44 @@ public class UserKeeper {
}
return tokenBean.getAccess_token();
}
public String getUserId() {
if (TextUtils.isEmpty(sp.getString(LOGIN_INFO))) {
return "";
}
TokenBean tokenBean = JSON.parseObject(sp.getString(LOGIN_INFO), TokenBean.class);
if (tokenBean == null || tokenBean.getUserId()==0) {
if (tokenBean == null || tokenBean.getUserId() == 0) {
return "";
}
return tokenBean.getUserId() + "";
}
public void keepUserInfo(String info) {
sp.put(USER_INFO, info);
}
public String getUserInfo() {
return sp.getString(USER_INFO);
}
public void clearUserInfo() {
sp.put(USER_INFO, "");
}
public String getUserDepId() {
if (TextUtils.isEmpty(sp.getString(USER_INFO))) {
return "";
}
UserInfoBean infoBean = JSON.parseObject(sp.getString(USER_INFO), UserInfoBean.class);
if (infoBean == null || infoBean.getOfDept() == null) {
return "";
}
return tokenBean.getUserId()+"";
return infoBean.getOfDept().getId() + "";
}
public void clearAll() {
clearLoginInfo();
// clearLogin();
clearUserInfo();
// clearAccount();
}
}
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_centerInParent="true"
android:gravity="center"
android:text="第一步"
android:textColor="#ff9eaab1"
android:textSize="16sp" />
<RelativeLayout
android:id="@+id/rl_dep"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#ff3f617f" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择接单部门"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择接单部门"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_warehouse"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:layout_centerVertical="true"
android:background="#E3AD6E" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择入库仓库"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_warehouse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择入库仓库"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_centerInParent="true"
android:gravity="center"
android:text="第二步"
android:textColor="#ff9eaab1"
android:textSize="16sp" />
<!--Product selection-->
<RelativeLayout
android:id="@+id/rl_product"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#359486" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择产品"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_product"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论