Skip to content

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

1.仓库list 

2.//TODO erp用户激活，忘记密码测试，产品下单还差附件，bat，mes，消息，我的，刷新token
上级 c28c7a3e
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 1449 行增加 和 133 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ f1fdc209
......@@ -345,6 +345,14 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkWarehouseActivity"
android:configChanges="keyboardHidden|orientation"
android:label="仓库"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/app/Config.java
浏览文件 @ f1fdc209
package com.wd.workoffice.app;
import java.util.Arrays;
import java.util.List;
public interface Config {
Boolean DEBUG = true;
String REGEX_USERNAME = "^[\\w]{4,16}(?<!_)$";
String REGEX_PASSWORD = "^[\\w]{6,16}(?<!_)$";
String APPID = "wx15bd4f8f85329782";
String CHINA_AREA_DATA = "CHINA_AREA_DATA";//全国省市区数据
String BUILDING_AVERAGE_PRICE = "BUILDING_AVERAGE_PRICE";//楼盘均价
String DEVELOPER = "DEVELOPER";//开发商
String CUSTOMER_STATUS = "CUSTOMER_STATUS";//客戶狀態
String DOWN_PAYMENTS = "DOWN_PAYMENTS";//首付
String BUILDING_TYPE_DATA = "BUILDING_TYPE_DATA";//楼盘类型
String BUILDING_ORDER = "BUILDING_ORDER";//楼盘排序
String FITMENT_TYPE = "FITMENT_TYPE";//装修类型
int SIZE = 10;
String ROLE_ADMIN = "ROLE_ADMIN";//分销员工
String ROLE_COMPANY_FIRST = "ROLE_COMPANY_FIRST";//总代公司/1
String ROLE_COMPANY_SECOND = "ROLE_COMPANY_SECOND";//分销公司2
String ROLE_PERSON_FIRST = "ROLE_PERSON_FIRST";//总代对接人3
String ROLE_PERSON_SECOND = "ROLE_PERSON_SECOND";//分销员工4
List<String> warehouseStatusList = Arrays.asList("全部状态", "销售订单", "外采购流程",
"供应订单", "坩埚订单", "内部交易订单", "组装订单");
List<String> warehouseCodeList = Arrays.asList("全部状态", "SO", "PO",
"FO", "CO", "IO", "AO");
int MAIN_NOTICE_TURNING = 4 * 1000;
int SPLASH_TIME = 4 * 1000;
......
app/src/main/java/com/wd/workoffice/bean/SaleOrderBean.java → app/src/main/java/com/wd/workoffice/bean/OrderBean.java
浏览文件 @ f1fdc209
......@@ -7,7 +7,7 @@ import java.util.List;
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class SaleOrderBean {
public class OrderBean {
/**
......@@ -66,7 +66,7 @@ public class SaleOrderBean {
private Object receiveUserName;
private int receiveDeptId;
private double launchOrderAmount;
private Object orderTypeName;
private String orderTypeName;
private String launchDeptName;
private String receiveDeptName;
private Object expandInfo;
......@@ -241,11 +241,11 @@ public class SaleOrderBean {
this.launchOrderAmount = launchOrderAmount;
}
public Object getOrderTypeName() {
public String getOrderTypeName() {
return orderTypeName;
}
public void setOrderTypeName(Object orderTypeName) {
public void setOrderTypeName(String orderTypeName) {
this.orderTypeName = orderTypeName;
}
......
app/src/main/java/com/wd/workoffice/bean/WarehouseOrderBean.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.bean;
import java.util.List;
public class WarehouseOrderBean {
/**
* code : 0
* message : null
* data : {"records":[{"createdBy":111,"createdByName":null,"createdTime":"2019-10-30 17:42:02","updatedBy":111,"updatedByName":null,"updatedTime":"2020-02-24 09:46:45","id":29,"soleCode":"70BHZBHZ1-1001","simpleCode":"BHZ1-1","name":"保护渣","spec":"165*320（Q195）","unit":"支","weight":1000,"internalPrice":105.9,"processType":"PROCESS_SALE,PROCESS_CRUCIBLE,PROCESS_SUPPLY","processTypeList":null,"productTypeId":5,"ofKind":"SM","expectOutputDeptId":118,"erpId":"AG10086","status":"1","createdUser":null,"shelfAction":null,"updatedUser":null,"outDeptId":null,"outDeptName":null,"productTypeName":null,"expectOutputDeptName":null,"isExpectOut":null,"ofKindName":null,"statusName":null,"relList":null,"outDeptCreatedBy":null,"outDeptCreatedTime":null,"transitPartId":null,"transitPartTypeCode":null,"remark":null},{"createdBy":143,"createdByName":null,"createdTime":"2019-12-30 16:04:46","updatedBy":143,"updatedByName":null,"updatedTime":"2019-12-31 13:41:43","id":33,"soleCode":"白刚玉","simpleCode":"白刚玉","name":"白刚玉","spec":"80#","unit":"吨","weight":2,"internalPrice":100,"processType":"PROCESS_PURCHASE,PROCESS_SALE,PROCESS_SUPPLY,PROCESS_CRUCIBLE","processTypeList":null,"productTypeId":3,"ofKind":"OS","expectOutputDeptId":129,"erpId":"白刚玉","status":"1","createdUser":null,"shelfAction":null,"updatedUser":null,"outDeptId":null,"outDeptName":null,"productTypeName":null,"expectOutputDeptName":null,"isExpectOut":null,"ofKindName":null,"statusName":null,"relList":null,"outDeptCreatedBy":null,"outDeptCreatedTime":null,"transitPartId":null,"transitPartTypeCode":null,"remark":null}],"total":2,"size":10,"current":1,"orders":[],"searchCount":true,"pages":1}
* httpStatus : 0
* path : null
* ext : null
*/
/**
* records : [{"createdBy":111,"createdByName":null,"createdTime":"2019-10-30 17:42:02","updatedBy":111,"updatedByName":null,"updatedTime":"2020-02-24 09:46:45","id":29,"soleCode":"70BHZBHZ1-1001","simpleCode":"BHZ1-1","name":"保护渣","spec":"165*320（Q195）","unit":"支","weight":1000,"internalPrice":105.9,"processType":"PROCESS_SALE,PROCESS_CRUCIBLE,PROCESS_SUPPLY","processTypeList":null,"productTypeId":5,"ofKind":"SM","expectOutputDeptId":118,"erpId":"AG10086","status":"1","createdUser":null,"shelfAction":null,"updatedUser":null,"outDeptId":null,"outDeptName":null,"productTypeName":null,"expectOutputDeptName":null,"isExpectOut":null,"ofKindName":null,"statusName":null,"relList":null,"outDeptCreatedBy":null,"outDeptCreatedTime":null,"transitPartId":null,"transitPartTypeCode":null,"remark":null},{"createdBy":143,"createdByName":null,"createdTime":"2019-12-30 16:04:46","updatedBy":143,"updatedByName":null,"updatedTime":"2019-12-31 13:41:43","id":33,"soleCode":"白刚玉","simpleCode":"白刚玉","name":"白刚玉","spec":"80#","unit":"吨","weight":2,"internalPrice":100,"processType":"PROCESS_PURCHASE,PROCESS_SALE,PROCESS_SUPPLY,PROCESS_CRUCIBLE","processTypeList":null,"productTypeId":3,"ofKind":"OS","expectOutputDeptId":129,"erpId":"白刚玉","status":"1","createdUser":null,"shelfAction":null,"updatedUser":null,"outDeptId":null,"outDeptName":null,"productTypeName":null,"expectOutputDeptName":null,"isExpectOut":null,"ofKindName":null,"statusName":null,"relList":null,"outDeptCreatedBy":null,"outDeptCreatedTime":null,"transitPartId":null,"transitPartTypeCode":null,"remark":null}]
* total : 2
* size : 10
* current : 1
* orders : []
* searchCount : true
* pages : 1
*/
private int total;
private int size;
private int current;
private boolean searchCount;
private int pages;
private List<OrderBean> records;
private List<?> orders;
public int getTotal() {
return total;
}
public void setTotal(int total) {
this.total = total;
}
public int getSize() {
return size;
}
public void setSize(int size) {
this.size = size;
}
public int getCurrent() {
return current;
}
public void setCurrent(int current) {
this.current = current;
}
public boolean isSearchCount() {
return searchCount;
}
public void setSearchCount(boolean searchCount) {
this.searchCount = searchCount;
}
public int getPages() {
return pages;
}
public void setPages(int pages) {
this.pages = pages;
}
public List<OrderBean> getRecords() {
return records;
}
public void setRecords(List<OrderBean> records) {
this.records = records;
}
public List<?> getOrders() {
return orders;
}
public void setOrders(List<?> orders) {
this.orders = orders;
}
}
app/src/main/java/com/wd/workoffice/bean/listener/WarehouseFilterClickListener.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.bean.listener;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public interface WarehouseFilterClickListener {
void clickType(String value);
void clickStatus(String value);
}
app/src/main/java/com/wd/workoffice/bean/listener/WarehouseOrderFilterClickListener.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.bean.listener;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public interface WarehouseOrderFilterClickListener {
void clickType(String value);
}
app/src/main/java/com/wd/workoffice/contract/SaleSaleContract.java
浏览文件 @ f1fdc209
package com.wd.workoffice.contract;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import java.util.List;
import java.util.Map;
......@@ -29,13 +28,13 @@ public interface SaleSaleContract {
}
interface View extends IBaseView {
void saleList(List<SaleOrderBean> dataList);
void saleList(List<OrderBean> dataList);
void outList(List<SaleOrderBean> dataList);
void outList(List<OrderBean> dataList);
void insideList(List<SaleOrderBean> dataList);
void insideList(List<OrderBean> dataList);
void supplierList(List<SaleOrderBean> dataList);
void supplierList(List<OrderBean> dataList);
}
interface Presenter extends IBasePresenter<View> {
......
app/src/main/java/com/wd/workoffice/contract/WorkWarehouseContract.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.contract;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.WarehoustBean;
import java.util.List;
import java.util.Map;
import flexible.xd.android_base.mvpBase.IBaseModel;
import flexible.xd.android_base.mvpBase.IBasePresenter;
import flexible.xd.android_base.mvpBase.IBaseView;
import io.reactivex.Observable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public interface WorkWarehouseContract {
interface Model extends IBaseModel {
Observable<BaseBean> getWarehouse(Map<String, Object> param);
Observable<BaseBean> getOrder(Map<String, Object> param);
}
interface View extends IBaseView {
void getWarehouse(List<WarehoustBean.RecordsBean> dataList);
void getOrder(List<OrderBean> dataList);
}
interface Presenter extends IBasePresenter<View> {
void getWarehouse(Map<String, Object> param);
void getOrder(Map<String, Object> param);
}
}
app/src/main/java/com/wd/workoffice/model/WorkWarehouseModel.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.model;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.contract.WorkWarehouseContract;
import com.wd.workoffice.retrofit.RtfUtils;
import java.util.Map;
import io.reactivex.Observable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkWarehouseModel implements WorkWarehouseContract.Model {
@Override
public Observable<BaseBean> getWarehouse(Map<String, Object> param) {
return RtfUtils.getRtf().getWarehouse(param);
}
@Override
public Observable<BaseBean> getOrder(Map<String, Object> param) {
return RtfUtils.getRtf().getWareHouseOrder(param);
}
public static WorkWarehouseModel newInstance() {
return new WorkWarehouseModel();
}
}
app/src/main/java/com/wd/workoffice/presenter/SaleSalePresenter.java
浏览文件 @ f1fdc209
......@@ -2,7 +2,7 @@ package com.wd.workoffice.presenter;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.model.SaleSaleModel;
import com.wd.workoffice.retrofit.WorkObserver;
......@@ -42,7 +42,7 @@ public class SaleSalePresenter extends BasePresenter<SaleSaleContract.View, Sale
return;
}
mView.saleList(JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), SaleOrderBean.class));
mView.saleList(JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), OrderBean.class));
}
});
}
......@@ -70,7 +70,7 @@ public class SaleSalePresenter extends BasePresenter<SaleSaleContract.View, Sale
return;
}
mView.outList(JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), SaleOrderBean.class));
mView.outList(JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), OrderBean.class));
}
});
}
......@@ -98,7 +98,7 @@ public class SaleSalePresenter extends BasePresenter<SaleSaleContract.View, Sale
return;
}
mView.insideList(JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), SaleOrderBean.class));
mView.insideList(JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), OrderBean.class));
}
});
}
......@@ -126,7 +126,7 @@ public class SaleSalePresenter extends BasePresenter<SaleSaleContract.View, Sale
return;
}
mView.supplierList(JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), SaleOrderBean.class));
mView.supplierList(JSON.parseArray(JSON.parseObject(data.getData().toString()).getString("records"), OrderBean.class));
}
});
}
......
app/src/main/java/com/wd/workoffice/presenter/WorkProPresenter.java
浏览文件 @ f1fdc209
......@@ -2,9 +2,7 @@ package com.wd.workoffice.presenter;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.contract.WorkProContract;
import com.wd.workoffice.model.WorkProModel;
import com.wd.workoffice.retrofit.WorkObserver;
......
app/src/main/java/com/wd/workoffice/presenter/WorkWarehousePresenter.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.presenter;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.WarehouseOrderBean;
import com.wd.workoffice.bean.WarehoustBean;
import com.wd.workoffice.contract.WorkWarehouseContract;
import com.wd.workoffice.model.WorkWarehouseModel;
import com.wd.workoffice.retrofit.WorkObserver;
import java.util.Map;
import flexible.xd.android_base.mvpBase.BasePresenter;
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 WorkWarehousePresenter extends BasePresenter<WorkWarehouseContract.View, WorkWarehouseContract.Model> implements WorkWarehouseContract.Presenter {
@Override
public void getWarehouse(Map<String, Object> param) {
mView.showLoading();
mModel.getWarehouse(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
mDisposable.add(d);
}
@Override
public void onFail(String errorMsg) {
mView.hideLoading();
mView.onError(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
mView.hideLoading();
if (data.getCode() != 0) {
mView.onError(data.getMessage());
return;
}
mView.getWarehouse(JSON.parseObject(data.getData().toString(), WarehoustBean.class).getRecords());
}
});
}
@Override
public void getOrder(Map<String, Object> param) {
mView.showLoading();
mModel.getOrder(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
mDisposable.add(d);
}
@Override
public void onFail(String errorMsg) {
mView.hideLoading();
mView.onError(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
mView.hideLoading();
if (data.getCode() != 0) {
mView.onError(data.getMessage());
return;
}
mView.getOrder(JSON.parseObject(data.getData().toString(), WarehouseOrderBean.class).getRecords());
}
});
}
@Override
public WorkWarehouseContract.Model bindModel() {
return WorkWarehouseModel.newInstance();
}
}
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ f1fdc209
......@@ -452,8 +452,39 @@ public interface ApiService {
* @param param
* @return
*/
@GET(" /finance/flow/page/list")
@GET("/finance/flow/page/list")
Observable<BaseBean> getFlow(@QueryMap Map<String, Object> param);
/**
* 仓库
* @param param
*
* stockTypeId 库存类别id
*status 1：启用 0：停用
*isShowByDateDesc 是否按时间倒叙展示
* siteType IN：厂内库 OUT：场外库
* searchKey 按名称模糊搜索时，该参数为name
* searchValue 模糊搜索的关键字
* @return
*/
@GET("/stock/page/list")
Observable<BaseBean> getWarehouse(@QueryMap Map<String, Object> param);
/**
* 仓库
* @param param
*
* stockTypeId 库存类别id
*status 1：启用 0：停用
*isShowByDateDesc 是否按时间倒叙展示
* siteType IN：厂内库 OUT：场外库
* searchKey 按名称模糊搜索时，该参数为name
* searchValue 模糊搜索的关键字
* @return
*/
@GET("/stockQuantity/app/page/listOfOrder")
Observable<BaseBean> getWareHouseOrder(@QueryMap Map<String, Object> param);
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/InsideOrderSearchActivity.java
浏览文件 @ f1fdc209
......@@ -7,7 +7,7 @@ import android.widget.EditText;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.SaleInsideAdapter;
......@@ -40,7 +40,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
RecyclerView rvData;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
private List<SaleOrderBean> orderList;
private List<OrderBean> orderList;
private SaleInsideAdapter orderAdapter;
private int page = 1;
private String identity;
......@@ -108,17 +108,17 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
public void saleList(List<OrderBean> dataList) {
}
@Override
public void outList(List<SaleOrderBean> dataList) {
public void outList(List<OrderBean> dataList) {
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
public void insideList(List<OrderBean> dataList) {
toast("加载成功");
if (page == 1) {
orderList.clear();
......@@ -138,7 +138,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
public void supplierList(List<OrderBean> dataList) {
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/OutOrderSearchActivity.java
浏览文件 @ f1fdc209
......@@ -7,7 +7,7 @@ import android.widget.EditText;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.ProOutAdapter;
......@@ -41,7 +41,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
RecyclerView rvData;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
private List<SaleOrderBean> orderList;
private List<OrderBean> orderList;
private SaleOutAdapter saleAdapter;
private ProOutAdapter proAdapter;
private int page = 1;
......@@ -129,12 +129,12 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
public void saleList(List<OrderBean> dataList) {
}
@Override
public void outList(List<SaleOrderBean> dataList) {
public void outList(List<OrderBean> dataList) {
toast("加载成功");
if (page == 1) {
orderList.clear();
......@@ -169,12 +169,12 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
public void insideList(List<OrderBean> dataList) {
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
public void supplierList(List<OrderBean> dataList) {
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/SaleOrderSearchActivity.java
浏览文件 @ f1fdc209
......@@ -7,7 +7,7 @@ import android.widget.EditText;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.ProSaleAdapter;
......@@ -41,7 +41,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
RecyclerView rvData;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
private List<SaleOrderBean> orderList;
private List<OrderBean> orderList;
private SaleSaleAdapter saleAdapter;
private ProSaleAdapter proAdapter;
private int page = 1;
......@@ -129,7 +129,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
public void saleList(List<OrderBean> dataList) {
toast("加载成功");
if (page == 1) {
orderList.clear();
......@@ -164,17 +164,17 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
}
@Override
public void outList(List<SaleOrderBean> dataList) {
public void outList(List<OrderBean> dataList) {
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
public void insideList(List<OrderBean> dataList) {
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
public void supplierList(List<OrderBean> dataList) {
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/SupplierOrderSearchActivity.java
浏览文件 @ f1fdc209
......@@ -7,7 +7,7 @@ import android.widget.EditText;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.ProSupplierAdapter;
......@@ -41,7 +41,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
RecyclerView rvData;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
private List<SaleOrderBean> orderList;
private List<OrderBean> orderList;
private SaleSupplierAdapter saleAdapter;
private ProSupplierAdapter proAdapter;
private int page = 1;
......@@ -128,22 +128,22 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
public void saleList(List<OrderBean> dataList) {
}
@Override
public void outList(List<SaleOrderBean> dataList) {
public void outList(List<OrderBean> dataList) {
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
public void insideList(List<OrderBean> dataList) {
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
public void supplierList(List<OrderBean> dataList) {
toast("加载成功");
if (page == 1) {
orderList.clear();
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkProPriceActivity.java
浏览文件 @ f1fdc209
......@@ -8,13 +8,9 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ClientBean;
import com.wd.workoffice.bean.ProPriceBean;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.SaleInsideAdapter;
import com.wd.workoffice.ui.adapter.WorkProPriceAdapter;
import com.wd.workoffice.util.WorkUtils;
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseActivity.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.ui.activity.bat.work;
import android.view.Menu;
import android.view.MenuItem;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.WorkWarehouse1Fragment;
import com.wd.workoffice.ui.fg.WorkWarehouse2Fragment;
import java.util.ArrayList;
import java.util.List;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 工作台 - 仓库
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkWarehouseActivity extends WorkToolBarActivity {
@BindView(R.id.tl_tab)
TabLayout tlTab;
@BindView(R.id.vp_data)
ViewPager vpData;
private String tab[] = {"仓库列表", "订单列表",};
@Override
protected void initView() {
ButterKnife.bind(this);
tlTab.setupWithViewPager(vpData);
}
@Override
protected void initData() {
FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>();
WorkWarehouse1Fragment workWarehouse1Fragment = new WorkWarehouse1Fragment();
WorkWarehouse2Fragment workWarehouse2Fragment = new WorkWarehouse2Fragment();
data.add(workWarehouse1Fragment);
data.add(workWarehouse2Fragment);
VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
vpData.setAdapter(vpFgAdapter);
for (int i = 0; i < tab.length; i++) {
tlTab.getTabAt(i).setText(tab[i]);
}
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_pro;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
// startActivity(WorkProSearchActivity.class);
break;
}
return super.onOptionsItemSelected(item);
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/ProOutAdapter.java
浏览文件 @ f1fdc209
......@@ -4,7 +4,7 @@ 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.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import java.util.List;
......@@ -12,7 +12,7 @@ import java.util.List;
* Created by flexible on 2018/8/13.
*/
public class ProOutAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewHolder> {
public class ProOutAdapter extends BaseQuickAdapter<OrderBean, BaseViewHolder> {
public ProOutAdapter(int layoutResId, List data) {
super(layoutResId, data);
......@@ -20,7 +20,7 @@ public class ProOutAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewHolde
@Override
protected void convert(BaseViewHolder helper, SaleOrderBean item) {
protected void convert(BaseViewHolder helper, OrderBean item) {
helper.setText(R.id.tv_name, item.getCustomerName());
helper.setText(R.id.tv_status, item.getStatusName());
helper.setGone(R.id.rl_dep, true);
......
app/src/main/java/com/wd/workoffice/ui/adapter/ProSaleAdapter.java
浏览文件 @ f1fdc209
......@@ -4,7 +4,7 @@ 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.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import java.util.List;
......@@ -12,7 +12,7 @@ import java.util.List;
* Created by flexible on 2018/8/13.
*/
public class ProSaleAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewHolder> {
public class ProSaleAdapter extends BaseQuickAdapter<OrderBean, BaseViewHolder> {
public ProSaleAdapter(int layoutResId, List data) {
super(layoutResId, data);
......@@ -20,7 +20,7 @@ public class ProSaleAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewHold
@Override
protected void convert(BaseViewHolder helper, SaleOrderBean item) {
protected void convert(BaseViewHolder helper, OrderBean item) {
helper.setText(R.id.tv_name, item.getCustomerName());
helper.setGone(R.id.rl_dep, true);
helper.setText(R.id.tv_status, item.getStatusName());
......
app/src/main/java/com/wd/workoffice/ui/adapter/ProSupplierAdapter.java
浏览文件 @ f1fdc209
......@@ -4,7 +4,7 @@ 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.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import java.util.List;
......@@ -12,7 +12,7 @@ import java.util.List;
* Created by flexible on 2018/8/13.
*/
public class ProSupplierAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewHolder> {
public class ProSupplierAdapter extends BaseQuickAdapter<OrderBean, BaseViewHolder> {
public ProSupplierAdapter(int layoutResId, List data) {
super(layoutResId, data);
......@@ -20,7 +20,7 @@ public class ProSupplierAdapter extends BaseQuickAdapter<SaleOrderBean, BaseView
@Override
protected void convert(BaseViewHolder helper, SaleOrderBean item) {
protected void convert(BaseViewHolder helper, OrderBean item) {
helper.setText(R.id.tv_name, item.getSupplierName() );
helper.setGone(R.id.rl_dep, true);
helper.setText(R.id.tv_status, item.getStatusName());
......
app/src/main/java/com/wd/workoffice/ui/adapter/SaleInsideAdapter.java
浏览文件 @ f1fdc209
......@@ -4,7 +4,7 @@ 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.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import java.util.List;
......@@ -12,7 +12,7 @@ import java.util.List;
* Created by flexible on 2018/8/13.
*/
public class SaleInsideAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewHolder> {
public class SaleInsideAdapter extends BaseQuickAdapter<OrderBean, BaseViewHolder> {
public SaleInsideAdapter(int layoutResId, List data) {
super(layoutResId, data);
......@@ -20,7 +20,7 @@ public class SaleInsideAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewH
@Override
protected void convert(BaseViewHolder helper, SaleOrderBean item) {
protected void convert(BaseViewHolder helper, OrderBean item) {
helper.setText(R.id.tv_name, item.getReceiveDeptName());
helper.setText(R.id.tv_status, item.getStatusName());
helper.setText(R.id.tv_place_name, item.getLaunchUserName());
......
app/src/main/java/com/wd/workoffice/ui/adapter/SaleOutAdapter.java
浏览文件 @ f1fdc209
......@@ -4,7 +4,7 @@ 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.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import java.util.List;
......@@ -12,7 +12,7 @@ import java.util.List;
* Created by flexible on 2018/8/13.
*/
public class SaleOutAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewHolder> {
public class SaleOutAdapter extends BaseQuickAdapter<OrderBean, BaseViewHolder> {
public SaleOutAdapter(int layoutResId, List data) {
super(layoutResId, data);
......@@ -20,7 +20,7 @@ public class SaleOutAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewHold
@Override
protected void convert(BaseViewHolder helper, SaleOrderBean item) {
protected void convert(BaseViewHolder helper, OrderBean item) {
helper.setText(R.id.tv_name, item.getCustomerName());
helper.setText(R.id.tv_status, item.getStatusName());
helper.setText(R.id.tv_dep, item.getReceiveDeptName());
......
app/src/main/java/com/wd/workoffice/ui/adapter/SaleSaleAdapter.java
浏览文件 @ f1fdc209
......@@ -4,7 +4,7 @@ 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.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import java.util.List;
......@@ -12,7 +12,7 @@ import java.util.List;
* Created by flexible on 2018/8/13.
*/
public class SaleSaleAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewHolder> {
public class SaleSaleAdapter extends BaseQuickAdapter<OrderBean, BaseViewHolder> {
public SaleSaleAdapter(int layoutResId, List data) {
super(layoutResId, data);
......@@ -20,7 +20,7 @@ public class SaleSaleAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewHol
@Override
protected void convert(BaseViewHolder helper, SaleOrderBean item) {
protected void convert(BaseViewHolder helper, OrderBean item) {
helper.setText(R.id.tv_name, item.getCustomerName());
helper.setText(R.id.tv_dep, item.getReceiveDeptName());
helper.setText(R.id.tv_status, item.getStatusName());
......
app/src/main/java/com/wd/workoffice/ui/adapter/SaleSupplierAdapter.java
浏览文件 @ f1fdc209
......@@ -4,7 +4,7 @@ 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.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import java.util.List;
......@@ -12,7 +12,7 @@ import java.util.List;
* Created by flexible on 2018/8/13.
*/
public class SaleSupplierAdapter extends BaseQuickAdapter<SaleOrderBean, BaseViewHolder> {
public class SaleSupplierAdapter extends BaseQuickAdapter<OrderBean, BaseViewHolder> {
public SaleSupplierAdapter(int layoutResId, List data) {
super(layoutResId, data);
......@@ -20,7 +20,7 @@ public class SaleSupplierAdapter extends BaseQuickAdapter<SaleOrderBean, BaseVie
@Override
protected void convert(BaseViewHolder helper, SaleOrderBean item) {
protected void convert(BaseViewHolder helper, OrderBean item) {
helper.setText(R.id.tv_name, item.getSupplierName() );
helper.setText(R.id.tv_dep, item.getReceiveDeptName());
helper.setText(R.id.tv_status, item.getStatusName());
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkProPriceAdapter.java
浏览文件 @ f1fdc209
......@@ -5,7 +5,6 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProPriceBean;
import com.wd.workoffice.bean.SaleOrderBean;
import java.util.List;
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkWarehouseAdapter.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.ui.adapter;
import android.text.TextUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProPriceBean;
import com.wd.workoffice.bean.WarehoustBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkWarehouseAdapter extends BaseQuickAdapter<WarehoustBean.RecordsBean, BaseViewHolder> {
public WorkWarehouseAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, WarehoustBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getName());
helper.setText(R.id.tv_code, item.getCode());
helper.setText(R.id.tv_dep, item.getDeptName());
WarehoustBean.RecordsBean.OfTypeBean ofType = item.getOfType();
if (ofType != null) {
helper.setText(R.id.tv_clazz, ofType.getName());
if (ofType.getType().equals("IN")) {
helper.setText(R.id.tv_type,"厂内库");
} else {
helper.setText(R.id.tv_type,"场外库");
}
}
helper.setText(R.id.tv_client, item.getCustomerName());
helper.setText(R.id.tv_dep, TextUtils.equals(item.getStatus(),"1")?"已启动":"未启动");
helper.setText(R.id.tv_time, item.getCreatedTime());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkWarehouseOrderAdapter.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.ui.adapter;
import android.text.TextUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.WarehoustBean;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkWarehouseOrderAdapter extends BaseQuickAdapter<OrderBean, BaseViewHolder> {
public WorkWarehouseOrderAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, OrderBean item) {
helper.setText(R.id.tv_name, item.getOrderTypeName());
helper.setText(R.id.tv_type, item.getId());
helper.setText(R.id.tv_dep, item.getLaunchDeptName());
helper.setText(R.id.tv_receive_dep, item.getReceiveDeptName());
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_price, String.valueOf(item.getLaunchOrderAmount()));
}
}
app/src/main/java/com/wd/workoffice/ui/fg/MainFragment.java
浏览文件 @ f1fdc209
......@@ -27,6 +27,7 @@ import com.wd.workoffice.ui.activity.bat.sale.SaleSupplierOrderActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkAccountActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkContactsActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkProActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseActivity;
import com.wd.workoffice.ui.adapter.BatLayoutAdapter;
import com.wd.workoffice.util.UserKeeper;
......@@ -252,6 +253,7 @@ public class MainFragment extends WorkBaseFg {
startActivity(WorkAccountActivity.class);
break;
case 3:
startActivity(WorkWarehouseActivity.class);
break;
case 4:
break;
......
app/src/main/java/com/wd/workoffice/ui/fg/ProOutFragment.java
浏览文件 @ f1fdc209
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.ProOutAdapter;
......@@ -34,7 +34,7 @@ public class ProOutFragment extends WorkBaseFg implements SaleSaleContract.View
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
private List<SaleOrderBean> orderList;
private List<OrderBean> orderList;
private ProOutAdapter orderAdapter;
private int page = 1;
private String identity;
......@@ -89,12 +89,12 @@ public class ProOutFragment extends WorkBaseFg implements SaleSaleContract.View
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
public void saleList(List<OrderBean> dataList) {
}
@Override
public void outList(List<SaleOrderBean> dataList) {
public void outList(List<OrderBean> dataList) {
if (page == 1) {
orderList.clear();
orderList.addAll(dataList);
......@@ -113,12 +113,12 @@ public class ProOutFragment extends WorkBaseFg implements SaleSaleContract.View
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
public void insideList(List<OrderBean> dataList) {
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
public void supplierList(List<OrderBean> dataList) {
}
}
app/src/main/java/com/wd/workoffice/ui/fg/ProSaleFragment.java
浏览文件 @ f1fdc209
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.ProSaleAdapter;
......@@ -34,7 +34,7 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
private List<SaleOrderBean> orderList;
private List<OrderBean> orderList;
private ProSaleAdapter orderAdapter;
private int page = 1;
private String identity;
......@@ -89,7 +89,7 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
public void saleList(List<OrderBean> dataList) {
if (page == 1) {
orderList.clear();
orderList.addAll(dataList);
......@@ -108,17 +108,17 @@ public class ProSaleFragment extends WorkBaseFg implements SaleSaleContract.View
}
@Override
public void outList(List<SaleOrderBean> dataList) {
public void outList(List<OrderBean> dataList) {
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
public void insideList(List<OrderBean> dataList) {
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
public void supplierList(List<OrderBean> dataList) {
}
}
app/src/main/java/com/wd/workoffice/ui/fg/ProSupplierFragment.java
浏览文件 @ f1fdc209
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.ProSupplierAdapter;
......@@ -34,7 +34,7 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
private List<SaleOrderBean> orderList;
private List<OrderBean> orderList;
private ProSupplierAdapter orderAdapter;
private int page = 1;
private String identity;
......@@ -89,22 +89,22 @@ public class ProSupplierFragment extends WorkBaseFg implements SaleSaleContract.
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
public void saleList(List<OrderBean> dataList) {
}
@Override
public void outList(List<SaleOrderBean> dataList) {
public void outList(List<OrderBean> dataList) {
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
public void insideList(List<OrderBean> dataList) {
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
public void supplierList(List<OrderBean> dataList) {
if (page == 1) {
orderList.clear();
orderList.addAll(dataList);
......
app/src/main/java/com/wd/workoffice/ui/fg/SaleInsideFragment.java
浏览文件 @ f1fdc209
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.SaleInsideAdapter;
......@@ -33,7 +33,7 @@ public class SaleInsideFragment extends WorkBaseFg implements SaleSaleContract.V
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
private List<SaleOrderBean> orderList;
private List<OrderBean> orderList;
private SaleInsideAdapter orderAdapter;
private int page = 1;
private String identity;
......@@ -89,17 +89,17 @@ public class SaleInsideFragment extends WorkBaseFg implements SaleSaleContract.V
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
public void saleList(List<OrderBean> dataList) {
}
@Override
public void outList(List<SaleOrderBean> dataList) {
public void outList(List<OrderBean> dataList) {
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
public void insideList(List<OrderBean> dataList) {
if (page == 1) {
orderList.clear();
orderList.addAll(dataList);
......@@ -118,7 +118,7 @@ public class SaleInsideFragment extends WorkBaseFg implements SaleSaleContract.V
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
public void supplierList(List<OrderBean> dataList) {
}
}
app/src/main/java/com/wd/workoffice/ui/fg/SaleOutFragment.java
浏览文件 @ f1fdc209
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.SaleOutAdapter;
......@@ -34,7 +34,7 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
private List<SaleOrderBean> orderList;
private List<OrderBean> orderList;
private SaleOutAdapter orderAdapter;
private int page = 1;
private String identity;
......@@ -89,12 +89,12 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
public void saleList(List<OrderBean> dataList) {
}
@Override
public void outList(List<SaleOrderBean> dataList) {
public void outList(List<OrderBean> dataList) {
if (page == 1) {
orderList.clear();
orderList.addAll(dataList);
......@@ -113,12 +113,12 @@ public class SaleOutFragment extends WorkBaseFg implements SaleSaleContract.View
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
public void insideList(List<OrderBean> dataList) {
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
public void supplierList(List<OrderBean> dataList) {
}
}
app/src/main/java/com/wd/workoffice/ui/fg/SaleSaleFragment.java
浏览文件 @ f1fdc209
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
......@@ -34,7 +34,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
private List<SaleOrderBean> orderList;
private List<OrderBean> orderList;
private SaleSaleAdapter orderAdapter;
private int page = 1;
private String identity;
......@@ -89,7 +89,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
public void saleList(List<OrderBean> dataList) {
if (page == 1) {
orderList.clear();
orderList.addAll(dataList);
......@@ -108,17 +108,17 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
}
@Override
public void outList(List<SaleOrderBean> dataList) {
public void outList(List<OrderBean> dataList) {
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
public void insideList(List<OrderBean> dataList) {
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
public void supplierList(List<OrderBean> dataList) {
}
}
app/src/main/java/com/wd/workoffice/ui/fg/SaleSupplierFragment.java
浏览文件 @ f1fdc209
......@@ -5,7 +5,7 @@ import android.os.Bundle;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SaleOrderBean;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.adapter.SaleSupplierAdapter;
......@@ -34,7 +34,7 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
private String state;
private SaleSalePresenter saleSalePresenter;
private Map<String, Object> param;
private List<SaleOrderBean> orderList;
private List<OrderBean> orderList;
private SaleSupplierAdapter orderAdapter;
private int page = 1;
private String identity;
......@@ -89,22 +89,22 @@ public class SaleSupplierFragment extends WorkBaseFg implements SaleSaleContract
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
public void saleList(List<OrderBean> dataList) {
}
@Override
public void outList(List<SaleOrderBean> dataList) {
public void outList(List<OrderBean> dataList) {
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
public void insideList(List<OrderBean> dataList) {
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
public void supplierList(List<OrderBean> dataList) {
if (page == 1) {
orderList.clear();
orderList.addAll(dataList);
......
app/src/main/java/com/wd/workoffice/ui/fg/WorkProFragment.java
浏览文件 @ f1fdc209
......@@ -13,15 +13,13 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.StockBean;
import com.wd.workoffice.bean.listener.ProFilterClickListener;
import com.wd.workoffice.contract.WorkProContract;
import com.wd.workoffice.presenter.WorkProPresenter;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
import com.wd.workoffice.ui.adapter.WorkProductAdapter;
import com.wd.workoffice.util.ProFilterData;
import com.wd.workoffice.util.ddmfilter.ProFilterData;
import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.widget.AddAndReduceView;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
......
app/src/main/java/com/wd/workoffice/ui/fg/WorkWarehouse1Fragment.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.ui.fg;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
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.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.WarehoustBean;
import com.wd.workoffice.bean.listener.ProFilterClickListener;
import com.wd.workoffice.bean.listener.WarehouseFilterClickListener;
import com.wd.workoffice.contract.WorkProContract;
import com.wd.workoffice.contract.WorkWarehouseContract;
import com.wd.workoffice.presenter.WorkProPresenter;
import com.wd.workoffice.presenter.WorkWarehousePresenter;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseActivity;
import com.wd.workoffice.ui.adapter.WorkProductAdapter;
import com.wd.workoffice.ui.adapter.WorkWarehouseAdapter;
import com.wd.workoffice.util.ddmfilter.ProFilterData;
import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.WarehouseFilterData;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkWarehouse1Fragment extends WorkBaseFg implements WorkWarehouseContract.View {
@BindView(R.id.ddm_choose)
DropDownMenu ddmChoose;
private String ofKind;
private RecyclerView rvData;
private int page = 1;
private Map<String, Object> param;
private SmartRefreshLayout srlRefresh;
private WorkWarehousePresenter workProPresenter;
private WorkWarehouseAdapter workProductAdapter;
private List<WarehoustBean.RecordsBean> dataList;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
workProPresenter = new WorkWarehousePresenter();
workProPresenter.onAttach(this);
WarehouseFilterData filterData = new WarehouseFilterData(ddmChoose, new WarehouseFilterClickListener() {
@Override
public void clickType(String value) {
if (TextUtils.equals(value, "全部类型")) {
param.put("siteType", "");
} else if (TextUtils.equals(value, "厂内库")) {
param.put("siteType", "IN");
} else {
param.put("siteType", "OUT");
}
page = 1;
param.put("current", page);
workProPresenter.getWarehouse(param);
}
@Override
public void clickStatus(String value) {
if (TextUtils.equals(value, "全部状态")) {
param.put("status", "");
} else if (TextUtils.equals(value, "未启用")) {
param.put("status", "0");
} else {
param.put("status", "1");
}
page = 1;
param.put("current", page);
workProPresenter.getWarehouse(param);
}
});
rvData = filterData.getRvData();
srlRefresh = filterData.getSrlRefresh();
}
@Override
protected void initData() {
param = WorkUtils.pageKey();
page = 1;
param.put("current", page);
dataList = new ArrayList<>();
workProductAdapter = new WorkWarehouseAdapter(R.layout.item_work_warehouse, dataList);
workProductAdapter.bindToRecyclerView(rvData);
workProductAdapter.setEmptyView(R.layout.view_empty_content, rvData);
workProPresenter.getWarehouse(param);
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
workProPresenter.getWarehouse(param);
});
workProductAdapter.setOnLoadMoreListener(() -> {
param.put("current", page);
workProPresenter.getWarehouse(param);
}, rvData);
workProductAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkProDetailActivity.class, "pro", JSON.toJSONString(dataList.get(position)));
}
});
}
@Override
protected int layoutId() {
return R.layout.fg_work_warehouse;
}
@Override
public void getWarehouse(List<WarehoustBean.RecordsBean> data) {
if (page == 1) {
dataList.clear();
dataList.addAll(data);
workProductAdapter.notifyDataSetChanged();
workProductAdapter.loadMoreComplete();
srlRefresh.finishRefresh();
} else {
workProductAdapter.loadMoreComplete();
dataList.addAll(data);
workProductAdapter.notifyDataSetChanged();
}
if (data.size() == 0) {
workProductAdapter.loadMoreEnd();
} else {
page++;
}
}
@Override
public void getOrder(List<OrderBean> dataList) {
}
}
app/src/main/java/com/wd/workoffice/ui/fg/WorkWarehouse2Fragment.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.ui.fg;
import android.view.View;
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.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.WarehoustBean;
import com.wd.workoffice.bean.listener.WarehouseOrderFilterClickListener;
import com.wd.workoffice.contract.WorkWarehouseContract;
import com.wd.workoffice.presenter.WorkWarehousePresenter;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
import com.wd.workoffice.ui.adapter.WorkWarehouseOrderAdapter;
import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.WarehouseOrderFilterData;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkWarehouse2Fragment extends WorkBaseFg implements WorkWarehouseContract.View {
@BindView(R.id.ddm_choose)
DropDownMenu ddmChoose;
private RecyclerView rvData;
private int page = 1;
private Map<String, Object> param;
private SmartRefreshLayout srlRefresh;
private WorkWarehousePresenter workProPresenter;
private WorkWarehouseOrderAdapter workProductAdapter;
private List<OrderBean> dataList;
@Override
protected void initView() {
ButterKnife.bind(this, getContentView());
workProPresenter = new WorkWarehousePresenter();
workProPresenter.onAttach(this);
WarehouseOrderFilterData filterData = new WarehouseOrderFilterData(ddmChoose, new WarehouseOrderFilterClickListener() {
@Override
public void clickType(String value) {
param.put("orderType", value);
page = 1;
param.put("current", page);
workProPresenter.getOrder(param);
}
});
rvData = filterData.getRvData();
srlRefresh = filterData.getSrlRefresh();
}
@Override
protected void initData() {
param = WorkUtils.pageKey();
page = 1;
param.put("current", page);
dataList = new ArrayList<>();
workProductAdapter = new WorkWarehouseOrderAdapter(R.layout.item_work_warehouse_order, dataList);
workProductAdapter.bindToRecyclerView(rvData);
workProductAdapter.setEmptyView(R.layout.view_empty_content, rvData);
workProPresenter.getOrder(param);
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(refreshLayout -> {
page = 1;
param.put("current", page);
workProPresenter.getOrder(param);
});
workProductAdapter.setOnLoadMoreListener(() -> {
param.put("current", page);
workProPresenter.getOrder(param);
}, rvData);
workProductAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkProDetailActivity.class, "pro", JSON.toJSONString(dataList.get(position)));
}
});
}
@Override
protected int layoutId() {
return R.layout.fg_work_warehouse;
}
@Override
public void getWarehouse(List<WarehoustBean.RecordsBean> data) {
}
@Override
public void getOrder(List<OrderBean> data) {
if (page == 1) {
dataList.clear();
dataList.addAll(data);
workProductAdapter.notifyDataSetChanged();
workProductAdapter.loadMoreComplete();
srlRefresh.finishRefresh();
} else {
workProductAdapter.loadMoreComplete();
dataList.addAll(data);
workProductAdapter.notifyDataSetChanged();
}
if (data.size() == 0) {
workProductAdapter.loadMoreEnd();
} else {
page++;
}
}
}
app/src/main/java/com/wd/workoffice/util/ProFilterData.java → app/src/main/java/com/wd/workoffice/util/ddmfilter/ProFilterData.java
浏览文件 @ f1fdc209
package com.wd.workoffice.util;
package com.wd.workoffice.util.ddmfilter;
import android.view.LayoutInflater;
import android.view.View;
......
app/src/main/java/com/wd/workoffice/util/ddmfilter/WarehouseFilterData.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.util.ddmfilter;
import android.view.LayoutInflater;
import android.view.View;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkApp;
import com.wd.workoffice.bean.listener.ProFilterClickListener;
import com.wd.workoffice.bean.listener.WarehouseFilterClickListener;
import com.wd.workoffice.ui.adapter.FilterAdapter;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WarehouseFilterData {
DropDownMenu menu;
private List<View> viewList;
private View mainView;
private RecyclerView rvData;
private SmartRefreshLayout srlRefresh;
private List<String> statusList = Arrays.asList("全部状态", "未启用", "已启用");
private List<String> typeList = Arrays.asList("全部类型", "厂内库", "场外库");
WarehouseFilterClickListener listener;
String[] TABLIST = new String[]{"区分", "全部状态"};
public WarehouseFilterData(DropDownMenu menu, WarehouseFilterClickListener listener) {
this.menu = menu;
this.listener = listener;
initView();
}
private void initView() {
mainView = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_pro, null);
rvData = mainView.findViewById(R.id.rv_data);
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(typeList, 1);
addTabView(statusList, 1);
menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
}
private void addTabView(List<String> dataList, int type) {
View view = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_filter_pro, null);
RecyclerView rvData = view.findViewById(R.id.rv_filter);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
FilterAdapter filterAdapter = new FilterAdapter(R.layout.item_filter, dataList);
filterAdapter.bindToRecyclerView(rvData);
viewList.add(view);
filterAdapter.setOnItemClickListener((adapter, v, position) -> {
filterAdapter.setChoosePos(position);
menu.setTabText(dataList.get(position));
if (listener != null) {
switch (type) {
case 1:
listener.clickType(dataList.get(position));
break;
case 2:
listener.clickStatus(dataList.get(position));
break;
}
}
menu.closeMenu();
filterAdapter.notifyDataSetChanged();
});
}
public SmartRefreshLayout getSrlRefresh() {
return srlRefresh;
}
public void setSrlRefresh(SmartRefreshLayout srlRefresh) {
this.srlRefresh = srlRefresh;
}
public RecyclerView getRvData() {
return rvData;
}
public void setRvData(RecyclerView rvData) {
this.rvData = rvData;
}
}
app/src/main/java/com/wd/workoffice/util/ddmfilter/WarehouseOrderFilterData.java 0 → 100644
浏览文件 @ f1fdc209
package com.wd.workoffice.util.ddmfilter;
import android.view.LayoutInflater;
import android.view.View;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkApp;
import com.wd.workoffice.bean.listener.WarehouseFilterClickListener;
import com.wd.workoffice.bean.listener.WarehouseOrderFilterClickListener;
import com.wd.workoffice.ui.adapter.FilterAdapter;
import com.wd.workoffice.widget.DropDownMenu;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WarehouseOrderFilterData {
DropDownMenu menu;
private List<View> viewList;
private View mainView;
private RecyclerView rvData;
private SmartRefreshLayout srlRefresh;
WarehouseOrderFilterClickListener listener;
String[] TABLIST = new String[]{"全部类型"};
public WarehouseOrderFilterData(DropDownMenu menu, WarehouseOrderFilterClickListener listener) {
this.menu = menu;
this.listener = listener;
initView();
}
private void initView() {
mainView = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_pro, null);
rvData = mainView.findViewById(R.id.rv_data);
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(Config.warehouseStatusList, 1);
menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
}
private void addTabView(List<String> dataList, int type) {
View view = LayoutInflater.from(WorkApp.getApp()).inflate(R.layout.view_filter_pro, null);
RecyclerView rvData = view.findViewById(R.id.rv_filter);
rvData.setLayoutManager(new LinearLayoutManager(WorkApp.getApp(), RecyclerView.VERTICAL, false));
FilterAdapter filterAdapter = new FilterAdapter(R.layout.item_filter, dataList);
filterAdapter.bindToRecyclerView(rvData);
viewList.add(view);
filterAdapter.setOnItemClickListener((adapter, v, position) -> {
filterAdapter.setChoosePos(position);
menu.setTabText(dataList.get(position));
if (listener != null) {
listener.clickType(Config.warehouseCodeList.get(position));
}
menu.closeMenu();
filterAdapter.notifyDataSetChanged();
});
}
public SmartRefreshLayout getSrlRefresh() {
return srlRefresh;
}
public void setSrlRefresh(SmartRefreshLayout srlRefresh) {
this.srlRefresh = srlRefresh;
}
public RecyclerView getRvData() {
return rvData;
}
public void setRvData(RecyclerView rvData) {
this.rvData = rvData;
}
}
app/src/main/res/layout/fg_work_warehouse.xml 0 → 100644
浏览文件 @ f1fdc209
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.wd.workoffice.widget.DropDownMenu
android:id="@+id/ddm_choose"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:dddividerColor="@color/divider"
app:ddmaskColor="#4d000000"
app:ddmenuBackgroundColor="@color/white"
app:ddmenuMenuHeightPercent="0.5"
app:ddmenuSelectedIcon="@mipmap/main_top"
app:ddmenuTextSize="13sp"
app:ddmenuUnselectedIcon="@mipmap/main_down"
app:ddtextSelectedColor="@color/mainTextColor"
app:ddtextUnselectedColor="@color/main_icon_select"
app:ddunderlineColor="@color/white" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_work_warehouse.xml 0 → 100644
浏览文件 @ f1fdc209
<?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_centerHorizontal="true"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="邢台德龙钢铁客户"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_status"
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="14sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:background="#FCFCFD"
android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout
android:id="@+id/rl_dep"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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_code"
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_dep"
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: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_clazz"
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_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: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: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: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:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_work_warehouse_order.xml 0 → 100644
浏览文件 @ f1fdc209
<?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_centerHorizontal="true"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="20mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5mm"
android:text="邢台德龙钢铁客户"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:background="#FCFCFD"
android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout
android:id="@+id/rl_dep"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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_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_dep"
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: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_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_time"
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
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
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>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论