Skip to content

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

1.仓库 订单详情 

2.//TODO erp用户激活，忘记密码测试，产品下单还差附件，bat，mes，消息，我的，刷新token
上级 5e2028ff
隐藏空白字符变更
内嵌 并排
正在显示 包含 2038 行增加 和 207 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 8ba6672f
...@@ -528,6 +528,14 @@ ...@@ -528,6 +528,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.bat.work.WorkWarehouseOrderDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="订单详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider" android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/bean/OrderBean.java
浏览文件 @ 8ba6672f
...@@ -9,90 +9,86 @@ import java.util.List; ...@@ -9,90 +9,86 @@ import java.util.List;
**/ **/
public class OrderBean { public class OrderBean {
/** /**
* createdBy : null * createdBy : 111
* createdByName : null * createdByName : null
* createdTime : 2019-12-18 12:28:41 * createdTime : 2020-03-25 10:49:55
* updatedBy : null * updatedBy : null
* updatedByName : null * updatedByName : null
* updatedTime : null * updatedTime : null
* commenceFromId : null
* createdType : null
* orderType : SO * orderType : SO
* id : SO10621 * id : SO10744
* customerId : null * customerId : 41
* supplierId : null * supplierId : null
* launchUserId : null * launchUserId : 111
* launchUserName : 冯帆 * launchUserName : 冯帆
* launchDeptId : 120 * launchDeptId : 120
* receiveUserId : null * receiveUserId : 677
* receiveUserName : null * receiveUserName : 陈起来
* receiveDeptId : 137 * receiveDeptId : 137
* launchOrderAmount : null * launchOrderAmount : 1482.0
* orderTypeName : null * orderTypeName : null
* launchDeptName : 销售一公司 * launchDeptName : 销售一公司
* receiveDeptName : 锆碳公司 * receiveDeptName : 锆碳公司
* expandInfo : null * expandInfo : {"createdBy":null,"createdByName":null,"createdTime":null,"updatedBy":null,"updatedByName":null,"updatedTime":null,"id":"42fa73fade0ca1180ea6a41ed3633d1d","orderType":"SO","orderId":null,"intoStore":24,"outerStore":25,"usedStore":26,"returnStore":27,"outdeptLedger":"gk","invoiceOrderAmount":null,"comments":"jj","annex":null,"verifyTime":null,"verifyUserId":null,"verifyComment":null,"ensureTime":null,"ensureUserId":null,"ensureComment":null,"requireTime":"2022-03-25","warehouseTime":null,"handoverTime":null,"orderDesc":null,"erpId":null,"demond1":"jj","demond2":"jj","demond3":"kk","demond4":"kkk","demond5":"jki","verifyUserName":"冯帆","ensureUserName":"陈起来","intoStoreName":"销售一内库","outerStoreName":"销售一安阳现场","usedStoreName":"销售一未结算安阳","returnStoreName":"销售一退货库"}
* status : 600 * status : 300
* attr : 300 * attr : 100
* deptIdList : null * deptIdList : null
* realOrderAmount : null * realOrderAmount : 1482.0
* outerOrderAmount : 3284.6 * outerOrderAmount : 22.0
* subProcessId : null * subProcessId : 550
* version : 0 * version : 2
* customerName : 安阳钢铁1 * customerName : 安阳钢铁
* subProcessName : null * subProcessName : 销售一公司默认流程
* statusName : 已交付 * statusName : 已接单
* attrName : 正常完成内部交易 * attrName : 正常进行中
* orderItems : null * orderItems : [{"createdBy":null,"createdByName":null,"createdTime":null,"updatedBy":null,"updatedByName":null,"updatedTime":null,"id":"50207b598298430aa0b77cc5a6865844","orderId":"SO10744","productId":31,"innerPrice":741,"productCount":2,"type":"PDS","outerPrice":11,"storeSum":0,"shipSum":0,"packageSum":0,"usedSum":0,"invoiceSum":0,"usedReturnSum":null,"oddSum":0,"lotNumber":"GT200325002","serialNumber":null,"annex":null,"tranFromStockId":null,"customerBranchFactoryId":null,"version":0,"productName":"塞棒","itemFlows":[{"createdBy":111,"createdByName":null,"createdTime":"2020-03-25 10:49:55","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":902,"orderType":"SO","orderId":"SO10744","productId":31,"orderItemId":"50207b598298430aa0b77cc5a6865844","productCount":0,"eventCode":"SPLIT_PD","linkSerialNumber":null,"optUserId":111,"optComment":"拆成生产订单","eventCodeName":"拆成生产子订单","optUserName":"冯帆","orderTypeName":"销售订单","productName":"塞棒"}],"stockQuantityDetailList":null,"stockQuantityDetailMaps":[{"stockName":"销售一内库","quantity":0,"applyOut":0,"stockTypeName":"内库","stockId":24,"applyInto":0,"productName":null},{"stockName":"销售一安阳现场","quantity":0,"applyOut":0,"stockTypeName":"现场库","stockId":25,"applyInto":0,"productName":null},{"stockName":"销售一未结算安阳","quantity":0,"applyOut":0,"stockTypeName":"未结算库","stockId":26,"applyInto":0,"productName":null}],"productSoleCode":"70TNB393001","productSimpleCode":"B393","productSpec":"1530","productUnit":"支","productWeight":0,"canOutStoreProductSum":null,"canInStoreProductSum":null,"canUseProductSum":null,"canPackageSum":null,"launchDeptName":null,"launchDeptId":null,"receiveDeptName":null,"customerId":null,"customerName":null,"productOfKind":null,"canInvoiceSum":null,"orderType":null,"customerBranchFactoryName":null,"orderTypeName":null}]
* orderFlows : null * orderFlows : [{"createdBy":677,"createdByName":null,"createdTime":"2020-03-25 10:56:16","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":441,"orderType":"SO","orderId":"SO10744","eventCode":"ACCEPT_OK","optUserId":677,"optComment":"","eventCodeName":"接单","optUserName":"陈起来","orderTypeName":"销售订单"},{"createdBy":111,"createdByName":null,"createdTime":"2020-03-25 10:53:42","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":440,"orderType":"SO","orderId":"SO10744","eventCode":"AUDIT_OK","optUserId":111,"optComment":"sdd","eventCodeName":"审核通过","optUserName":"冯帆","orderTypeName":"销售订单"},{"createdBy":111,"createdByName":null,"createdTime":"2020-03-25 10:49:55","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":439,"orderType":"SO","orderId":"SO10744","eventCode":"PO","optUserId":111,"optComment":"jj","eventCodeName":"创建订单","optUserName":"冯帆","orderTypeName":"销售订单"}]
* requireTime : 2019-10-20 00:00:00 * requireTime : 2022-03-25 00:00:00
* deptId : null * deptId : null
* supplierName
*/ */
private String supplierName;
private Object createdBy; private int createdBy;
private Object createdByName; private Object createdByName;
private String createdTime; private String createdTime;
private Object updatedBy; private Object updatedBy;
private Object updatedByName; private Object updatedByName;
private Object updatedTime; private Object updatedTime;
private Object commenceFromId;
private Object createdType;
private String orderType; private String orderType;
private String id; private String id;
private Object customerId; private int customerId;
private Object supplierId; private Object supplierId;
private Object launchUserId; private int launchUserId;
private String launchUserName; private String launchUserName;
private int launchDeptId; private int launchDeptId;
private Object receiveUserId; private int receiveUserId;
private Object receiveUserName; private String receiveUserName;
private int receiveDeptId; private int receiveDeptId;
private double launchOrderAmount; private double launchOrderAmount;
private String orderTypeName; private Object orderTypeName;
private String launchDeptName; private String launchDeptName;
private String receiveDeptName; private String receiveDeptName;
private Object expandInfo; private ExpandInfoBean expandInfo;
private int status; private int status;
private int attr; private int attr;
private Object deptIdList; private Object deptIdList;
private Object realOrderAmount; private double realOrderAmount;
private double outerOrderAmount; private double outerOrderAmount;
private Object subProcessId; private int subProcessId;
private int version; private int version;
private String customerName; private String customerName;
private Object subProcessName; private String subProcessName;
private String statusName; private String statusName;
private String attrName; private String attrName;
private Object orderItems;
private Object orderFlows;
private String requireTime; private String requireTime;
private String inStockName; private Object deptId;
private List<OrderItemsBean> orderItems;
public String getInStockName() { private List<OrderFlowsBean> orderFlows;
return inStockName;
}
public void setInStockName(String inStockName) {
this.inStockName = inStockName;
}
public String getSupplierName() { public String getSupplierName() {
return supplierName; return supplierName;
...@@ -102,14 +98,11 @@ public class OrderBean { ...@@ -102,14 +98,11 @@ public class OrderBean {
this.supplierName = supplierName; this.supplierName = supplierName;
} }
private Object deptId; public int getCreatedBy() {
private String supplierName;
public Object getCreatedBy() {
return createdBy; return createdBy;
} }
public void setCreatedBy(Object createdBy) { public void setCreatedBy(int createdBy) {
this.createdBy = createdBy; this.createdBy = createdBy;
} }
...@@ -153,6 +146,22 @@ public class OrderBean { ...@@ -153,6 +146,22 @@ public class OrderBean {
this.updatedTime = updatedTime; this.updatedTime = updatedTime;
} }
public Object getCommenceFromId() {
return commenceFromId;
}
public void setCommenceFromId(Object commenceFromId) {
this.commenceFromId = commenceFromId;
}
public Object getCreatedType() {
return createdType;
}
public void setCreatedType(Object createdType) {
this.createdType = createdType;
}
public String getOrderType() { public String getOrderType() {
return orderType; return orderType;
} }
...@@ -169,11 +178,11 @@ public class OrderBean { ...@@ -169,11 +178,11 @@ public class OrderBean {
this.id = id; this.id = id;
} }
public Object getCustomerId() { public int getCustomerId() {
return customerId; return customerId;
} }
public void setCustomerId(Object customerId) { public void setCustomerId(int customerId) {
this.customerId = customerId; this.customerId = customerId;
} }
...@@ -185,11 +194,11 @@ public class OrderBean { ...@@ -185,11 +194,11 @@ public class OrderBean {
this.supplierId = supplierId; this.supplierId = supplierId;
} }
public Object getLaunchUserId() { public int getLaunchUserId() {
return launchUserId; return launchUserId;
} }
public void setLaunchUserId(Object launchUserId) { public void setLaunchUserId(int launchUserId) {
this.launchUserId = launchUserId; this.launchUserId = launchUserId;
} }
...@@ -209,19 +218,19 @@ public class OrderBean { ...@@ -209,19 +218,19 @@ public class OrderBean {
this.launchDeptId = launchDeptId; this.launchDeptId = launchDeptId;
} }
public Object getReceiveUserId() { public int getReceiveUserId() {
return receiveUserId; return receiveUserId;
} }
public void setReceiveUserId(Object receiveUserId) { public void setReceiveUserId(int receiveUserId) {
this.receiveUserId = receiveUserId; this.receiveUserId = receiveUserId;
} }
public Object getReceiveUserName() { public String getReceiveUserName() {
return receiveUserName; return receiveUserName;
} }
public void setReceiveUserName(Object receiveUserName) { public void setReceiveUserName(String receiveUserName) {
this.receiveUserName = receiveUserName; this.receiveUserName = receiveUserName;
} }
...@@ -241,11 +250,11 @@ public class OrderBean { ...@@ -241,11 +250,11 @@ public class OrderBean {
this.launchOrderAmount = launchOrderAmount; this.launchOrderAmount = launchOrderAmount;
} }
public String getOrderTypeName() { public Object getOrderTypeName() {
return orderTypeName; return orderTypeName;
} }
public void setOrderTypeName(String orderTypeName) { public void setOrderTypeName(Object orderTypeName) {
this.orderTypeName = orderTypeName; this.orderTypeName = orderTypeName;
} }
...@@ -265,11 +274,11 @@ public class OrderBean { ...@@ -265,11 +274,11 @@ public class OrderBean {
this.receiveDeptName = receiveDeptName; this.receiveDeptName = receiveDeptName;
} }
public Object getExpandInfo() { public ExpandInfoBean getExpandInfo() {
return expandInfo; return expandInfo;
} }
public void setExpandInfo(Object expandInfo) { public void setExpandInfo(ExpandInfoBean expandInfo) {
this.expandInfo = expandInfo; this.expandInfo = expandInfo;
} }
...@@ -297,11 +306,11 @@ public class OrderBean { ...@@ -297,11 +306,11 @@ public class OrderBean {
this.deptIdList = deptIdList; this.deptIdList = deptIdList;
} }
public Object getRealOrderAmount() { public double getRealOrderAmount() {
return realOrderAmount; return realOrderAmount;
} }
public void setRealOrderAmount(Object realOrderAmount) { public void setRealOrderAmount(double realOrderAmount) {
this.realOrderAmount = realOrderAmount; this.realOrderAmount = realOrderAmount;
} }
...@@ -313,11 +322,11 @@ public class OrderBean { ...@@ -313,11 +322,11 @@ public class OrderBean {
this.outerOrderAmount = outerOrderAmount; this.outerOrderAmount = outerOrderAmount;
} }
public Object getSubProcessId() { public int getSubProcessId() {
return subProcessId; return subProcessId;
} }
public void setSubProcessId(Object subProcessId) { public void setSubProcessId(int subProcessId) {
this.subProcessId = subProcessId; this.subProcessId = subProcessId;
} }
...@@ -337,11 +346,11 @@ public class OrderBean { ...@@ -337,11 +346,11 @@ public class OrderBean {
this.customerName = customerName; this.customerName = customerName;
} }
public Object getSubProcessName() { public String getSubProcessName() {
return subProcessName; return subProcessName;
} }
public void setSubProcessName(Object subProcessName) { public void setSubProcessName(String subProcessName) {
this.subProcessName = subProcessName; this.subProcessName = subProcessName;
} }
...@@ -361,35 +370,1365 @@ public class OrderBean { ...@@ -361,35 +370,1365 @@ public class OrderBean {
this.attrName = attrName; this.attrName = attrName;
} }
public Object getOrderItems() { public String getRequireTime() {
return requireTime;
}
public void setRequireTime(String requireTime) {
this.requireTime = requireTime;
}
public Object getDeptId() {
return deptId;
}
public void setDeptId(Object deptId) {
this.deptId = deptId;
}
public List<OrderItemsBean> getOrderItems() {
return orderItems; return orderItems;
} }
public void setOrderItems(Object orderItems) { public void setOrderItems(List<OrderItemsBean> orderItems) {
this.orderItems = orderItems; this.orderItems = orderItems;
} }
public Object getOrderFlows() { public List<OrderFlowsBean> getOrderFlows() {
return orderFlows; return orderFlows;
} }
public void setOrderFlows(Object orderFlows) { public void setOrderFlows(List<OrderFlowsBean> orderFlows) {
this.orderFlows = orderFlows; this.orderFlows = orderFlows;
} }
public String getRequireTime() { public static class ExpandInfoBean {
return requireTime; /**
} * createdBy : null
* createdByName : null
* createdTime : null
* updatedBy : null
* updatedByName : null
* updatedTime : null
* id : 42fa73fade0ca1180ea6a41ed3633d1d
* orderType : SO
* orderId : null
* intoStore : 24
* outerStore : 25
* usedStore : 26
* returnStore : 27
* outdeptLedger : gk
* invoiceOrderAmount : null
* comments : jj
* annex : null
* verifyTime : null
* verifyUserId : null
* verifyComment : null
* ensureTime : null
* ensureUserId : null
* ensureComment : null
* requireTime : 2022-03-25
* warehouseTime : null
* handoverTime : null
* orderDesc : null
* erpId : null
* demond1 : jj
* demond2 : jj
* demond3 : kk
* demond4 : kkk
* demond5 : jki
* verifyUserName : 冯帆
* ensureUserName : 陈起来
* intoStoreName : 销售一内库
* outerStoreName : 销售一安阳现场
* usedStoreName : 销售一未结算安阳
* returnStoreName : 销售一退货库
*/
private Object createdBy;
private Object createdByName;
private Object createdTime;
private Object updatedBy;
private Object updatedByName;
private Object updatedTime;
private String id;
private String orderType;
private Object orderId;
private int intoStore;
private int outerStore;
private int usedStore;
private int returnStore;
private String outdeptLedger;
private Object invoiceOrderAmount;
private String comments;
private Object annex;
private Object verifyTime;
private Object verifyUserId;
private Object verifyComment;
private Object ensureTime;
private Object ensureUserId;
private Object ensureComment;
private String requireTime;
private Object warehouseTime;
private Object handoverTime;
private Object orderDesc;
private Object erpId;
private String demond1;
private String demond2;
private String demond3;
private String demond4;
private String demond5;
private String verifyUserName;
private String ensureUserName;
private String intoStoreName;
private String outerStoreName;
private String usedStoreName;
private String returnStoreName;
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 Object getCreatedTime() {
return createdTime;
}
public void setCreatedTime(Object createdTime) {
this.createdTime = createdTime;
}
public Object getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(Object updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public Object getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(Object updatedTime) {
this.updatedTime = updatedTime;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getOrderType() {
return orderType;
}
public void setOrderType(String orderType) {
this.orderType = orderType;
}
public Object getOrderId() {
return orderId;
}
public void setOrderId(Object orderId) {
this.orderId = orderId;
}
public int getIntoStore() {
return intoStore;
}
public void setIntoStore(int intoStore) {
this.intoStore = intoStore;
}
public int getOuterStore() {
return outerStore;
}
public void setOuterStore(int outerStore) {
this.outerStore = outerStore;
}
public int getUsedStore() {
return usedStore;
}
public void setUsedStore(int usedStore) {
this.usedStore = usedStore;
}
public void setRequireTime(String requireTime) { public int getReturnStore() {
this.requireTime = requireTime; return returnStore;
} }
public Object getDeptId() { public void setReturnStore(int returnStore) {
return deptId; this.returnStore = returnStore;
} }
public void setDeptId(Object deptId) { public String getOutdeptLedger() {
this.deptId = deptId; return outdeptLedger;
}
public void setOutdeptLedger(String outdeptLedger) {
this.outdeptLedger = outdeptLedger;
}
public Object getInvoiceOrderAmount() {
return invoiceOrderAmount;
}
public void setInvoiceOrderAmount(Object invoiceOrderAmount) {
this.invoiceOrderAmount = invoiceOrderAmount;
}
public String getComments() {
return comments;
}
public void setComments(String comments) {
this.comments = comments;
}
public Object getAnnex() {
return annex;
}
public void setAnnex(Object annex) {
this.annex = annex;
}
public Object getVerifyTime() {
return verifyTime;
}
public void setVerifyTime(Object verifyTime) {
this.verifyTime = verifyTime;
}
public Object getVerifyUserId() {
return verifyUserId;
}
public void setVerifyUserId(Object verifyUserId) {
this.verifyUserId = verifyUserId;
}
public Object getVerifyComment() {
return verifyComment;
}
public void setVerifyComment(Object verifyComment) {
this.verifyComment = verifyComment;
}
public Object getEnsureTime() {
return ensureTime;
}
public void setEnsureTime(Object ensureTime) {
this.ensureTime = ensureTime;
}
public Object getEnsureUserId() {
return ensureUserId;
}
public void setEnsureUserId(Object ensureUserId) {
this.ensureUserId = ensureUserId;
}
public Object getEnsureComment() {
return ensureComment;
}
public void setEnsureComment(Object ensureComment) {
this.ensureComment = ensureComment;
}
public String getRequireTime() {
return requireTime;
}
public void setRequireTime(String requireTime) {
this.requireTime = requireTime;
}
public Object getWarehouseTime() {
return warehouseTime;
}
public void setWarehouseTime(Object warehouseTime) {
this.warehouseTime = warehouseTime;
}
public Object getHandoverTime() {
return handoverTime;
}
public void setHandoverTime(Object handoverTime) {
this.handoverTime = handoverTime;
}
public Object getOrderDesc() {
return orderDesc;
}
public void setOrderDesc(Object orderDesc) {
this.orderDesc = orderDesc;
}
public Object getErpId() {
return erpId;
}
public void setErpId(Object erpId) {
this.erpId = erpId;
}
public String getDemond1() {
return demond1;
}
public void setDemond1(String demond1) {
this.demond1 = demond1;
}
public String getDemond2() {
return demond2;
}
public void setDemond2(String demond2) {
this.demond2 = demond2;
}
public String getDemond3() {
return demond3;
}
public void setDemond3(String demond3) {
this.demond3 = demond3;
}
public String getDemond4() {
return demond4;
}
public void setDemond4(String demond4) {
this.demond4 = demond4;
}
public String getDemond5() {
return demond5;
}
public void setDemond5(String demond5) {
this.demond5 = demond5;
}
public String getVerifyUserName() {
return verifyUserName;
}
public void setVerifyUserName(String verifyUserName) {
this.verifyUserName = verifyUserName;
}
public String getEnsureUserName() {
return ensureUserName;
}
public void setEnsureUserName(String ensureUserName) {
this.ensureUserName = ensureUserName;
}
public String getIntoStoreName() {
return intoStoreName;
}
public void setIntoStoreName(String intoStoreName) {
this.intoStoreName = intoStoreName;
}
public String getOuterStoreName() {
return outerStoreName;
}
public void setOuterStoreName(String outerStoreName) {
this.outerStoreName = outerStoreName;
}
public String getUsedStoreName() {
return usedStoreName;
}
public void setUsedStoreName(String usedStoreName) {
this.usedStoreName = usedStoreName;
}
public String getReturnStoreName() {
return returnStoreName;
}
public void setReturnStoreName(String returnStoreName) {
this.returnStoreName = returnStoreName;
}
}
public static class OrderItemsBean {
/**
* createdBy : null
* createdByName : null
* createdTime : null
* updatedBy : null
* updatedByName : null
* updatedTime : null
* id : 50207b598298430aa0b77cc5a6865844
* orderId : SO10744
* productId : 31
* innerPrice : 741.0
* productCount : 2.0
* type : PDS
* outerPrice : 11.0
* storeSum : 0.0
* shipSum : 0.0
* packageSum : 0.0
* usedSum : 0.0
* invoiceSum : 0.0
* usedReturnSum : null
* oddSum : 0.0
* lotNumber : GT200325002
* serialNumber : null
* annex : null
* tranFromStockId : null
* customerBranchFactoryId : null
* version : 0
* productName : 塞棒
* itemFlows : [{"createdBy":111,"createdByName":null,"createdTime":"2020-03-25 10:49:55","updatedBy":null,"updatedByName":null,"updatedTime":null,"id":902,"orderType":"SO","orderId":"SO10744","productId":31,"orderItemId":"50207b598298430aa0b77cc5a6865844","productCount":0,"eventCode":"SPLIT_PD","linkSerialNumber":null,"optUserId":111,"optComment":"拆成生产订单","eventCodeName":"拆成生产子订单","optUserName":"冯帆","orderTypeName":"销售订单","productName":"塞棒"}]
* stockQuantityDetailList : null
* stockQuantityDetailMaps : [{"stockName":"销售一内库","quantity":0,"applyOut":0,"stockTypeName":"内库","stockId":24,"applyInto":0,"productName":null},{"stockName":"销售一安阳现场","quantity":0,"applyOut":0,"stockTypeName":"现场库","stockId":25,"applyInto":0,"productName":null},{"stockName":"销售一未结算安阳","quantity":0,"applyOut":0,"stockTypeName":"未结算库","stockId":26,"applyInto":0,"productName":null}]
* productSoleCode : 70TNB393001
* productSimpleCode : B393
* productSpec : 1530
* productUnit : 支
* productWeight : 0.0
* canOutStoreProductSum : null
* canInStoreProductSum : null
* canUseProductSum : null
* canPackageSum : null
* launchDeptName : null
* launchDeptId : null
* receiveDeptName : null
* customerId : null
* customerName : null
* productOfKind : null
* canInvoiceSum : null
* orderType : null
* customerBranchFactoryName : null
* orderTypeName : null
*/
private Object createdBy;
private Object createdByName;
private Object createdTime;
private Object updatedBy;
private Object updatedByName;
private Object updatedTime;
private String id;
private String orderId;
private int productId;
private double innerPrice;
private double productCount;
private String type;
private double outerPrice;
private double storeSum;
private double shipSum;
private double packageSum;
private double usedSum;
private double invoiceSum;
private Object usedReturnSum;
private double oddSum;
private String lotNumber;
private Object serialNumber;
private Object annex;
private Object tranFromStockId;
private Object customerBranchFactoryId;
private int version;
private String productName;
private Object stockQuantityDetailList;
private String productSoleCode;
private String productSimpleCode;
private String productSpec;
private String productUnit;
private double productWeight;
private Object canOutStoreProductSum;
private Object canInStoreProductSum;
private Object canUseProductSum;
private Object canPackageSum;
private Object launchDeptName;
private Object launchDeptId;
private Object receiveDeptName;
private Object customerId;
private Object customerName;
private Object productOfKind;
private Object canInvoiceSum;
private Object orderType;
private Object customerBranchFactoryName;
private Object orderTypeName;
private List<ItemFlowsBean> itemFlows;
private List<StockQuantityDetailMapsBean> stockQuantityDetailMaps;
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 Object getCreatedTime() {
return createdTime;
}
public void setCreatedTime(Object createdTime) {
this.createdTime = createdTime;
}
public Object getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(Object updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public Object getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(Object updatedTime) {
this.updatedTime = updatedTime;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public int getProductId() {
return productId;
}
public void setProductId(int productId) {
this.productId = productId;
}
public double getInnerPrice() {
return innerPrice;
}
public void setInnerPrice(double innerPrice) {
this.innerPrice = innerPrice;
}
public double getProductCount() {
return productCount;
}
public void setProductCount(double productCount) {
this.productCount = productCount;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public double getOuterPrice() {
return outerPrice;
}
public void setOuterPrice(double outerPrice) {
this.outerPrice = outerPrice;
}
public double getStoreSum() {
return storeSum;
}
public void setStoreSum(double storeSum) {
this.storeSum = storeSum;
}
public double getShipSum() {
return shipSum;
}
public void setShipSum(double shipSum) {
this.shipSum = shipSum;
}
public double getPackageSum() {
return packageSum;
}
public void setPackageSum(double packageSum) {
this.packageSum = packageSum;
}
public double getUsedSum() {
return usedSum;
}
public void setUsedSum(double usedSum) {
this.usedSum = usedSum;
}
public double getInvoiceSum() {
return invoiceSum;
}
public void setInvoiceSum(double invoiceSum) {
this.invoiceSum = invoiceSum;
}
public Object getUsedReturnSum() {
return usedReturnSum;
}
public void setUsedReturnSum(Object usedReturnSum) {
this.usedReturnSum = usedReturnSum;
}
public double getOddSum() {
return oddSum;
}
public void setOddSum(double oddSum) {
this.oddSum = oddSum;
}
public String getLotNumber() {
return lotNumber;
}
public void setLotNumber(String lotNumber) {
this.lotNumber = lotNumber;
}
public Object getSerialNumber() {
return serialNumber;
}
public void setSerialNumber(Object serialNumber) {
this.serialNumber = serialNumber;
}
public Object getAnnex() {
return annex;
}
public void setAnnex(Object annex) {
this.annex = annex;
}
public Object getTranFromStockId() {
return tranFromStockId;
}
public void setTranFromStockId(Object tranFromStockId) {
this.tranFromStockId = tranFromStockId;
}
public Object getCustomerBranchFactoryId() {
return customerBranchFactoryId;
}
public void setCustomerBranchFactoryId(Object customerBranchFactoryId) {
this.customerBranchFactoryId = customerBranchFactoryId;
}
public int getVersion() {
return version;
}
public void setVersion(int version) {
this.version = version;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public Object getStockQuantityDetailList() {
return stockQuantityDetailList;
}
public void setStockQuantityDetailList(Object stockQuantityDetailList) {
this.stockQuantityDetailList = stockQuantityDetailList;
}
public String getProductSoleCode() {
return productSoleCode;
}
public void setProductSoleCode(String productSoleCode) {
this.productSoleCode = productSoleCode;
}
public String getProductSimpleCode() {
return productSimpleCode;
}
public void setProductSimpleCode(String productSimpleCode) {
this.productSimpleCode = productSimpleCode;
}
public String getProductSpec() {
return productSpec;
}
public void setProductSpec(String productSpec) {
this.productSpec = productSpec;
}
public String getProductUnit() {
return productUnit;
}
public void setProductUnit(String productUnit) {
this.productUnit = productUnit;
}
public double getProductWeight() {
return productWeight;
}
public void setProductWeight(double productWeight) {
this.productWeight = productWeight;
}
public Object getCanOutStoreProductSum() {
return canOutStoreProductSum;
}
public void setCanOutStoreProductSum(Object canOutStoreProductSum) {
this.canOutStoreProductSum = canOutStoreProductSum;
}
public Object getCanInStoreProductSum() {
return canInStoreProductSum;
}
public void setCanInStoreProductSum(Object canInStoreProductSum) {
this.canInStoreProductSum = canInStoreProductSum;
}
public Object getCanUseProductSum() {
return canUseProductSum;
}
public void setCanUseProductSum(Object canUseProductSum) {
this.canUseProductSum = canUseProductSum;
}
public Object getCanPackageSum() {
return canPackageSum;
}
public void setCanPackageSum(Object canPackageSum) {
this.canPackageSum = canPackageSum;
}
public Object getLaunchDeptName() {
return launchDeptName;
}
public void setLaunchDeptName(Object launchDeptName) {
this.launchDeptName = launchDeptName;
}
public Object getLaunchDeptId() {
return launchDeptId;
}
public void setLaunchDeptId(Object launchDeptId) {
this.launchDeptId = launchDeptId;
}
public Object getReceiveDeptName() {
return receiveDeptName;
}
public void setReceiveDeptName(Object receiveDeptName) {
this.receiveDeptName = receiveDeptName;
}
public Object getCustomerId() {
return customerId;
}
public void setCustomerId(Object customerId) {
this.customerId = customerId;
}
public Object getCustomerName() {
return customerName;
}
public void setCustomerName(Object customerName) {
this.customerName = customerName;
}
public Object getProductOfKind() {
return productOfKind;
}
public void setProductOfKind(Object productOfKind) {
this.productOfKind = productOfKind;
}
public Object getCanInvoiceSum() {
return canInvoiceSum;
}
public void setCanInvoiceSum(Object canInvoiceSum) {
this.canInvoiceSum = canInvoiceSum;
}
public Object getOrderType() {
return orderType;
}
public void setOrderType(Object orderType) {
this.orderType = orderType;
}
public Object getCustomerBranchFactoryName() {
return customerBranchFactoryName;
}
public void setCustomerBranchFactoryName(Object customerBranchFactoryName) {
this.customerBranchFactoryName = customerBranchFactoryName;
}
public Object getOrderTypeName() {
return orderTypeName;
}
public void setOrderTypeName(Object orderTypeName) {
this.orderTypeName = orderTypeName;
}
public List<ItemFlowsBean> getItemFlows() {
return itemFlows;
}
public void setItemFlows(List<ItemFlowsBean> itemFlows) {
this.itemFlows = itemFlows;
}
public List<StockQuantityDetailMapsBean> getStockQuantityDetailMaps() {
return stockQuantityDetailMaps;
}
public void setStockQuantityDetailMaps(List<StockQuantityDetailMapsBean> stockQuantityDetailMaps) {
this.stockQuantityDetailMaps = stockQuantityDetailMaps;
}
public static class ItemFlowsBean {
/**
* createdBy : 111
* createdByName : null
* createdTime : 2020-03-25 10:49:55
* updatedBy : null
* updatedByName : null
* updatedTime : null
* id : 902
* orderType : SO
* orderId : SO10744
* productId : 31
* orderItemId : 50207b598298430aa0b77cc5a6865844
* productCount : 0.0
* eventCode : SPLIT_PD
* linkSerialNumber : null
* optUserId : 111
* optComment : 拆成生产订单
* eventCodeName : 拆成生产子订单
* optUserName : 冯帆
* orderTypeName : 销售订单
* productName : 塞棒
*/
private int createdBy;
private Object createdByName;
private String createdTime;
private Object updatedBy;
private Object updatedByName;
private Object updatedTime;
private int id;
private String orderType;
private String orderId;
private int productId;
private String orderItemId;
private double productCount;
private String eventCode;
private Object linkSerialNumber;
private int optUserId;
private String optComment;
private String eventCodeName;
private String optUserName;
private String orderTypeName;
private String productName;
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 Object getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(Object updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public Object getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(Object updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getOrderType() {
return orderType;
}
public void setOrderType(String orderType) {
this.orderType = orderType;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public int getProductId() {
return productId;
}
public void setProductId(int productId) {
this.productId = productId;
}
public String getOrderItemId() {
return orderItemId;
}
public void setOrderItemId(String orderItemId) {
this.orderItemId = orderItemId;
}
public double getProductCount() {
return productCount;
}
public void setProductCount(double productCount) {
this.productCount = productCount;
}
public String getEventCode() {
return eventCode;
}
public void setEventCode(String eventCode) {
this.eventCode = eventCode;
}
public Object getLinkSerialNumber() {
return linkSerialNumber;
}
public void setLinkSerialNumber(Object linkSerialNumber) {
this.linkSerialNumber = linkSerialNumber;
}
public int getOptUserId() {
return optUserId;
}
public void setOptUserId(int optUserId) {
this.optUserId = optUserId;
}
public String getOptComment() {
return optComment;
}
public void setOptComment(String optComment) {
this.optComment = optComment;
}
public String getEventCodeName() {
return eventCodeName;
}
public void setEventCodeName(String eventCodeName) {
this.eventCodeName = eventCodeName;
}
public String getOptUserName() {
return optUserName;
}
public void setOptUserName(String optUserName) {
this.optUserName = optUserName;
}
public String getOrderTypeName() {
return orderTypeName;
}
public void setOrderTypeName(String orderTypeName) {
this.orderTypeName = orderTypeName;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
}
public static class StockQuantityDetailMapsBean {
/**
* stockName : 销售一内库
* quantity : 0
* applyOut : 0
* stockTypeName : 内库
* stockId : 24
* applyInto : 0
* productName : null
*/
private String stockName;
private String quantity;
private String applyOut;
private String stockTypeName;
private int stockId;
private String applyInto;
private Object productName;
public String getStockName() {
return stockName;
}
public void setStockName(String stockName) {
this.stockName = stockName;
}
public String getQuantity() {
return quantity;
}
public void setQuantity(String quantity) {
this.quantity = quantity;
}
public String getApplyOut() {
return applyOut;
}
public void setApplyOut(String applyOut) {
this.applyOut = applyOut;
}
public String getStockTypeName() {
return stockTypeName;
}
public void setStockTypeName(String stockTypeName) {
this.stockTypeName = stockTypeName;
}
public int getStockId() {
return stockId;
}
public void setStockId(int stockId) {
this.stockId = stockId;
}
public String getApplyInto() {
return applyInto;
}
public void setApplyInto(String applyInto) {
this.applyInto = applyInto;
}
public Object getProductName() {
return productName;
}
public void setProductName(Object productName) {
this.productName = productName;
}
}
}
public static class OrderFlowsBean {
/**
* createdBy : 677
* createdByName : null
* createdTime : 2020-03-25 10:56:16
* updatedBy : null
* updatedByName : null
* updatedTime : null
* id : 441
* orderType : SO
* orderId : SO10744
* eventCode : ACCEPT_OK
* optUserId : 677
* optComment :
* eventCodeName : 接单
* optUserName : 陈起来
* orderTypeName : 销售订单
*/
private int createdBy;
private Object createdByName;
private String createdTime;
private Object updatedBy;
private Object updatedByName;
private Object updatedTime;
private int id;
private String orderType;
private String orderId;
private String eventCode;
private int optUserId;
private String optComment;
private String eventCodeName;
private String optUserName;
private String orderTypeName;
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 Object getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(Object updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public Object getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(Object updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public String getOrderType() {
return orderType;
}
public void setOrderType(String orderType) {
this.orderType = orderType;
}
public String getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getEventCode() {
return eventCode;
}
public void setEventCode(String eventCode) {
this.eventCode = eventCode;
}
public int getOptUserId() {
return optUserId;
}
public void setOptUserId(int optUserId) {
this.optUserId = optUserId;
}
public String getOptComment() {
return optComment;
}
public void setOptComment(String optComment) {
this.optComment = optComment;
}
public String getEventCodeName() {
return eventCodeName;
}
public void setEventCodeName(String eventCodeName) {
this.eventCodeName = eventCodeName;
}
public String getOptUserName() {
return optUserName;
}
public void setOptUserName(String optUserName) {
this.optUserName = optUserName;
}
public String getOrderTypeName() {
return orderTypeName;
}
public void setOrderTypeName(String orderTypeName) {
this.orderTypeName = orderTypeName;
}
} }
} }
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 8ba6672f
...@@ -478,4 +478,12 @@ public interface ApiService { ...@@ -478,4 +478,12 @@ public interface ApiService {
@GET("/stockQuantityDetailFlow/page/list") @GET("/stockQuantityDetailFlow/page/list")
Observable<BaseBean> stockDetailFlow(@QueryMap Map<String, Object> param); Observable<BaseBean> stockDetailFlow(@QueryMap Map<String, Object> param);
/**
* 一个订单的详情[从订单列表进入]
*
* @return
*/
@GET(" /stockQuantity/app/oneOfOrder/{orderId}")
Observable<BaseBean> stockDetailFlow(@Path("orderId")String id , @Path("orderType")String orderType);
} }
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseOrderDetailActivity.java 0 → 100644
浏览文件 @ 8ba6672f
package com.wd.workoffice.ui.activity.bat.work;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkWarehouseOrderDetailAdapter;
import java.util.ArrayList;
import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 工作台 - 部门 -订单详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkWarehouseOrderDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_name)
TextView tvName;
@BindView(R.id.tv_order_type)
TextView tvOrderType;
@BindView(R.id.tv_order_dep)
TextView tvOrderDep;
@BindView(R.id.tv_receive_order_dep)
TextView tvReceiveOrderDep;
@BindView(R.id.tv_place_name)
TextView tvPlaceName;
@BindView(R.id.tv_receive_person)
TextView tvReceivePerson;
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.tv_process)
TextView tvProcess;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.tv_price)
TextView tvPrice;
@BindView(R.id.rv_data)
RecyclerView rvData;
private OrderBean dataBean;
private List<OrderBean.OrderItemsBean> dataList;
private WorkWarehouseOrderDetailAdapter workWarehouseOrderDetailAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
dataList = new ArrayList<>();
workWarehouseOrderDetailAdapter = new WorkWarehouseOrderDetailAdapter(R.layout.item_warehoust_order, dataList);
workWarehouseOrderDetailAdapter.bindToRecyclerView(rvData);
getData();
}
private void getData() {
RtfUtils.getRtf().stockDetailFlow(getIntent().getStringExtra("id"), getIntent().getStringExtra("type")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
dataBean = JSON.parseObject(data.getData().toString(), OrderBean.class);
tvName.setText(dataBean.getId());
tvProcess.setText(dataBean.getSubProcessName());
tvClient.setText(dataBean.getCustomerName());
tvOrderDep.setText(dataBean.getLaunchDeptName());
tvOrderType.setText(dataBean.getOrderType());
tvPlaceName.setText(dataBean.getLaunchUserName());
tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
tvReceiveOrderDep.setText(dataBean.getReceiveDeptName());
tvReceivePerson.setText(dataBean.getReceiveUserName());
tvTime.setText(dataBean.getCreatedTime());
dataList.addAll(dataBean.getOrderItems());
workWarehouseOrderDetailAdapter.notifyDataSetChanged();
}
});
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_work_warehouse_order_detail;
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkWarehouseOrderDetailAdapter.java 0 → 100644
浏览文件 @ 8ba6672f
package com.wd.workoffice.ui.adapter;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderBean;
import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkWarehouseOrderDetailAdapter extends BaseQuickAdapter<OrderBean.OrderItemsBean, BaseViewHolder> {
public WorkWarehouseOrderDetailAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, OrderBean.OrderItemsBean item) {
helper.setText(R.id.tv_name, item.getProductName());
helper.setText(R.id.tv_code, item.getProductSoleCode());
helper.setText(R.id.tv_img_code, item.getProductSimpleCode());
helper.setText(R.id.tv_price, String.valueOf(item.getOuterPrice()));
RecyclerView rvData = helper.getView(R.id.rv_data);
rvData.setLayoutManager(new LinearLayoutManager(helper.itemView.getContext(), RecyclerView.VERTICAL, false));
WorkWarehouseOrderStockAdapter workWarehouseOrderStockAdapter = new WorkWarehouseOrderStockAdapter(R.layout.item_warehoust_order_stock, item.getStockQuantityDetailMaps());
workWarehouseOrderStockAdapter.bindToRecyclerView(rvData);
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkWarehouseOrderStockAdapter.java 0 → 100644
浏览文件 @ 8ba6672f
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.StockBean;
import com.wd.workoffice.util.MathUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkWarehouseOrderStockAdapter extends BaseQuickAdapter<OrderBean.OrderItemsBean.StockQuantityDetailMapsBean, BaseViewHolder> {
public WorkWarehouseOrderStockAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, OrderBean.OrderItemsBean.StockQuantityDetailMapsBean item) {
helper.setText(R.id.tv_name, item.getStockName());
helper.setText(R.id.tv_type, item.getStockName());
helper.setText(R.id.tv_num, MathUtils.converData(item.getQuantity(), 3));
helper.setText(R.id.tv_out_num, MathUtils.converData(item.getApplyOut(), 3));
}
}
app/src/main/res/layout/activity_work_warehouse_order_detail.xml
浏览文件 @ 8ba6672f
...@@ -31,162 +31,293 @@ ...@@ -31,162 +31,293 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="10mm" android:layout_marginLeft="10mm"
android:text="基本信息" android:text="订单信息"
android:textSize="16sp" /> android:textSize="16sp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="单位名称"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_company_name"
android:layout_width="0dp"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:gravity="right"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</LinearLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white" android:background="@color/white"
android:gravity="center" android:orientation="vertical"
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="15mm"> android:paddingBottom="20mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="联系人"
android:textSize="16sp" />
<TextView <TextView
android:id="@+id/tv_link_man" android:id="@+id/tv_name"
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_marginTop="5mm"
android:text="销售二公司" android:text="邢台德龙钢铁客户"
android:textColor="@color/flexible_text_gray" android:textColor="@color/black"
android:textSize="16sp" android:textSize="16sp"
/> android:textStyle="bold" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
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="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="联系电话"
android:textSize="16sp" />
<TextView <LinearLayout
android:id="@+id/tv_link_phone" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_marginTop="14mm"
android:text="销售二公司" android:background="#FCFCFD"
android:textColor="@color/flexible_text_gray" android:orientation="vertical"
android:textSize="16sp" android:paddingVertical="10mm">
/>
</RelativeLayout> <RelativeLayout
android:layout_width="match_parent"
<View style="@style/dividerX" /> android:layout_height="wrap_content"
android:paddingHorizontal="10mm">
<RelativeLayout <TextView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_centerVertical="true"
android:background="@color/white" android:layout_marginLeft="10mm"
android:gravity="center" android:text="订单类型"
android:paddingHorizontal="20mm" android:textColor="@color/flexible_text_gray"
android:paddingVertical="15mm"> android:textSize="13sp" />
<TextView <TextView
android:layout_width="wrap_content" android:id="@+id/tv_order_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="下单部门"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_order_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="接单部门"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_receive_order_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="下单人"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_place_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="接单人"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_receive_person"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="所属客户"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_client"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="子流程名"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_process"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="下单时间"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="地址" android:layout_marginTop="10mm"
android:textSize="16sp" /> android:gravity="right">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="订单总价:￥"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>
<TextView </LinearLayout>
android:id="@+id/tv_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</RelativeLayout>
<View style="@style/dividerX" /> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:paddingVertical="10mm">
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView <View
android:layout_width="wrap_content" android:layout_width="8mm"
android:layout_height="wrap_content" android:layout_height="18mm"
android:text="所属流程" android:background="@color/red_btn_bg" />
android:textSize="16sp" />
<TextView <TextView
android:id="@+id/tv_process"
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_marginLeft="10mm"
android:text="销售二公司" android:text="活品库存信息"
android:layout_marginTop="5mm" android:textSize="16sp" />
android:textColor="@color/flexible_text_gray"
/>
</LinearLayout> </LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout> </LinearLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
app/src/main/res/layout/item_warehoust_order.xml 0 → 100644
浏览文件 @ 8ba6672f
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="保护渣"
android:textColor="@color/black" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="品号："
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="销售订单"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_img_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="订单号："
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="销售订单"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:gravity="right"
android:text="70"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5mm"
android:layout_marginTop="10mm"
android:text="库存信息"
android:textColor="@color/flexible_text_gray"
/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5mm"
android:layout_marginTop="5mm" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_warehoust_order_stock.xml 0 → 100644
浏览文件 @ 8ba6672f
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FCFCFD"
android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="销售内库"
android:textColor="@color/black"
android:textSize="15sp" />
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="下单时间"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_out_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="销售内库"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论