Skip to content

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

1.退件详情初版 

2.//TODO ，退件详情（top流程图，审核历史），接单，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，编辑任务担当无法修改.支数参数
上级 9d2c533d
隐藏空白字符变更
内嵌 并排
正在显示 包含 512 行增加 和 34 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ 913aaf11
......@@ -281,6 +281,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
break;
case R.id.tv_return:
startActivity(ReturnApplyActivity.class,
"identity", identity,
"status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getStoreSum() + "",
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ 913aaf11
......@@ -240,6 +240,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
break;
case R.id.tv_return:
startActivity(ReturnApplyActivity.class,
"identity", identity,
"status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getStoreSum() + "",
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ 913aaf11
......@@ -285,6 +285,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
break;
case R.id.tv_return:
startActivity(ReturnApplyActivity.class,
"identity", identity,
"status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getStoreSum() + "",
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProductOrderDetailActivity.java
浏览文件 @ 913aaf11
......@@ -163,6 +163,7 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
break;
case R.id.tv_return:
startActivity(ReturnApplyActivity.class,
"identity", identity,
"status", dataBean.getStatus() + "",
"num", proList.get(position).getStoreSum() + "",
"product", proList.get(position).getProductName(),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnApplyActivity.java
浏览文件 @ 913aaf11
......@@ -141,7 +141,11 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(ReturnDetailActivity.class,
"info", JSON.toJSONString(dataList.get(position)));
"info", JSON.toJSONString(dataList.get(position)),
"orderType", orderType
,"status", getIntent().getStringExtra("status")
,"id", getIntent().getStringExtra("orderId")
,"identity", getIntent().getStringExtra("identity"));
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnDetailActivity.java
浏览文件 @ 913aaf11
......@@ -15,7 +15,6 @@ import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AddStockBean;
import com.wd.workoffice.bean.ReturnApplyBean;
import com.wd.workoffice.bean.event.CheckAddStockEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
......@@ -54,12 +53,6 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
TextView tvAgree;
@BindView(R.id.ll_check)
LinearLayout llCheck;
@BindView(R.id.tv_finish_apply)
TextView tvFinishApply;
@BindView(R.id.tv_send_apply)
TextView tvSendApply;
@BindView(R.id.ll_apply)
LinearLayout llApply;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.rv_process)
......@@ -98,23 +91,24 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
protected void initData() {
info = JSON.parseObject(getIntent().getStringExtra("info"), ReturnApplyBean.RecordsBean.class);
orderType = getIntent().getStringExtra("orderType");
tvNum.setText(String.valueOf(info.getProductAmount()));
tvBoxNum.setText(String.valueOf(info.getBoxCode()));
tvName.setText(info.getProductSimpleCode());
tvProName.setText(info.getProductName());
tvProCode.setText(info.getProductSoleCode());
tvReturnNum.setText(String.valueOf(info.getProductAmount()));
tvReturnType.setText(info.getReturnTypeName());
tvStock.setText(info.getBackStockName());
tvPerson.setText(String.valueOf(info.getCreatedByName()));
tvTime.setText(info.getCreatedTime());
tvRemark.setText(String.valueOf(info.getApplyRemark()));
if (TextUtils.equals(info.getQualityInspectionStatus(), "0")) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE);
changePermission();
} else {
llBottom.setVisibility(View.GONE);
llCheck.setVisibility(View.VISIBLE);
tvCheckPerson.setText(info.getUpdatedByName());
tvCheckTime.setText(info.getUpdatedTime());
tvCheckRemark.setText(info.getAuditRemark());
tvCheckStatus.setText(WorkUtils.getFinancialStatus(Integer.valueOf(info.getQualityInspectionStatus())));
}
tvStatus.setText(WorkUtils.getReturnStatus(Integer.valueOf(info.getStatus())));
// if (TextUtils.equals(info.getStatus(), "0")) {
// llBottom.setVisibility(View.VISIBLE);
// llCheck.setVisibility(View.GONE);
// changePermission();
// } else {
// llBottom.setVisibility(View.GONE);
// llCheck.setVisibility(View.VISIBLE);
// }
}
......@@ -128,18 +122,6 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_refuse:
checkDialog(2, info.getId());
break;
case R.id.tv_agree:
checkDialog(1, info.getId());
break;
}
}
private void changePermission() {
boolean hasPermission = true;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
......@@ -149,6 +131,8 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_AUDIT.getPermission());
}
if (!hasPermission) {
tvRefuse.setVisibility(View.GONE);
tvAgree.setVisibility(View.GONE);
......@@ -239,6 +223,34 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
});
}
@OnClick({R.id.tv_refuse, R.id.tv_agree, R.id.rl_history, R.id.rl_order})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_refuse:
checkDialog(2, info.getId());
break;
case R.id.tv_agree:
checkDialog(1, info.getId());
break;
case R.id.rl_history:
break;
case R.id.rl_order:
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
startActivity(SaleOrderDetailActivity.class,
"identity", getIntent().getStringExtra("identity"),
"id", getIntent().getStringExtra("id"),
"status", getIntent().getStringExtra("status"));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
startActivity(OutOrderDetailActivity.class,
"identity", getIntent().getStringExtra("identity"),
"id", getIntent().getStringExtra("id"),
"status", getIntent().getStringExtra("status"));
} else {
}
break;
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ 913aaf11
......@@ -267,6 +267,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
break;
case R.id.tv_return:
startActivity(ReturnApplyActivity.class,
"identity", identity,
"status", dataBean.getStatus() + "",
"num", proList.get(position).getStoreSum() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ 913aaf11
......@@ -255,6 +255,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
break;
case R.id.tv_return:
startActivity(ReturnApplyActivity.class,
"identity", identity,
"status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getStoreSum() + "",
......
app/src/main/res/layout/activity_bat_retrun_detail.xml 0 → 100644
浏览文件 @ 913aaf11
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/ll_top"
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentTop="true"
android:background="@color/blue_bg"
android:gravity="center_vertical|right"
android:orientation="horizontal"
android:paddingHorizontal="20mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true">
<ImageView
android:layout_width="18mm"
android:layout_height="18mm"
android:src="@mipmap/order_detail_bell" />
<TextView
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="拒绝"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentBottom="true"
android:gravity="center_vertical|right"
android:orientation="horizontal"
android:visibility="gone">
<LinearLayout
android:id="@+id/ll_check"
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentBottom="true"
android:gravity="center_vertical|right"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:id="@+id/tv_refuse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_red_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:tag="order:crucible-order:audit"
android:text="拒绝"
android:textColor="@color/white" />
<TextView
android:id="@+id/tv_agree"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_green_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:tag="order:crucible-order:audit"
android:text="同意"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:layout_below="@id/ll_top"
android:background="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:orientation="vertical"
android:paddingBottom="20mm">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_process"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="10mm" />
<View style="@style/ViewX" />
<RelativeLayout
android:id="@+id/rl_history"
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="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="审核历史" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:src="@mipmap/arrow_right_blue"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
<View style="@style/ViewX" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="货品信息"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingTop="10mm"
android:paddingBottom="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="邢台德龙钢铁客户"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="#0841F0"
android:textSize="14sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:background="#FCFCFD"
android:orientation="vertical"
android:paddingVertical="10mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="品号"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_pro_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="品名"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_pro_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<View style="@style/ViewX" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="退货信息"
android:textSize="15sp" />
</LinearLayout>
<RelativeLayout
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="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="退货数量" />
<TextView
android:id="@+id/tv_return_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
<RelativeLayout
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="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="退货类型" />
<TextView
android:id="@+id/tv_return_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
<RelativeLayout
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="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="目标仓库" />
<TextView
android:id="@+id/tv_stock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
<RelativeLayout
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="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="申请人" />
<TextView
android:id="@+id/tv_person"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
<RelativeLayout
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="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="申请时间" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
<RelativeLayout
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="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="部门名称" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="1mm"
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:text="申请备注"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:textSize="14sp" />
</LinearLayout>
<View style="@style/ViewX" />
<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="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="查看订单信息" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:src="@mipmap/arrow_right_blue"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论