1.退件详情初版

2.//TODO ，退件详情（top流程图，审核历史），接单，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，编辑任务担当无法修改.支数参数

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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() + "",