Skip to content

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

1.修改审核跳转

上级 55b75544
隐藏空白字符变更
内嵌 并排
正在显示 包含 78 行增加 和 17 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/approval/WorkApprovalActivity.java
浏览文件 @ 1fcdfa10
......@@ -14,8 +14,12 @@ import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.order.CrucibleOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.InsideOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.OutOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.ProductOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SaleOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkContactsOpenTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
import com.wd.workoffice.ui.adapter.ApprovalAdapter;
......@@ -150,6 +154,22 @@ public class WorkApprovalActivity extends WorkToolBarActivity {
startActivity(ProductOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.OUT_BUY.getCode(), approval.getOrderType())) {
startActivity(OutOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.IN.getCode(), approval.getOrderType())) {
startActivity(InsideOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.SUPPLIER.getCode(), approval.getOrderType())) {
startActivity(SupplierOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.CRUCIBLE.getCode(), approval.getOrderType())) {
startActivity(CrucibleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals("PM", approval.getOrderType())) {
startActivity(WorkProDetailActivity.class,
"id", approval.getId() + "");
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ 1fcdfa10
......@@ -127,7 +127,9 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
ButterKnife.bind(this);
rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
status = Integer.valueOf(getIntent().getStringExtra("status"));
if (!TextUtils.isEmpty(getIntent().getStringExtra("status"))) {
status = Integer.valueOf(getIntent().getStringExtra("status"));
}
identity = getIntent().getStringExtra("identity");
type = getIntent().getStringExtra("type");
if (TextUtils.equals(type, "1")) {//1 坩埚生产 2 坩埚销售
......@@ -210,7 +212,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
flowAdapter.bindToRecyclerView(rvProcess);
flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
proList = new ArrayList<>();
proAdapter = new CruibleOrderDetailProductAdapter(R.layout.item_order_product, proList, status);
proAdapter = new CruibleOrderDetailProductAdapter(R.layout.item_order_product, proList, status == null ? 0 : status);
proAdapter.bindToRecyclerView(rvPro);
proAdapter.setEmptyView(R.layout.view_empty_order, rvPro);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ 1fcdfa10
......@@ -116,7 +116,9 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
ButterKnife.bind(this);
rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
status = Integer.valueOf(getIntent().getStringExtra("status"));
if (!TextUtils.isEmpty(getIntent().getStringExtra("status"))) {
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);
......@@ -171,7 +173,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
flowAdapter.bindToRecyclerView(rvProcess);
flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
proList = new ArrayList<>();
proAdapter = new InsideOrderDetailProductAdapter(R.layout.item_order_product, proList, status);
proAdapter = new InsideOrderDetailProductAdapter(R.layout.item_order_product, proList, status == null ? 0 : status);
proAdapter.bindToRecyclerView(rvPro);
proAdapter.setEmptyView(R.layout.view_empty_order, rvPro);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ 1fcdfa10
......@@ -139,7 +139,9 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
ButterKnife.bind(this);
rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
status = Integer.valueOf(getIntent().getStringExtra("status"));
if (!TextUtils.isEmpty(getIntent().getStringExtra("status"))) {
status = Integer.valueOf(getIntent().getStringExtra("status"));
}
identity = getIntent().getStringExtra("identity");
if (TextUtils.equals(identity, "1")) {//1销售 2生产
......@@ -172,7 +174,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
flowAdapter.bindToRecyclerView(rvProcess);
flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
proList = new ArrayList<>();
proAdapter = new OutOrderDetailProductAdapter(R.layout.item_order_product, proList, status);
proAdapter = new OutOrderDetailProductAdapter(R.layout.item_order_product, proList, status == null ? 0 : status);
proAdapter.bindToRecyclerView(rvPro);
proAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ 1fcdfa10
......@@ -131,7 +131,6 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
}
if (!TextUtils.isEmpty(getIntent().getStringExtra("status"))) {
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);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ 1fcdfa10
......@@ -125,7 +125,9 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
ButterKnife.bind(this);
rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
status = Integer.valueOf(getIntent().getStringExtra("status"));
if (!TextUtils.isEmpty(getIntent().getStringExtra("status"))) {
status = Integer.valueOf(getIntent().getStringExtra("status"));
}
identity = getIntent().getStringExtra("identity");
if (TextUtils.equals(identity, "1")) {//1销售 2生产
......@@ -186,7 +188,7 @@ public class SupplierOrderDetailActivity 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 SupplierOrderDetailProductAdapter(R.layout.item_order_product, proList, status == null ? 0 : status);
proAdapter.bindToRecyclerView(rvPro);
proAdapter.setEmptyView(R.layout.view_empty_order, rvPro);
}
......@@ -500,10 +502,4 @@ public class SupplierOrderDetailActivity 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/fg/ApprovalFromMeFragment.java
浏览文件 @ 1fcdfa10
......@@ -15,8 +15,12 @@ import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.order.CrucibleOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.InsideOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.OutOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.ProductOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SaleOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkContactsOpenTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
import com.wd.workoffice.ui.adapter.ApprovalAdapter;
......@@ -151,9 +155,25 @@ public class ApprovalFromMeFragment extends WorkBaseFg {
startActivity(ProductOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.OUT_BUY.getCode(), approval.getOrderType())) {
startActivity(OutOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.IN.getCode(), approval.getOrderType())) {
startActivity(InsideOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.SUPPLIER.getCode(), approval.getOrderType())) {
startActivity(SupplierOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.CRUCIBLE.getCode(), approval.getOrderType())) {
startActivity(CrucibleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals("PM", approval.getOrderType())) {
startActivity(WorkProDetailActivity.class,
"id", approval.getId()+"");
"id", approval.getId() + "");
}
}
}
......
app/src/main/java/com/wd/workoffice/ui/fg/ApprovalToMeFragment.java
浏览文件 @ 1fcdfa10
......@@ -21,9 +21,13 @@ import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.order.CrucibleOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.InsideOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.OutOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.ProductOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SaleOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SendApplyDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkContactsOpenTicketActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
import com.wd.workoffice.ui.adapter.ApprovalAdapter;
......@@ -160,9 +164,25 @@ public class ApprovalToMeFragment extends WorkBaseFg {
startActivity(ProductOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.OUT_BUY.getCode(), approval.getOrderType())) {
startActivity(OutOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.IN.getCode(), approval.getOrderType())) {
startActivity(InsideOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.SUPPLIER.getCode(), approval.getOrderType())) {
startActivity(SupplierOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals(OrderType.CRUCIBLE.getCode(), approval.getOrderType())) {
startActivity(CrucibleOrderDetailActivity.class,
"identity", "1",
"id", approval.getOrderId());
} else if (TextUtils.equals("PM", approval.getOrderType())) {
startActivity(WorkProDetailActivity.class,
"id", approval.getLinkSerialNumber());
"id", approval.getId() + "");
}
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论