Skip to content

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

1.物流操作 

2.//TODO erp用户激活测试，忘记/重置密码测试，开票收票新增，开票收票操作，产品下单还差附件，bat，mes，消息，刷新token
上级 99ee6ad6
显示空白字符变更
内嵌 并排
正在显示 包含 1347 行增加 和 15 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 8449305d
...@@ -675,7 +675,39 @@ ...@@ -675,7 +675,39 @@
<activity <activity
android:name=".ui.activity.bat.work.WorkLogisticsDetailActivity" android:name=".ui.activity.bat.work.WorkLogisticsDetailActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
android:label="开票申请" android:label="物流详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkFinancialAddActivity"
android:configChanges="keyboardHidden|orientation"
android:label="新增申请"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkFinancialTicketAddActivity"
android:configChanges="keyboardHidden|orientation"
android:label="开票"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkFinancialReceiveTicketAddActivity"
android:configChanges="keyboardHidden|orientation"
android:label="开票"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkChooseDepActivity"
android:configChanges="keyboardHidden|orientation"
android:label="选择部门"
android:launchMode="singleTop" android:launchMode="singleTop"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
......
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 8449305d
...@@ -167,6 +167,19 @@ public interface ApiService { ...@@ -167,6 +167,19 @@ public interface ApiService {
@GET("/transitpart/page/list/current-user/part-type") @GET("/transitpart/page/list/current-user/part-type")
Observable<BaseBean> getClient(@QueryMap Map<String, Object> param); Observable<BaseBean> getClient(@QueryMap Map<String, Object> param);
/**
* 搜索往来单位（回款申请，）
* <p>
* name
* partTypeCode partTypeCode:SUPPLIER-供应商
* * CUSTOMER-客户
* * TRANSPORTERS-运输商
*
* @return
*/
@GET("/transitpart/search-list")
Observable<BaseBean> getClientOut(@QueryMap Map<String, Object> param);
/** /**
* 根据关联往来单位（类别为客户）和生产厂（产品上架部门） --> 获取产品列表 * 根据关联往来单位（类别为客户）和生产厂（产品上架部门） --> 获取产品列表
* <p> * <p>
...@@ -695,5 +708,31 @@ public interface ApiService { ...@@ -695,5 +708,31 @@ public interface ApiService {
Observable<BaseBean> logisticsCheck(@Body RequestBody requestBody); Observable<BaseBean> logisticsCheck(@Body RequestBody requestBody);
/**
* 审批开票申请
*orderType
* applyAmount
* applyDept
* customerId
* process
* applyRemark
* @return
*/
@POST("/moneyBackApply/apply")
Observable<BaseBean> moneyBackApply(@Body RequestBody requestBody);
/**
* 审批开票申请
*orderType
* applyAmount
* applyDept
* customerId
* process
* applyRemark
* @return
*/
@POST("/moneyPayApply/apply")
Observable<BaseBean> moneyPayApply(@Body RequestBody requestBody);
} }
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleClientActivity.java
浏览文件 @ 8449305d
...@@ -12,9 +12,11 @@ import com.wd.workoffice.R; ...@@ -12,9 +12,11 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ClientBean; import com.wd.workoffice.bean.ClientBean;
import com.wd.workoffice.retrofit.ApiService;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.StoreClientAdapter; import com.wd.workoffice.ui.adapter.StoreClientAdapter;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -27,10 +29,11 @@ import butterknife.BindView; ...@@ -27,10 +29,11 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
/** /**
* 商店-销售-选择客户/供应商 * 商店-销售-选择客户/供应商（回款选择客户）
* author : flexible * author : flexible
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
...@@ -69,7 +72,14 @@ public class StoreSaleClientActivity extends WorkToolBarActivity { ...@@ -69,7 +72,14 @@ public class StoreSaleClientActivity extends WorkToolBarActivity {
} }
private void getData() { private void getData() {
RtfUtils.getRtf().getClient(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { Observable<BaseBean> observable;
if (TextUtils.isEmpty(getIntent().getStringExtra("flag"))) {
observable = RtfUtils.getRtf().getClient(param);
} else {
// param.put("depId", UserKeeper.getInstance().getUserDepId());
observable = RtfUtils.getRtf().getClientOut(param);
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
...@@ -87,7 +97,13 @@ public class StoreSaleClientActivity extends WorkToolBarActivity { ...@@ -87,7 +97,13 @@ public class StoreSaleClientActivity extends WorkToolBarActivity {
toast(data.getMessage()); toast(data.getMessage());
return; return;
} }
List<ClientBean.RecordsBean> dataList = JSON.parseObject(data.getData().toString(), ClientBean.class).getRecords(); ClientBean clientBean = JSON.parseObject(data.getData().toString(), ClientBean.class);
List<ClientBean.RecordsBean> dataList;
if (clientBean == null) {
dataList = new ArrayList<>();
} else {
dataList = clientBean.getRecords();
}
if (page == 1) { if (page == 1) {
clientList.clear(); clientList.clear();
clientList.addAll(dataList); clientList.addAll(dataList);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkChooseDepActivity.java 0 → 100644
浏览文件 @ 8449305d
package com.wd.workoffice.ui.activity.bat.work;
import android.content.Intent;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
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.DepBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkChooseDepAdapter;
import com.wd.workoffice.ui.adapter.WorkDepAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkChooseDepActivity extends WorkToolBarActivity {
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.btn_search)
Button btnSearch;
private Map<String, Object> param;
private List<DepBean> dataList;
private WorkChooseDepAdapter dataAdapter;
private int page = 1;
@Override
protected void initView() {
ButterKnife.bind(this);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new WorkChooseDepAdapter(R.layout.item_store_client, dataList);
dataAdapter.bindToRecyclerView(rvData);
param = WorkUtils.pageKey();
param.put("current", page);
getData();
}
private void getData() {
RtfUtils.getRtf().getDep(param).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;
}
List<DepBean> getList = JSON.parseArray(data.getData().toString(), DepBean.class);
if (page == 1) {
srlRefresh.finishRefresh();
dataList.clear();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
dataAdapter.loadMoreComplete();
} else {
dataAdapter.loadMoreComplete();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
dataAdapter.loadMoreEnd();
} else {
page++;
}
}
});
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(new OnRefreshListener() {
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
page = 1;
param.put("current", page);
getData();
}
});
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
Intent intent = new Intent();
intent.putExtra("clientName", dataList.get(position).getName());
intent.putExtra("id", dataList.get(position).getId());
setResult(10003, intent);
finish();
}
});
// dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
// @Override
// public void onLoadMoreRequested() {
// param.put("current", page);
// getData();
// }
// }, rvData);
}
@Override
protected int layoutId() {
return R.layout.activity_work_dep;
}
@OnClick(R.id.btn_search)
public void onViewClicked() {
page = 1;
param.put("name", etKey.getText().toString());
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialAddActivity.java 0 → 100644
浏览文件 @ 8449305d
package com.wd.workoffice.ui.activity.bat.work;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import java.util.Map;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
* 工作台 - 回款添加
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkFinancialAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.rl_client)
RelativeLayout rlClient;
@BindView(R.id.tv_order)
TextView tvOrder;
@BindView(R.id.rl_order)
RelativeLayout rlOrder;
@BindView(R.id.rl_price)
LinearLayout rlPrice;
@BindView(R.id.et_remark)
EditText etRemark;
@BindView(R.id.tv_remark_num)
TextView tvRemarkNum;
@BindView(R.id.btn_ok)
Button btnOk;
@BindView(R.id.et_price)
EditText etPrice;
@BindView(R.id.tv_desc)
TextView tvDesc;
private Map<String, Object> param;
private Integer clientId;
private QMUIDialog.MenuDialogBuilder typeDialog;
String[] typeList = new String[]{"销售订单", "外采购订单", "组装订单"};
String[] supplierTypeList = new String[]{"外采购订单", "供应订单"};
private String chooseType;
@Override
protected void initView() {
ButterKnife.bind(this);
param = WorkUtils.simpleParam();
typeDialog = DialogUtils.listDialog(this);
if (!TextUtils.isEmpty(getIntent().getStringExtra("supplier"))) {
tvDesc.setText("所属供应商");
tvClient.setHint("选择供应商");
typeDialog.addItems(supplierTypeList, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseType = WorkUtils.getOrderCode(supplierTypeList[which]);
tvOrder.setText(supplierTypeList[which]);
dialog.dismiss();
}
});
} else {
typeDialog.addItems(typeList, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseType = WorkUtils.getOrderCode(typeList[which]);
tvOrder.setText(typeList[which]);
dialog.dismiss();
}
});
}
}
@Override
protected void initData() {
}
private void getData() {
Observable<BaseBean> observable;
if (!TextUtils.isEmpty(getIntent().getStringExtra("supplier"))) {
param.put("supplierId", clientId);
observable = RtfUtils.getRtf().moneyPayApply((WorkUtils.convertMapToBody(param)));
} else {
param.put("customerId", clientId);
observable = RtfUtils.getRtf().moneyBackApply((WorkUtils.convertMapToBody(param)));
}
observable.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;
}
}
});
}
@Override
protected void initEvent() {
etRemark.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
tvRemarkNum.setText(s.length() + "/140");
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_financial_money_add;
}
@OnClick({R.id.rl_client, R.id.rl_order, R.id.btn_ok})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_client:
if (!TextUtils.isEmpty(getIntent().getStringExtra("supplier"))) {
startActivityForResult(StoreSaleClientActivity.class, 10001,
"code", "CUSTOMER", "flag", "1");
} else {
startActivityForResult(StoreSaleClientActivity.class, 10001,
"code", "SUPPLIER", "flag", "1");
}
break;
case R.id.rl_order:
typeDialog.show();
break;
case R.id.btn_ok:
if (clientId == null) {
toast("请先选择客户");
return;
}
if (TextUtils.isEmpty(chooseType)) {
toast("请选择订单类别");
return;
}
if (TextUtils.isEmpty(etPrice.getText().toString())) {
toast("请输入金额");
return;
}
// param.put("process", PermissionType.);
param.put("applyRemark", etRemark.getText().toString());
param.put("applyDept", UserKeeper.getInstance().getUserDepId());
param.put("orderType", chooseType);
param.put("applyAmount", etPrice.getText().toString());
getData();
break;
}
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
String clientName = data.getStringExtra("clientName");
clientId = data.getIntExtra("id", 0);
tvClient.setText(clientName);
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialOutActivity.java
浏览文件 @ 8449305d
...@@ -173,7 +173,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity { ...@@ -173,7 +173,7 @@ public class WorkFinancialOutActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.add: case R.id.add:
// startActivity(WorkInStockSearchActivity.class); startActivity(WorkFinancialAddActivity.class);
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialPayActivity.java
浏览文件 @ 8449305d
...@@ -52,7 +52,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity { ...@@ -52,7 +52,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
FinancialPayFilterData filterData = new FinancialPayFilterData(this,ddmChoose, new ThreeMenuClickListener() { FinancialPayFilterData filterData = new FinancialPayFilterData(this, ddmChoose, new ThreeMenuClickListener() {
@Override @Override
public void clickOne(String value) { public void clickOne(String value) {
param.put("orderType", WorkUtils.getOrderCode(value)); param.put("orderType", WorkUtils.getOrderCode(value));
...@@ -153,7 +153,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity { ...@@ -153,7 +153,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkFinancialDetailActivity.class,"detail",JSON.toJSONString(dataList.get(position))); startActivity(WorkFinancialDetailActivity.class, "detail", JSON.toJSONString(dataList.get(position)));
} }
}); });
...@@ -175,7 +175,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity { ...@@ -175,7 +175,7 @@ public class WorkFinancialPayActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.add: case R.id.add:
// startActivity(WorkInStockSearchActivity.class); startActivity(WorkFinancialAddActivity.class, "supplier", "1");
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialReceiveTicketAddActivity.java 0 → 100644
浏览文件 @ 8449305d
package com.wd.workoffice.ui.activity.bat.work;
import android.content.DialogInterface;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils;
import java.util.Map;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 工作台 - 财务开票
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkFinancialReceiveTicketAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_next)
TextView tvNext;
@BindView(R.id.tv_order)
TextView tvOrder;
@BindView(R.id.rl_order)
RelativeLayout rlOrder;
@BindView(R.id.tv_dep)
TextView tvDep;
@BindView(R.id.rl_dep)
RelativeLayout rlDep;
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.rl_client)
RelativeLayout rlClient;
private Map<String, Object> param;
private Integer clientId;
private QMUIDialog.MenuDialogBuilder typeDialog;
String[] typeList = new String[]{"外采购订单", "供应"};
private String chooseType;
private Integer depId;
@Override
protected void initView() {
ButterKnife.bind(this);
param = WorkUtils.simpleParam();
typeDialog = DialogUtils.listDialog(this);
typeDialog.addItems(typeList, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseType = WorkUtils.getOrderCode(typeList[which]);
tvOrder.setText(typeList[which]);
dialog.dismiss();
}
});
}
@Override
protected void initData() {
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_open_ticke_addt;
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
String clientName = data.getStringExtra("clientName");
clientId = data.getIntExtra("id", 0);
tvClient.setText(clientName);
} else if (requestCode == 10003 && resultCode == 10003) {
String depName = data.getStringExtra("clientName");
depId = data.getIntExtra("id", 0);
tvDep.setText(depName);
}
}
@OnClick({R.id.tv_next, R.id.rl_order, R.id.rl_dep, R.id.rl_client})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_next:
if (TextUtils.isEmpty(chooseType)) {
toast("请选择订单类别");
return;
}
if (depId == null) {
toast("请先选择部门");
return;
}
if (clientId == null) {
toast("请先选择客户");
return;
}
// param.put("process", PermissionType.);
// param.put("applyRemark", etRemark.getText().toString());
// param.put("applyDept", UserKeeper.getInstance().getUserDepId());
// param.put("orderType", chooseType);
// param.put("applyAmount", etPrice.getText().toString());
startActivity(StoreSaleClientActivity.class);
break;
case R.id.rl_order:
typeDialog.show();
break;
case R.id.rl_dep:
startActivityForResult(WorkChooseDepActivity.class, 10003);
break;
case R.id.rl_client:
startActivityForResult(StoreSaleClientActivity.class, 10001,
"code", "SUPPLIER");
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialTicketActivity.java
浏览文件 @ 8449305d
...@@ -11,19 +11,13 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout; ...@@ -11,19 +11,13 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.MoneyOutBean;
import com.wd.workoffice.bean.TicketBean; import com.wd.workoffice.bean.TicketBean;
import com.wd.workoffice.bean.event.CheckLogisticEvent;
import com.wd.workoffice.bean.event.CheckTicketEvent; import com.wd.workoffice.bean.event.CheckTicketEvent;
import com.wd.workoffice.bean.listener.ThreeMenuClickListener; import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkFinancialOutAdapter;
import com.wd.workoffice.ui.adapter.WorkFinancialTicketAdapter; import com.wd.workoffice.ui.adapter.WorkFinancialTicketAdapter;
import com.wd.workoffice.ui.adapter.WorkTicketAdapter;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import com.wd.workoffice.util.ddmfilter.FinancialOutFilterData;
import com.wd.workoffice.util.ddmfilter.FinancialTicketFilterData; import com.wd.workoffice.util.ddmfilter.FinancialTicketFilterData;
import com.wd.workoffice.widget.DropDownMenu; import com.wd.workoffice.widget.DropDownMenu;
...@@ -194,7 +188,7 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity { ...@@ -194,7 +188,7 @@ public class WorkFinancialTicketActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.add: case R.id.add:
// startActivity(WorkInStockSearchActivity.class); startActivity(WorkFinancialTicketAddActivity.class);
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialTicketAddActivity.java 0 → 100644
浏览文件 @ 8449305d
package com.wd.workoffice.ui.activity.bat.work;
import android.content.DialogInterface;
import android.content.Intent;
import android.text.TextUtils;
import android.view.View;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils;
import java.util.Map;
import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 工作台 - 财务开票
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkFinancialTicketAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_next)
TextView tvNext;
@BindView(R.id.tv_order)
TextView tvOrder;
@BindView(R.id.rl_order)
RelativeLayout rlOrder;
@BindView(R.id.tv_dep)
TextView tvDep;
@BindView(R.id.rl_dep)
RelativeLayout rlDep;
@BindView(R.id.tv_client)
TextView tvClient;
@BindView(R.id.rl_client)
RelativeLayout rlClient;
private Map<String, Object> param;
private Integer clientId;
private QMUIDialog.MenuDialogBuilder typeDialog;
String[] typeList = new String[]{"销售订单", "组装订单", "外采购订单", "坩埚订单"};
private String chooseType;
private Integer depId;
@Override
protected void initView() {
ButterKnife.bind(this);
param = WorkUtils.simpleParam();
typeDialog = DialogUtils.listDialog(this);
typeDialog.addItems(typeList, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
chooseType = WorkUtils.getOrderCode(typeList[which]);
tvOrder.setText(typeList[which]);
dialog.dismiss();
}
});
}
@Override
protected void initData() {
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_open_ticke_addt;
}
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
String clientName = data.getStringExtra("clientName");
clientId = data.getIntExtra("id", 0);
tvClient.setText(clientName);
} else if (requestCode == 10003 && resultCode == 10003) {
String depName = data.getStringExtra("clientName");
depId = data.getIntExtra("id", 0);
tvDep.setText(depName);
}
}
@OnClick({R.id.tv_next, R.id.rl_order, R.id.rl_dep, R.id.rl_client})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_next:
if (TextUtils.isEmpty(chooseType)) {
toast("请选择订单类别");
return;
}
if (depId == null) {
toast("请先选择部门");
return;
}
if (clientId == null) {
toast("请先选择客户");
return;
}
// param.put("process", PermissionType.);
// param.put("applyRemark", etRemark.getText().toString());
// param.put("applyDept", UserKeeper.getInstance().getUserDepId());
// param.put("orderType", chooseType);
// param.put("applyAmount", etPrice.getText().toString());
startActivity(StoreSaleClientActivity.class);
break;
case R.id.rl_order:
typeDialog.show();
break;
case R.id.rl_dep:
startActivityForResult(WorkChooseDepActivity.class, 10003);
break;
case R.id.rl_client:
startActivityForResult(StoreSaleClientActivity.class, 10001,
"code", "CUSTOMER");
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/WorkChooseDepAdapter.java 0 → 100644
浏览文件 @ 8449305d
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.DepBean;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class WorkChooseDepAdapter extends BaseQuickAdapter<DepBean, BaseViewHolder> {
public WorkChooseDepAdapter(int layoutResId, List data) {
super(layoutResId, data);
}
@Override
protected void convert(BaseViewHolder helper, DepBean item) {
helper.setText(R.id.tv_name, item.getName());
}
}
app/src/main/res/layout/activity_financial_money_add.xml 0 → 100644
浏览文件 @ 8449305d
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_client"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<TextView
android:id="@+id/tv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="所属客户"
android:textSize="16sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_client"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择客户"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_order"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="订单类别"
android:textSize="16sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="选择类别"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/rl_price"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="申请金额"
android:textSize="16sp" />
<EditText
android:id="@+id/et_price"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_marginRight="10mm"
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:hint="输入金额"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm"
android:text="备注"
android:textSize="16sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_confirm_order"
android:orientation="vertical">
<EditText
android:id="@+id/et_remark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@null"
android:gravity="top"
android:hint="请输入"
android:minLines="4"
android:padding="5mm"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_remark_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_margin="4mm"
android:text="0/140"
android:textColor="@color/flexible_text_gray" />
</LinearLayout>
</LinearLayout>
<Button
android:id="@+id/btn_ok"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="50mm"
android:layout_marginTop="10mm"
android:background="@mipmap/account_bg"
android:text="保存"
android:textColor="@color/white" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_open_ticke_addt.xml 0 → 100644
浏览文件 @ 8449305d
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/tv_next"
android:layout_width="match_parent"
android:layout_height="48mm"
android:layout_alignParentBottom="true"
android:gravity="center"
android:textColor="@color/white"
android:text="下一步，选择产品来源"
android:background="#5C768A"/>
<LinearLayout
android:layout_above="@id/tv_next"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_order"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#ff3f617f" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择订单类别"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择订单类别"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_dep"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#C45D5D" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择所属部门"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择所属部门"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_client"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:layout_centerVertical="true"
android:background="#E3AD6E" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择客户"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_client"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="选择客户"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_receive_ticket_add.xml 0 → 100644
浏览文件 @ 8449305d
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/tv_next"
android:layout_width="match_parent"
android:layout_height="48mm"
android:layout_alignParentBottom="true"
android:gravity="center"
android:textColor="@color/white"
android:text="下一步，选择产品来源"
android:background="#5C768A"/>
<LinearLayout
android:layout_above="@id/tv_next"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_order"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#ff3f617f" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择订单类别"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_order"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择订单类别"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_dep"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:background="#C45D5D" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择所属部门"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="请选择所属部门"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_client"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="22mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:gravity="center_vertical">
<View
android:layout_width="12mm"
android:layout_height="12mm"
android:layout_centerVertical="true"
android:background="#E3AD6E" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择供应商"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_client"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:text="选择供应商"
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
android:layout_width="6mm"
android:layout_height="10mm"
android:background="@mipmap/arrow_right_blue" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论