1.组装订单订单详情

2.//TODO erp用户激活测试，忘记/重置密码测试，质检接口数据问题,内部订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单页面，组装下单，产品下单还差附件测试，mes，刷新token

app/src/main/java/com/wd/workoffice/retrofit/ApiService.java

@@ -1254,7 +1254,13 @@ public interface ApiService {
      */
     @POST("/procedureStart/so/applyUse/{orderId}")
     Observable<BaseBean> useApplyAdd(@Path("orderId") String orderId, @Body RequestBody requestBody);
-
+    /**
+     * step5_32-发送销售订单领用申请
+     *
+     * @return
+     */
+    @POST("/procedureStart/ao/applyUse/{orderId}")
+    Observable<BaseBean> useAoApplyAdd(@Path("orderId") String orderId, @Body RequestBody requestBody);
 
     /**
      * step8_1-领用申请分页查询
@@ -1284,7 +1290,7 @@ public interface ApiService {
      *
      * @return
      */
-    @PUT("/procedureStart/ao/applyUse/{orderId}")
+    @PUT("/useApply/ao/audit/{applyId}")
     Observable<BaseBean> useAoApplyCheck(@Path("applyId") String applyId, @Body RequestBody requestBody);
 
     /**

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

@@ -351,7 +351,6 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
         addCartDialog.show();
     }
 
-
     private void check(int status, String remark) {
         Map<String, Object> dataParam = WorkUtils.simpleParam();
         dataParam.put("result", status);

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

@@ -143,7 +143,9 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
                     case R.id.tv_get:
                         startActivity(UseApplyActivity.class,
                                 "status", dataBean.getStatus() + "",
-                                "num", proList.get(position).getCanOutStoreProductSum() + "",
+                                "orderType", dataBean.getExpandInfo().getOrderType(),
+                                "from", "1",
+                                "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/UseApplyActivity.java

@@ -80,7 +80,11 @@ public class UseApplyActivity extends WorkToolBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (TextUtils.equals(getIntent().getStringExtra("status"), "600")) {
+        if (TextUtils.isEmpty(getIntent().getStringExtra("form"))) {
+            if (TextUtils.equals(getIntent().getStringExtra("status"), "600")) {
+                getMenuInflater().inflate(R.menu.menu_add, menu);
+            }
+        } else {
             getMenuInflater().inflate(R.menu.menu_add, menu);
         }
         return super.onCreateOptionsMenu(menu);
@@ -92,6 +96,7 @@ public class UseApplyActivity extends WorkToolBarActivity {
             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"));

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

@@ -10,6 +10,7 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.event.CheckUseEvent;
+import com.wd.workoffice.bean.workEnum.OrderType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.util.WorkUtils;
@@ -23,6 +24,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
@@ -45,6 +47,7 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
     @BindView(R.id.tv_remark_num)
     TextView tvRemarkNum;
     private Map<String, Object> param;
+    private String orderType;
 
     @Override
     protected void initView() {
@@ -53,6 +56,7 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
 
     @Override
     protected void initData() {
+        orderType = getIntent().getStringExtra("orderType");
         tvNum.setText(String.format("最大领用数量(%s)", getIntent().getStringExtra("num")));
         param = new HashMap<>();
         param.put("productId", getIntent().getStringExtra("productId"));
@@ -103,7 +107,15 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
         param.put("productAmount", num);
         param.put("orderId", getIntent().getStringExtra("id"));
         param.put("applyRemark", remark);
-        RtfUtils.getRtf().useApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        Observable<BaseBean> observable;
+        if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
+            observable = RtfUtils.getRtf().useApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
+        } else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
+            observable = RtfUtils.getRtf().useAoApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
+        } else {
+            observable = RtfUtils.getRtf().useApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
+        }
+        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

app/src/main/java/com/wd/workoffice/ui/adapter/ProductOrderDetailProductAdapter.java

@@ -38,6 +38,7 @@ public class ProductOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
         helper.addOnClickListener(R.id.tv_flow);
         helper.addOnClickListener(R.id.tv_add);
         helper.addOnClickListener(R.id.tv_quality);
+        helper.setGone(R.id.ll_btn, true);
         helper.setGone(R.id.tv_quality, false);
         helper.setGone(R.id.tv_add, false);
         helper.setGone(R.id.tv_return, false);

app/src/main/java/com/wd/workoffice/ui/fg/UseApplyFragment.java

@@ -62,7 +62,6 @@ public class UseApplyFragment extends WorkBaseFg {
     private Map<String, Object> param;
     private UseApplyAdapter dataAdapter;
     private List<UseApplyBean.RecordsBean> dataList;
-    private String orderId;
     private String simpleCode;
     private String product;
     private String orderType;
@@ -95,7 +94,6 @@ public class UseApplyFragment extends WorkBaseFg {
         Bundle arguments = getArguments();
         if (arguments != null) {
             state = arguments.getString("state");
-            orderId = arguments.getString("orderId");
             simpleCode = arguments.getString("simpleCode");
             product = arguments.getString("product");
             orderType = arguments.getString("orderType");