Skip to content

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

1.结束bug，详情页产看更多 

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 cc08d32d
隐藏空白字符变更
内嵌 并排
正在显示 包含 343 行增加 和 100 行删除
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 6c8bcc62
......@@ -1297,6 +1297,13 @@ public interface ApiService {
*/
@POST("/procedureStart/so/applyAdvanceFinish/{orderId}")
Observable<BaseBean> endApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
* _step5_1-发起提前结束申请
*
* @return
*/
@POST("/procedureStart/po/applyAdvanceFinish/{orderId}")
Observable<BaseBean> endPoApply(@Path("orderId") String orderId, @Body RequestBody requestBody);
/**
* step5_3-一个订单的提前结束历史记录
......@@ -1945,7 +1952,20 @@ public interface ApiService {
*/
@PUT("/sys/dept/ruler")
Observable<BaseBean> addDeptRuler(@Query("userId")String userId,@Body RequestBody requestBody);
/**
* step5_1-发起提前结束申请
*
* @return
*/
@PUT("/advance-finish-apply/so/audit/{applyId}")
Observable<BaseBean> endSoCheck(@Path("applyId") String applyId,@Body RequestBody requestBody);
/**
* step5_1-发起提前结束申请
*
* @return
*/
@PUT("/returnApply/po/audit/group/{applyId}")
Observable<BaseBean> endPoCheck(@Path("applyId") String applyId,@Body RequestBody requestBody);
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ 6c8bcc62
package com.wd.workoffice.ui.activity.bat.order;
import android.text.Editable;
import android.os.Bundle;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
......@@ -12,7 +11,7 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
......@@ -108,6 +107,8 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
TextView tvClaim5;
@BindView(R.id.tv_claim6)
TextView tvClaim6;
@BindView(R.id.ll_see_more)
LinearLayout llSeeMore;
private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter;
......@@ -116,6 +117,10 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
private Integer status;
private String identity;
private String type;
private QMUIBottomSheet flowSheet;
private RecyclerView rvFlowSheet;
private List<OrderDetail.OrderFlowsBean> flowSheetList;
private OrderProcessAdapter flowSheetAdapter;
@Override
protected void initView() {
......@@ -131,6 +136,15 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
} else {
}
View viewData = LayoutInflater.from(this).inflate(R.layout.view_rv, null);
rvFlowSheet = viewData.findViewById(R.id.rv_data);
rvFlowSheet.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
flowSheet = new QMUIBottomSheet(this);
flowSheet.addContentView(viewData);
flowSheetList = new ArrayList<>();
flowSheetAdapter = new OrderProcessAdapter(R.layout.item_order_process, flowSheetList);
flowSheetAdapter.bindToRecyclerView(rvFlowSheet);
flowSheetAdapter.setEmptyView(R.layout.view_empty_order, rvFlowSheet);
}
private void changeView() {
......@@ -138,13 +152,13 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
// {"待审核", "待接单", "待生产", "已入库","已交付"};
// { "100", "200", "710", "500","600"};
case 100:
if (WorkUtils.orderCheckPermission(6,dataBean.getLaunchDeptId())){
if (WorkUtils.orderCheckPermission(6, dataBean.getLaunchDeptId())) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
}
break;
case 200:
if (WorkUtils.orderReceivePermission(6,dataBean.getReceiveDeptId())){
if (WorkUtils.orderReceivePermission(6, dataBean.getReceiveDeptId())) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
tvAgree.setText("接单");
......@@ -223,9 +237,16 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
return;
}
dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
status =dataBean.getStatus();
status = dataBean.getStatus();
changeView();
flowList.addAll(dataBean.getOrderFlows());
flowSheetList.addAll(dataBean.getOrderFlows());
flowSheetAdapter.notifyDataSetChanged();
if (dataBean.getOrderFlows().size() <= 3) {
llSeeMore.setVisibility(View.GONE);
flowList.addAll(dataBean.getOrderFlows());
} else {
flowList.addAll(dataBean.getOrderFlows().subList(0, 3));
}
flowAdapter.notifyDataSetChanged();
proList.addAll(dataBean.getOrderItems());
proAdapter.notifyDataSetChanged();
......@@ -241,7 +262,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
tvSendTime.setText(dataBean.getRequireTime());
tvDesc.setText(dataBean.getAttrName());
tvOrderDesc.setText(dataBean.getAttrName());
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3));
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(), 3));
OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
tvClaim1.setText(expandInfo.getDemond4());
......@@ -290,10 +311,10 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
startActivity(ReturnApplyActivity.class,
"identity", identity,
"status", dataBean.getStatus() + "",
"enterStockType",dataBean.getEnterStockType(),
"deptId",dataBean.getLaunchDeptId()+"",
"returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
"enterStockType", dataBean.getEnterStockType(),
"deptId", dataBean.getLaunchDeptId() + "",
"returnNum", TextUtils.equals(dataBean.getEnterStockType(), "1") ?
proList.get(position).getCanOutReturnSum() : proList.get(position).getCanUsedReturnSum(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
......@@ -336,20 +357,23 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
@OnClick({R.id.ll_see_more, R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.ll_see_more:
flowSheet.show();
break;
case R.id.tv_refuse:
if (status==200){
checkReceiveDialog(2,dataBean.getId());
}else {
if (status == 200) {
checkReceiveDialog(2, dataBean.getId());
} else {
checkDialog(2);
}
break;
case R.id.tv_agree:
if (status==200){
checkReceiveDialog(1,dataBean.getId());
}else {
if (status == 200) {
checkReceiveDialog(1, dataBean.getId());
} else {
checkDialog(1);
}
break;
......@@ -360,7 +384,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
}
startActivity(AddCrucibleActivity.class,
"status", dataBean.getStatus() + "",
"pro",JSON.toJSONString(dataBean.getOrderItems()),
"pro", JSON.toJSONString(dataBean.getOrderItems()),
"orderId", getIntent().getStringExtra("id"));
break;
case R.id.tv_send_apply:
......@@ -381,11 +405,11 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
View view = LayoutInflater.from(this).inflate(R.layout.view_check_order, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvPrice = view.findViewById(R.id.tv_price);
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3));
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(), 3));
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -447,7 +471,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -501,4 +525,11 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
}
});
}
@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/order/EndApplyActivity.java
浏览文件 @ 6c8bcc62
......@@ -37,6 +37,7 @@ import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
......@@ -124,7 +125,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(EndApplyDetailActivity.class,
"orderType", getIntent().getStringExtra("orderType"),
"orderType", getIntent().getStringExtra("orderType"),
"info", JSON.toJSONString(dataList.get(position)));
}
});
......@@ -140,11 +141,11 @@ public class EndApplyActivity extends WorkToolBarActivity {
if (TextUtils.equals("300", getIntent().getStringExtra("status"))) {
String orderType = getIntent().getStringExtra("orderType");
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.SO_ADVANCE_SAVE.getPermission())){
if (WorkUtils.hasPermission(PagePermissionType.SO_ADVANCE_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.PO_ADVANCE_SAVE.getPermission())){
if (WorkUtils.hasPermission(PagePermissionType.PO_ADVANCE_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
}
......@@ -172,7 +173,7 @@ public class EndApplyActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -201,7 +202,17 @@ public class EndApplyActivity extends WorkToolBarActivity {
param.put("orderType", getIntent().getStringExtra("orderType"));
param.put("applyRemark", remark);
param.put("orderId", getIntent().getStringExtra("orderId"));
RtfUtils.getRtf().endApply(getIntent().getStringExtra("orderId"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
String orderType = getIntent().getStringExtra("orderType");
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().endApply(getIntent().getStringExtra("orderId"), WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().endPoApply(getIntent().getStringExtra("orderId"), WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().endApply(getIntent().getStringExtra("orderId"), WorkUtils.convertMapToBody(param));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/EndApplyDetailActivity.java
浏览文件 @ 6c8bcc62
package com.wd.workoffice.ui.activity.bat.order;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
......@@ -31,10 +29,11 @@ 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
......@@ -71,7 +70,6 @@ public class EndApplyDetailActivity extends WorkToolBarActivity {
} else {
llBottom.setVisibility(View.GONE);
}
llBottom.setVisibility(View.GONE);
param = new HashMap<>();
param.put("id", info.getId());
changePermission();
......@@ -150,7 +148,16 @@ public class EndApplyDetailActivity extends WorkToolBarActivity {
param.put("status", status);
param.put("auditRemark", remark);
param.put("id", info.getId());
RtfUtils.getRtf().sendApplyCheck(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
String orderType =getIntent().getStringExtra("orderType");
Observable<BaseBean> observable ;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().endSoCheck(info.getId()+"",WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().endPoCheck(info.getId()+"",WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().endSoCheck(info.getId()+"",WorkUtils.convertMapToBody(param));
}
observable .compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ 6c8bcc62
package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
......@@ -13,6 +11,7 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
......@@ -99,6 +98,8 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
TextView tvClaim5;
@BindView(R.id.tv_claim6)
TextView tvClaim6;
@BindView(R.id.ll_see_more)
LinearLayout llSeeMore;
private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter;
......@@ -106,8 +107,10 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
private List<OrderDetail.OrderItemsBean> proList;
private Integer status;
private String identity;
private QMUIDialog.MenuDialogBuilder settingDialog;
private QMUIBottomSheet flowSheet;
private RecyclerView rvFlowSheet;
private List<OrderDetail.OrderFlowsBean> flowSheetList;
private OrderProcessAdapter flowSheetAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
......@@ -115,6 +118,15 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
status = Integer.valueOf(getIntent().getStringExtra("status"));
identity = getIntent().getStringExtra("identity");
View viewData = LayoutInflater.from(this).inflate(R.layout.view_rv, null);
rvFlowSheet = viewData.findViewById(R.id.rv_data);
rvFlowSheet.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
flowSheet = new QMUIBottomSheet(this);
flowSheet.addContentView(viewData);
flowSheetList = new ArrayList<>();
flowSheetAdapter = new OrderProcessAdapter(R.layout.item_order_process, flowSheetList);
flowSheetAdapter.bindToRecyclerView(rvFlowSheet);
flowSheetAdapter.setEmptyView(R.layout.view_empty_order, rvFlowSheet);
}
private void changeView() {
......@@ -122,13 +134,13 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
// {"待审核", "待接单", "待生产", "已入库","已交付"};
// { "100", "200", "710", "500","600"};
case 100:
if (WorkUtils.orderCheckPermission(4,dataBean.getLaunchDeptId())){
if (WorkUtils.orderCheckPermission(4, dataBean.getLaunchDeptId())) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
}
break;
case 200:
if (WorkUtils.orderReceivePermission(4,dataBean.getReceiveDeptId())){
if (WorkUtils.orderReceivePermission(4, dataBean.getReceiveDeptId())) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
tvAgree.setText("接单");
......@@ -183,9 +195,16 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
return;
}
dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
status =dataBean.getStatus();
status = dataBean.getStatus();
changeView();
flowList.addAll(dataBean.getOrderFlows());
flowSheetList.addAll(dataBean.getOrderFlows());
flowSheetAdapter.notifyDataSetChanged();
if (dataBean.getOrderFlows().size()<=3){
llSeeMore.setVisibility(View.GONE);
flowList.addAll(dataBean.getOrderFlows());
}else {
flowList.addAll(dataBean.getOrderFlows().subList(0, 3));
}
flowAdapter.notifyDataSetChanged();
proList.addAll(dataBean.getOrderItems());
proAdapter.notifyDataSetChanged();
......@@ -249,10 +268,10 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
startActivity(ReturnApplyActivity.class,
"identity", identity,
"status", dataBean.getStatus() + "",
"enterStockType",dataBean.getEnterStockType(),
"deptId",dataBean.getLaunchDeptId()+"",
"returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
"enterStockType", dataBean.getEnterStockType(),
"deptId", dataBean.getLaunchDeptId() + "",
"returnNum", TextUtils.equals(dataBean.getEnterStockType(), "1") ?
proList.get(position).getCanOutReturnSum() : proList.get(position).getCanUsedReturnSum(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
......@@ -295,20 +314,23 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
@OnClick({R.id.ll_see_more,R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.ll_see_more:
flowSheet.show();
break;
case R.id.tv_refuse:
if (status==200){
checkReceiveDialog(2,dataBean.getId());
}else {
if (status == 200) {
checkReceiveDialog(2, dataBean.getId());
} else {
checkDialog(2);
}
break;
case R.id.tv_agree:
if (status==200){
checkReceiveDialog(1,dataBean.getId());
}else {
if (status == 200) {
checkReceiveDialog(1, dataBean.getId());
} else {
checkDialog(1);
}
break;
......@@ -345,7 +367,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -406,7 +428,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -460,4 +482,5 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ 6c8bcc62
......@@ -12,6 +12,7 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
......@@ -126,6 +127,10 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
private String identity;
private QMUIDialog.MenuDialogBuilder settingDialog;
String[] settingList = new String[]{"中转入库", "直接入库"};
private QMUIBottomSheet flowSheet;
private RecyclerView rvFlowSheet;
private List<OrderDetail.OrderFlowsBean> flowSheetList;
private OrderProcessAdapter flowSheetAdapter;
@Override
protected void initView() {
......@@ -145,6 +150,15 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
setting(++which);
dialog.dismiss();
});
View viewData = LayoutInflater.from(this).inflate(R.layout.view_rv, null);
rvFlowSheet = viewData.findViewById(R.id.rv_data);
rvFlowSheet.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
flowSheet = new QMUIBottomSheet(this);
flowSheet.addContentView(viewData);
flowSheetList = new ArrayList<>();
flowSheetAdapter = new OrderProcessAdapter(R.layout.item_order_process, flowSheetList);
flowSheetAdapter.bindToRecyclerView(rvFlowSheet);
flowSheetAdapter.setEmptyView(R.layout.view_empty_order, rvFlowSheet);
}
......@@ -185,7 +199,15 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
status = dataBean.getStatus();
changeView();
flowList.addAll(dataBean.getOrderFlows());
flowSheetList.addAll(dataBean.getOrderFlows());
flowSheetAdapter.notifyDataSetChanged();
if (dataBean.getOrderFlows().size()<=3){
llSeeMore.setVisibility(View.GONE);
flowList.addAll(dataBean.getOrderFlows());
}else {
flowList.addAll(dataBean.getOrderFlows().subList(0, 3));
}
flowAdapter.notifyDataSetChanged();
proList.addAll(dataBean.getOrderItems());
proAdapter.notifyDataSetChanged();
......@@ -332,9 +354,12 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.rl_set, R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
@OnClick({R.id.ll_see_more, R.id.rl_set, R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.ll_see_more:
flowSheet.show();
break;
case R.id.rl_set:
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_ENTER_STOCK.getPermission())) {
toast(R.string.permission);
......@@ -543,10 +568,4 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
});
}
@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/order/SaleOrderDetailActivity.java
浏览文件 @ 6c8bcc62
package com.wd.workoffice.ui.activity.bat.order;
import android.text.Editable;
import android.os.Bundle;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
......@@ -12,20 +11,14 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.order.AddStockApplyActivity;
import com.wd.workoffice.ui.activity.bat.order.EndApplyActivity;
import com.wd.workoffice.ui.activity.bat.order.ProFlowActivity;
import com.wd.workoffice.ui.activity.bat.order.ReturnApplyActivity;
import com.wd.workoffice.ui.activity.bat.order.SendApplyActivity;
import com.wd.workoffice.ui.activity.bat.order.UseApplyActivity;
import com.wd.workoffice.ui.adapter.OrderDetailProductAdapter;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.util.MathUtils;
......@@ -109,6 +102,8 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
LinearLayout llApply;
@BindView(R.id.rl_dep)
RelativeLayout rlDep;
@BindView(R.id.ll_see_more)
LinearLayout llSeeMore;
private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter;
......@@ -116,7 +111,10 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
private List<OrderDetail.OrderItemsBean> proList;
private Integer status;
private String identity;
private QMUIBottomSheet flowSheet;
private RecyclerView rvFlowSheet;
private List<OrderDetail.OrderFlowsBean> flowSheetList;
private OrderProcessAdapter flowSheetAdapter;
@Override
protected void initView() {
ButterKnife.bind(this);
......@@ -132,6 +130,15 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
status = Integer.valueOf(getIntent().getStringExtra("status"));
// changView(status);
}
View viewData = LayoutInflater.from(this).inflate(R.layout.view_rv, null);
rvFlowSheet = viewData.findViewById(R.id.rv_data);
rvFlowSheet.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
flowSheet = new QMUIBottomSheet(this);
flowSheet.addContentView(viewData);
flowSheetList = new ArrayList<>();
flowSheetAdapter = new OrderProcessAdapter(R.layout.item_order_process, flowSheetList);
flowSheetAdapter.bindToRecyclerView(rvFlowSheet);
flowSheetAdapter.setEmptyView(R.layout.view_empty_order, rvFlowSheet);
}
private void changView(Integer status) {
......@@ -213,7 +220,14 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
return;
}
dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
flowList.addAll(dataBean.getOrderFlows());
flowSheetList.addAll(dataBean.getOrderFlows());
flowSheetAdapter.notifyDataSetChanged();
if (dataBean.getOrderFlows().size()<=3){
llSeeMore.setVisibility(View.GONE);
flowList.addAll(dataBean.getOrderFlows());
}else {
flowList.addAll(dataBean.getOrderFlows().subList(0, 3));
}
flowAdapter.notifyDataSetChanged();
proList.addAll(dataBean.getOrderItems());
proAdapter.setStatus(dataBean.getStatus());
......@@ -227,7 +241,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
tvTime.setText(dataBean.getCreatedTime());
tvSendTime.setText(dataBean.getRequireTime());
tvDesc.setText(dataBean.getAttrName());
tvOrderPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3));
tvOrderPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(), 3));
OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
tvClaim1.setText(expandInfo.getDemond4());
......@@ -279,7 +293,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
"status", dataBean.getStatus() + "",
"num", proList.get(position).getCanUseProductSum() + "",
"enterStockType", dataBean.getEnterStockType(),
"deptId",dataBean.getLaunchDeptId()+"",
"deptId", dataBean.getLaunchDeptId() + "",
"returnNum", proList.get(position).getCanUseProductSum() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"product", proList.get(position).getProductName(),
......@@ -310,9 +324,12 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
@OnClick({R.id.ll_see_more,R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.ll_see_more:
flowSheet.show();
break;
case R.id.tv_refuse:
if (status == 200) {
checkReceiveDialog(2, dataBean.getId());
......@@ -355,7 +372,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
View view = LayoutInflater.from(this).inflate(R.layout.view_check_order, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvPrice = view.findViewById(R.id.tv_price);
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3));
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(), 3));
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
......@@ -365,7 +382,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (status!=1 &&TextUtils.isEmpty(etRemark.getText().toString())) {
if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString())) {
toast("请填写备注");
return;
}
......@@ -475,4 +492,10 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
});
}
@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/order/SupplierOrderDetailActivity.java
浏览文件 @ 6c8bcc62
package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
......@@ -24,7 +22,6 @@ import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.ui.adapter.SupplierOrderDetailProductAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
......@@ -108,6 +105,8 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
TextView tvClaim5;
@BindView(R.id.tv_claim6)
TextView tvClaim6;
@BindView(R.id.ll_see_more)
LinearLayout llSeeMore;
private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter;
......@@ -116,6 +115,10 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
private Integer status;
private String identity;
private QMUIDialog.MenuDialogBuilder settingDialog;
private QMUIBottomSheet flowSheet;
private RecyclerView rvFlowSheet;
private List<OrderDetail.OrderFlowsBean> flowSheetList;
private OrderProcessAdapter flowSheetAdapter;
@Override
protected void initView() {
......@@ -129,6 +132,15 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
} else {
rlDep.setVisibility(View.GONE);
}
View viewData = LayoutInflater.from(this).inflate(R.layout.view_rv, null);
rvFlowSheet = viewData.findViewById(R.id.rv_data);
rvFlowSheet.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
flowSheet = new QMUIBottomSheet(this);
flowSheet.addContentView(viewData);
flowSheetList = new ArrayList<>();
flowSheetAdapter = new OrderProcessAdapter(R.layout.item_order_process, flowSheetList);
flowSheetAdapter.bindToRecyclerView(rvFlowSheet);
flowSheetAdapter.setEmptyView(R.layout.view_empty_order, rvFlowSheet);
}
private void changeView() {
......@@ -136,7 +148,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
// {"待审核", "待接单", "待生产", "已入库","已交付"};
// { "100", "200", "710", "500","600"};
case 100:
if (WorkUtils.orderCheckPermission(3,dataBean.getLaunchDeptId())){
if (WorkUtils.orderCheckPermission(3, dataBean.getLaunchDeptId())) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
}
......@@ -202,7 +214,14 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
status = dataBean.getStatus();
changeView();
flowList.addAll(dataBean.getOrderFlows());
flowSheetList.addAll(dataBean.getOrderFlows());
flowSheetAdapter.notifyDataSetChanged();
if (dataBean.getOrderFlows().size() <= 3) {
llSeeMore.setVisibility(View.GONE);
flowList.addAll(dataBean.getOrderFlows());
} else {
flowList.addAll(dataBean.getOrderFlows().subList(0, 3));
}
flowAdapter.notifyDataSetChanged();
proList.addAll(dataBean.getOrderItems());
proAdapter.notifyDataSetChanged();
......@@ -217,7 +236,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
tvTime.setText(dataBean.getCreatedTime());
tvSendTime.setText(dataBean.getRequireTime());
tvOrderDesc.setText(dataBean.getAttrName());
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3));
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(), 3));
OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
tvClaim1.setText(expandInfo.getDemond4());
......@@ -266,10 +285,10 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
startActivity(ReturnApplyActivity.class,
"identity", identity,
"status", dataBean.getStatus() + "",
"enterStockType",dataBean.getEnterStockType(),
"deptId",dataBean.getLaunchDeptId()+"",
"returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
"enterStockType", dataBean.getEnterStockType(),
"deptId", dataBean.getLaunchDeptId() + "",
"returnNum", TextUtils.equals(dataBean.getEnterStockType(), "1") ?
proList.get(position).getCanOutReturnSum() : proList.get(position).getCanUsedReturnSum(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
......@@ -312,20 +331,23 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
@OnClick({R.id.ll_see_more,R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.ll_see_more:
flowSheet.show();
break;
case R.id.tv_refuse:
if (status==200){
checkReceiveDialog(2,dataBean.getId());
}else {
if (status == 200) {
checkReceiveDialog(2, dataBean.getId());
} else {
checkDialog(2);
}
break;
case R.id.tv_agree:
if (status==200){
checkReceiveDialog(1,dataBean.getId());
}else {
if (status == 200) {
checkReceiveDialog(1, dataBean.getId());
} else {
checkDialog(1);
}
break;
......@@ -357,11 +379,11 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
View view = LayoutInflater.from(this).inflate(R.layout.view_check_order, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvPrice = view.findViewById(R.id.tv_price);
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(),3));
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(), 3));
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -413,6 +435,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
}
});
}
private void checkReceiveDialog(int status, String id) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
......@@ -422,7 +445,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
......@@ -475,4 +498,11 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
}
});
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/res/layout/activity_crucible_order.xml
浏览文件 @ 6c8bcc62
......@@ -144,7 +144,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="10mm" />
<LinearLayout
android:id="@+id/ll_see_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingVertical="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="查看更多" />
<ImageView
android:layout_width="15mm"
android:layout_height="15mm"
android:src="@mipmap/arrow_down" />
</LinearLayout>
<View style="@style/ViewX" />
<LinearLayout
......
app/src/main/res/layout/activity_inside_order.xml
浏览文件 @ 6c8bcc62
......@@ -143,7 +143,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="10mm" />
<LinearLayout
android:id="@+id/ll_see_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingVertical="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="查看更多" />
<ImageView
android:layout_width="15mm"
android:layout_height="15mm"
android:src="@mipmap/arrow_down" />
</LinearLayout>
<View style="@style/ViewX" />
<LinearLayout
......
app/src/main/res/layout/activity_sale_order.xml
浏览文件 @ 6c8bcc62
......@@ -145,7 +145,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="10mm" />
<LinearLayout
android:id="@+id/ll_see_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingVertical="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="查看更多" />
<ImageView
android:layout_width="15mm"
android:layout_height="15mm"
android:src="@mipmap/arrow_down" />
</LinearLayout>
<View style="@style/ViewX" />
<LinearLayout
......
app/src/main/res/layout/activity_supplier_order.xml
浏览文件 @ 6c8bcc62
......@@ -143,7 +143,23 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="10mm" />
<LinearLayout
android:id="@+id/ll_see_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingVertical="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="查看更多" />
<ImageView
android:layout_width="15mm"
android:layout_height="15mm"
android:src="@mipmap/arrow_down" />
</LinearLayout>
<View style="@style/ViewX" />
<LinearLayout
......
app/src/main/res/layout/view_rv.xml 0 → 100644
浏览文件 @ 6c8bcc62
<?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="match_parent"
android:background="@color/white"
android:paddingVertical="20mm"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white" />
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论