1.修改退单参数

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

app/src/main/AndroidManifest.xml

@@ -1908,7 +1908,7 @@
         <activity
             android:name=".ui.activity.bat.order.ReturnDetailActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label="退件详情"
+            android:label="退单详情"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
@@ -1924,7 +1924,7 @@
         <activity
             android:name=".ui.activity.bat.order.ReturnAddActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label="新增退件"
+            android:label="新增退单"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"

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

@@ -289,6 +289,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
                                 "identity", identity,
                                 "status", dataBean.getStatus() + "",
                                 "enterStockType",dataBean.getEnterStockType(),
+                                "deptId",dataBean.getLaunchDeptId()+"",
                                 "returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
                                         proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
                                 "orderType", dataBean.getExpandInfo().getOrderType(),

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

@@ -249,6 +249,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
                                 "identity", identity,
                                 "status", dataBean.getStatus() + "",
                                 "enterStockType",dataBean.getEnterStockType(),
+                                "deptId",dataBean.getLaunchDeptId()+"",
                                 "returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
                                         proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
                                 "orderType", dataBean.getExpandInfo().getOrderType(),

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

@@ -301,6 +301,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
                                 "status", dataBean.getStatus() + "",
                                 "orderType", dataBean.getExpandInfo().getOrderType(),
                                 "enterStockType",dataBean.getEnterStockType(),
+                                "deptId",dataBean.getLaunchDeptId()+"",
                                 "returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
                                         proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
                                 "num", proList.get(position).getCanUseProductSum() + "",

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

@@ -141,6 +141,7 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
                                 "status", dataBean.getStatus() + "",
                                 "num", proList.get(position).getCanUseProductSum() + "",
                                 "enterStockType", dataBean.getEnterStockType(),
+                                "deptId",dataBean.getLaunchDeptId()+"",
                                 "returnNum", TextUtils.equals(dataBean.getEnterStockType(), "1") ?
                                         proList.get(position).getCanOutReturnSum() : proList.get(position).getCanUsedReturnSum(),
                                 "product", proList.get(position).getProductName(),

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

@@ -217,7 +217,7 @@ public class ReturnAddActivity extends WorkToolBarActivity {
 
 
     private void getDept() {
-        RtfUtils.getRtf().returnDept(UserKeeper.getInstance().getUserDepId()).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        RtfUtils.getRtf().returnDept(getIntent().getStringExtra("deptId")).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

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

@@ -212,6 +212,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
                         "productId", getIntent().getStringExtra("productId"),
                         "orderItemId", getIntent().getStringExtra("orderItemId"),
                         "enterStockType", getIntent().getStringExtra("enterStockType"),
+                        "deptId", getIntent().getStringExtra("deptId"),
                         "id", getIntent().getStringExtra("orderId"));
                 break;
         }

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

@@ -278,6 +278,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
                                 "status", dataBean.getStatus() + "",
                                 "num", proList.get(position).getCanUseProductSum() + "",
                                 "enterStockType", dataBean.getEnterStockType(),
+                                "deptId",dataBean.getLaunchDeptId()+"",
                                 "returnNum", proList.get(position).getCanUseProductSum() + "",
                                 "orderType", dataBean.getExpandInfo().getOrderType(),
                                 "product", proList.get(position).getProductName(),

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

@@ -266,6 +266,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
                                 "identity", identity,
                                 "status", dataBean.getStatus() + "",
                                 "enterStockType",dataBean.getEnterStockType(),
+                                "deptId",dataBean.getLaunchDeptId()+"",
                                 "returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")?
                                         proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(),
                                 "orderType", dataBean.getExpandInfo().getOrderType(),