1.提前结束，上报修改

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

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

@@ -1313,6 +1313,14 @@ public interface ApiService {
     @GET("/advance-finish-apply/so/logs/{orderId}")
     Observable<BaseBean> endApplyList(@Path("orderId") String orderId, @QueryMap Map<String, Object> param);
 
+    /**
+     * step5_3-一个订单的提前结束历史记录
+     *
+     * @return
+     */
+    @GET("/advance-finish-apply/po/logs/{orderId}")
+    Observable<BaseBean> endPoApplyList(@Path("orderId") String orderId, @QueryMap Map<String, Object> param);
+
     /**
      * step5_32-发送销售订单领用申请
      *

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

@@ -77,7 +77,16 @@ public class EndApplyActivity extends WorkToolBarActivity {
     }
 
     private void getData() {
-        RtfUtils.getRtf().endApplyList(getIntent().getStringExtra("orderId"), param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+        String orderType = getIntent().getStringExtra("orderType");
+        Observable<BaseBean> observable;
+        if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
+            observable = RtfUtils.getRtf().endApplyList(getIntent().getStringExtra("orderId"), param);
+        } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
+            observable = RtfUtils.getRtf().endPoApplyList(getIntent().getStringExtra("orderId"), param);
+        } else {
+            observable = RtfUtils.getRtf().endApplyList(getIntent().getStringExtra("orderId"), param);
+        }
+        observable .compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

app/src/main/java/com/wd/workoffice/ui/activity/mes/report/MesReportActivity.java

@@ -91,7 +91,8 @@ public class MesReportActivity extends WorkBaseActivity {
     private List<OrderBadBean.ScrapStatisticsListsBean> badList;
     private Map<String, Object> badParam;
     private QMUIDialog.MenuDialogBuilder depDialog;
-    private List<String> depNameList =new ArrayList<>();
+    private List<String> depNameList = new ArrayList<>();
+
     @Override
     protected void initView() {
         ButterKnife.bind(this);
@@ -116,8 +117,8 @@ public class MesReportActivity extends WorkBaseActivity {
         proBadAdapter.bindToRecyclerView(rvProBad);
         param = WorkUtils.simpleParam();
         badParam = WorkUtils.simpleParam();
-        badParam.put("beginDate",TimeUtils.getNowString());
-        badParam.put("endDate",TimeUtils.getNowString());
+        badParam.put("beginDate", TimeUtils.getNowString());
+        badParam.put("endDate", TimeUtils.getNowString());
         depDialog = DialogUtils.listDialog(this);
         getData();
         getDepData();
@@ -143,8 +144,8 @@ public class MesReportActivity extends WorkBaseActivity {
                     return;
                 }
                 List<MesFactoryBean.SitesBean> getList = JSON.parseObject(data.getData().toString(), MesFactoryBean.class).getSites();
-                if (getList.size()!=0){
-                    badParam.put("siteCode",getList.get(0).getSiteCode());
+                if (getList.size() != 0) {
+                    badParam.put("siteCode", getList.get(0).getSiteCode());
                     tvDept.setText(getList.get(0).getSiteName());
                 }
                 depNameList.clear();
@@ -155,7 +156,7 @@ public class MesReportActivity extends WorkBaseActivity {
                 depDialog.addItems(depNameList.toArray(new String[depNameList.size()]), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        badParam.put("siteCode",getList.get(which).getSiteCode());
+                        badParam.put("siteCode", getList.get(which).getSiteCode());
                         tvDept.setText(depNameList.get(which));
                         dialog.dismiss();
                         getOrderBad();
@@ -224,7 +225,9 @@ public class MesReportActivity extends WorkBaseActivity {
                 }
                 List<OrderBadBean.ScrapStatisticsListsBean> getList = JSON.parseObject(data.getData().toString(), OrderBadBean.class).getScrapStatisticsLists();
                 badList.clear();
-                badList.addAll(getList);
+                if (getList != null) {
+                    badList.addAll(getList);
+                }
                 badAdapter.notifyDataSetChanged();
 
             }
@@ -241,9 +244,12 @@ public class MesReportActivity extends WorkBaseActivity {
     }
 
 
-    @OnClick({R.id.tv_start, R.id.tv_end, R.id.ll_time, R.id.tv_report, R.id.tv_bad})
+    @OnClick({R.id.tv_dept, R.id.tv_start, R.id.tv_end, R.id.ll_time, R.id.tv_report, R.id.tv_bad})
     public void onViewClicked(View view) {
         switch (view.getId()) {
+            case R.id.tv_dept:
+                depDialog.show();
+                break;
             case R.id.tv_start:
                 PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
                     @Override
@@ -253,7 +259,7 @@ public class MesReportActivity extends WorkBaseActivity {
                         tvStart.setText(time);
                         getOrderBad();
                     }
-                },false).show();
+                }, false).show();
                 break;
             case R.id.tv_end:
                 PickTimeUtils.showPickThree(this, new OnTimeSelectListener() {
@@ -264,7 +270,7 @@ public class MesReportActivity extends WorkBaseActivity {
                         tvEnd.setText(time);
                         getOrderBad();
                     }
-                },false).show();
+                }, false).show();
                 break;
             case R.id.ll_time:
                 PickTimeUtils.showPickTwo(this, new OnTimeSelectListener() {