Skip to content

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

1.坩埚订单订单详情 

2.//TODO erp用户激活测试，忘记/重置密码测试，质检接口数据问题,内部订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单页面，组装下单，产品下单还差附件测试，mes，刷新token
上级 372c3617
隐藏空白字符变更
内嵌 并排
正在显示 包含 130 行增加 和 29 行删除
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 928f240a
......@@ -1148,6 +1148,12 @@ public interface ApiService {
*/
@GET("/crucibleOrder/oneInfo/{orderId}")
Observable<BaseBean> crucibleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
*
* @return
*/
@GET("/crucibleSaleOrder/oneInfo/{orderId}")
Observable<BaseBean> crucibleSaleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
*
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ 928f240a
......@@ -21,6 +21,7 @@ import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.CruibleOrderDetailProductAdapter;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.ui.adapter.SupplierOrderDetailProductAdapter;
import com.wd.workoffice.util.WorkUtils;
......@@ -38,6 +39,7 @@ 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;
/**
......@@ -110,11 +112,12 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter;
private SupplierOrderDetailProductAdapter proAdapter;
private CruibleOrderDetailProductAdapter proAdapter;
private List<OrderDetail.OrderItemsBean> proList;
private Integer status;
private String identity;
private QMUIDialog.MenuDialogBuilder settingDialog;
private String type;
@Override
protected void initView() {
......@@ -123,12 +126,12 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
status = Integer.valueOf(getIntent().getStringExtra("status"));
identity = getIntent().getStringExtra("identity");
String type = getIntent().getStringExtra("type");
if (TextUtils.equals(type, "1")) {//1坩埚销售 2 坩埚生产
} else {
type = getIntent().getStringExtra("type");
if (TextUtils.equals(type, "1")) {//1 坩埚生产 2 坩埚销售
rlDep.setVisibility(View.GONE);
rlStock.setVisibility(View.GONE);
} else {
}
// if (TextUtils.equals(identity, "1")) {//1销售 2生产
//
......@@ -139,8 +142,6 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
// {"待审核", "待接单", "待生产", "已入库","已交付"};
// { "100", "200", "710", "500","600"};
case 100:
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
break;
case 200:
break;
......@@ -152,14 +153,20 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
case 410:
llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE);
break;
case 500:
llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE);
if (TextUtils.equals(type, "1")) {//1坩埚生产 2 坩埚销售
llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE);
} else {
llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE);
tvFinishApply.setVisibility(View.GONE);
}
break;
case 600:
llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE);
break;
default:
llBottom.setVisibility(View.VISIBLE);
......@@ -178,13 +185,19 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
flowAdapter.bindToRecyclerView(rvProcess);
flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
proList = new ArrayList<>();
proAdapter = new SupplierOrderDetailProductAdapter(R.layout.item_order_product, proList, status);
proAdapter = new CruibleOrderDetailProductAdapter(R.layout.item_order_product, proList, status);
proAdapter.bindToRecyclerView(rvPro);
proAdapter.setEmptyView(R.layout.view_empty_order, rvPro);
}
private void getData() {
RtfUtils.getRtf().crucibleOrderDetail(getIntent().getStringExtra("id"), "3").compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
Observable<BaseBean> observable;
if (TextUtils.equals(type, "1")) {//1坩埚生产 2 坩埚销售
observable = RtfUtils.getRtf().crucibleOrderDetail(getIntent().getStringExtra("id"), "3");
} else {
observable = RtfUtils.getRtf().crucibleSaleOrderDetail(getIntent().getStringExtra("id"), "3");
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
......@@ -209,7 +222,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
proList.addAll(dataBean.getOrderItems());
proAdapter.notifyDataSetChanged();
tvName.setText(dataBean.getSupplierName());
tvName.setText(dataBean.getReceiveDeptName());
tvDep.setText(dataBean.getReceiveDeptName());
tvStatus.setText(dataBean.getStatusName());
tvPlaceName.setText(dataBean.getLaunchUserName());
......@@ -254,7 +267,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_add:
startActivity(AddStockApplyActivity.class,
"status", dataBean.getStatus() + "",
"orderType", dataBean.getOrderType() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanInStoreProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
......@@ -322,11 +335,17 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
}
startActivity(EndApplyActivity.class,
"status", getIntent().getStringExtra("status"),
"orderType", dataBean.getOrderType(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
case R.id.tv_send_apply:
startActivity(SendApplyActivity.class, "orderId", getIntent().getStringExtra("id"));
if (dataBean == null) {
toast("正在加载中，请稍后");
return;
}
startActivity(SendApplyActivity.class,
"orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ 928f240a
......@@ -289,7 +289,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
}
startActivity(EndApplyActivity.class,
"status", getIntent().getStringExtra("status"),
"orderType", dataBean.getOrderType(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
case R.id.tv_send_apply:
......@@ -298,7 +298,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
return;
}
startActivity(SendApplyActivity.class,
"orderType", dataBean.getOrderType(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ 928f240a
......@@ -325,7 +325,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
}
startActivity(EndApplyActivity.class,
"status", getIntent().getStringExtra("status"),
"orderType", dataBean.getOrderType(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
case R.id.tv_send_apply:
......@@ -334,7 +334,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
return;
}
startActivity(SendApplyActivity.class,
"orderType", dataBean.getOrderType(),
"orderType",dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ 928f240a
......@@ -300,7 +300,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
}
startActivity(EndApplyActivity.class,
"status", getIntent().getStringExtra("status"),
"orderType", dataBean.getOrderType(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
case R.id.tv_send_apply:
......@@ -309,7 +309,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
return;
}
startActivity(SendApplyActivity.class,
"orderType", dataBean.getOrderType(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SendApplyAddActivity.java
浏览文件 @ 928f240a
......@@ -135,7 +135,7 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().insideOrderDetail(getIntent().getStringExtra("id"), "3");
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().crucibleOrderDetail(getIntent().getStringExtra("id"), "3");
observable = RtfUtils.getRtf().crucibleSaleOrderDetail(getIntent().getStringExtra("id"), "3");
} else {
observable = RtfUtils.getRtf().saleOrderDetail(getIntent().getStringExtra("id"), "3");
}
......@@ -159,7 +159,7 @@ public class SendApplyAddActivity extends WorkToolBarActivity {
return;
}
dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
param.put("orderType", dataBean.getOrderType());
param.put("orderType", dataBean.getExpandInfo().getOrderType());
dataList.addAll(dataBean.getOrderItems());
dataAdapter.notifyDataSetChanged();
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ 928f240a
......@@ -306,7 +306,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
}
startActivity(EndApplyActivity.class,
"status", getIntent().getStringExtra("status"),
"orderType", dataBean.getOrderType(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
case R.id.tv_send_apply:
......@@ -315,7 +315,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
return;
}
startActivity(SendApplyActivity.class,
"orderType", dataBean.getOrderType(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/CruibleOrderDetailProductAdapter.java 0 → 100644
浏览文件 @ 928f240a
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.OrderDetail;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBean, BaseViewHolder> {
int status;
public CruibleOrderDetailProductAdapter(int layoutResId, List data, Integer status) {
super(layoutResId, data);
this.status = status;
}
@Override
protected void convert(BaseViewHolder helper, OrderDetail.OrderItemsBean item) {
helper.setText(R.id.tv_name, item.getProductName());
helper.setText(R.id.tv_card, item.getProductSoleCode());
helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
helper.addOnClickListener(R.id.tv_get);
helper.addOnClickListener(R.id.tv_return);
helper.addOnClickListener(R.id.tv_flow);
helper.addOnClickListener(R.id.tv_add);
helper.addOnClickListener(R.id.tv_quality);
switch (status) {
//// "待审核", "待接单", "待生产", "已入库","已交付"};
// "100", "200", "710", "500","600"};
case 100:
break;
case 200:
break;
case 300:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false);
break;
case 400:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false);
break;
case 500:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false);
break;
case 600:
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/fg/CrucibleOrderBuyListFragment.java
浏览文件 @ 928f240a
......@@ -145,6 +145,7 @@ public class CrucibleOrderBuyListFragment extends WorkBaseFg {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(CrucibleOrderDetailActivity.class,
"identity",identity,
"type","1",
"id", dataList.get(position).getId() + "",
"status", dataList.get(position).getStatus() + ""); }
});
......
app/src/main/java/com/wd/workoffice/ui/fg/CrucibleOrderSaleListFragment.java
浏览文件 @ 928f240a
......@@ -143,6 +143,7 @@ public class CrucibleOrderSaleListFragment extends WorkBaseFg {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(CrucibleOrderDetailActivity.class,
"identity", identity,
"type","2",
"id", dataList.get(position).getId() + "",
"status", dataList.get(position).getStatus() + "");
}
......
app/src/main/java/com/wd/workoffice/ui/fg/SendApplyFragment.java
浏览文件 @ 928f240a
......@@ -102,7 +102,7 @@ public class SendApplyFragment extends WorkBaseFg {
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().sendCoApplyList(param);
} else {
observable = RtfUtils.getRtf().addStockApplyList(param);
observable = RtfUtils.getRtf().sendApplyList(param);
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
......
app/src/main/res/layout/activity_crucible_order.xml
浏览文件 @ 928f240a
......@@ -104,7 +104,7 @@
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="提前结束申请"
android:text="生成坩埚销售订单"
android:textColor="@color/white" />
<TextView
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论