1.退货新增显示规则

2.//TODO 设备三个子菜单，新增退件,坩埚下单，mes其他页面，编辑任务担当无法修改.支数参数

app/src/main/java/com/wd/workoffice/bean/OrderDetail.java

@@ -887,7 +887,7 @@ public class OrderDetail {
         private double packageSum;
         private double usedSum;
         private double invoiceSum;
-        private Object usedReturnSum;
+        private String usedReturnSum;
         private double oddSum;
         private String lotNumber;
         private Object serialNumber;
@@ -916,10 +916,29 @@ public class OrderDetail {
         private Object orderType;
         private Object customerBranchFactoryName;
         private Object orderTypeName;
+        private String canOutReturnSum;
+        private String canUsedReturnSum;
+
         private List<ItemFlowsBean> itemFlows;
         private List<StockQuantityDetailMapsBean> stockQuantityDetailMaps;
         private String chooseNum;
 
+        public String getCanOutReturnSum() {
+            return canOutReturnSum;
+        }
+
+        public void setCanOutReturnSum(String canOutReturnSum) {
+            this.canOutReturnSum = canOutReturnSum;
+        }
+
+        public String getCanUsedReturnSum() {
+            return canUsedReturnSum;
+        }
+
+        public void setCanUsedReturnSum(String canUsedReturnSum) {
+            this.canUsedReturnSum = canUsedReturnSum;
+        }
+
         public String getChooseNum() {
             return chooseNum;
         }
@@ -1072,11 +1091,11 @@ public class OrderDetail {
             this.invoiceSum = invoiceSum;
         }
 
-        public Object getUsedReturnSum() {
+        public String getUsedReturnSum() {
             return usedReturnSum;
         }
 
-        public void setUsedReturnSum(Object usedReturnSum) {
+        public void setUsedReturnSum(String usedReturnSum) {
             this.usedReturnSum = usedReturnSum;
         }
 

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

@@ -291,8 +291,11 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
                         startActivity(ReturnApplyActivity.class,
                                 "identity", identity,
                                 "status", dataBean.getStatus() + "",
+                                "enterStockType",dataBean.getEnterStockType(),
+                                "returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
+                                        proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
                                 "orderType", dataBean.getExpandInfo().getOrderType(),
-                                "num", proList.get(position).getStoreSum() + "",
+                                "num", proList.get(position).getCanUseProductSum() + "",
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
                                 "orderId", getIntent().getStringExtra("id"),

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

@@ -248,8 +248,11 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
                         startActivity(ReturnApplyActivity.class,
                                 "identity", identity,
                                 "status", dataBean.getStatus() + "",
+                                "enterStockType",dataBean.getEnterStockType(),
+                                "returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
+                                        proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
                                 "orderType", dataBean.getExpandInfo().getOrderType(),
-                                "num", proList.get(position).getStoreSum() + "",
+                                "num", proList.get(position).getCanUseProductSum() + "",
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
                                 "orderId", getIntent().getStringExtra("id"),

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

@@ -300,7 +300,10 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
                                 "identity", identity,
                                 "status", dataBean.getStatus() + "",
                                 "orderType", dataBean.getExpandInfo().getOrderType(),
-                                "num", proList.get(position).getStoreSum() + "",
+                                "enterStockType",dataBean.getEnterStockType(),
+                                "returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
+                                        proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
+                                "num", proList.get(position).getCanUseProductSum() + "",
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
                                 "orderId", getIntent().getStringExtra("id"),

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

@@ -166,7 +166,10 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
                         startActivity(ReturnApplyActivity.class,
                                 "identity", identity,
                                 "status", dataBean.getStatus() + "",
-                                "num", proList.get(position).getStoreSum() + "",
+                                "num", proList.get(position).getCanUseProductSum() + "",
+                                "enterStockType",dataBean.getEnterStockType(),
+                                "returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
+                                        proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
                                 "orderId", getIntent().getStringExtra("id"),

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

 package com.wd.workoffice.ui.activity.bat.order;
 
 import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 
 import com.alibaba.fastjson.JSON;
@@ -15,6 +17,7 @@ import com.wd.workoffice.bean.ReturnApplyBean;
 import com.wd.workoffice.bean.event.CheckMoneytEvent;
 import com.wd.workoffice.bean.event.CheckReturnEvent;
 import com.wd.workoffice.bean.workEnum.OrderType;
+import com.wd.workoffice.bean.workEnum.PagePermissionType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.adapter.RetrunSendApplyAdapter;
@@ -179,4 +182,38 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
         param.put("current", page);
         getData();
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        String orderType = getIntent().getStringExtra("orderType");
+        String num = getIntent().getStringExtra("num");
+        if (Double.valueOf(num) == 0d) {
+            return super.onCreateOptionsMenu(menu);
+        }
+        if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
+            if (WorkUtils.hasPermission(PagePermissionType.SO_RETURN_SAVE.getPermission())) {
+                getMenuInflater().inflate(R.menu.menu_add, menu);
+            }
+        } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
+            if (WorkUtils.hasPermission(PagePermissionType.PO_RETURN_SAVE.getPermission())) {
+                getMenuInflater().inflate(R.menu.menu_add, menu);
+            }
+        }
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.add:
+                startActivity(UseApplyAddActivity.class,
+                        "num", getIntent().getStringExtra("num"),
+                        "orderType", getIntent().getStringExtra("orderType"),
+                        "productId", getIntent().getStringExtra("productId"),
+                        "simpleCode", getIntent().getStringExtra("simpleCode"),
+                        "id", getIntent().getStringExtra("orderId"));
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
 }

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

@@ -430,6 +430,10 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
                 checkDialog(1, info.getId());
                 break;
             case R.id.rl_history:
+                if (!WorkUtils.hasPermission(PagePermissionType.SO_RETURN_FLOW_LIST.getPermission())) {
+                    toast(R.string.permission);
+                    return;
+                }
                 startActivity(ReturnApplyHistoryActivity.class,"id",info.getId()+"");
                 break;
             case R.id.rl_order:

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

@@ -277,7 +277,9 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
                         startActivity(ReturnApplyActivity.class,
                                 "identity", identity,
                                 "status", dataBean.getStatus() + "",
-                                "num", proList.get(position).getStoreSum() + "",
+                                "num", proList.get(position).getCanUseProductSum() + "",
+                                "enterStockType",dataBean.getEnterStockType(),
+                                "returnNum", proList.get(position).getCanUseProductSum() + "",
                                 "orderType", dataBean.getExpandInfo().getOrderType(),
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),

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

@@ -265,8 +265,11 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
                         startActivity(ReturnApplyActivity.class,
                                 "identity", identity,
                                 "status", dataBean.getStatus() + "",
+                                "enterStockType",dataBean.getEnterStockType(),
+                                "returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
+                                        proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
                                 "orderType", dataBean.getExpandInfo().getOrderType(),
-                                "num", proList.get(position).getStoreSum() + "",
+                                "num", proList.get(position).getCanUseProductSum() + "",
                                 "product", proList.get(position).getProductName(),
                                 "simpleCode", proList.get(position).getProductSimpleCode(),
                                 "orderId", getIntent().getStringExtra("id"),