1.质量反馈

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

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

@@ -32,7 +32,7 @@ public interface MesApiService {
      *
      * @return
      */
-    @POST("/himes/api/checkLogin")
+    @POST("/himes/api/applogin")
     Observable<BaseMesBean> login(@Query("userName") String userName, @Query("password") String password);
 
     /**
@@ -391,6 +391,11 @@ public interface MesApiService {
      */
     @POST("/himes/api/feedback/add/save.json")
     Observable<BaseMesBean> feedbackAdd(@Query("functionId") String functionId, @Body RequestBody requestBody);
+    /**
+     * @return
+     */
+    @POST("/himes/api/feedback/update/save.json")
+    Observable<BaseMesBean> feedbackUpdate(@Query("functionId") String functionId, @Body RequestBody requestBody);
 
     /**
      * @return

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityActivity.java

@@ -19,6 +19,7 @@ import com.wd.workoffice.bean.event.CheckFeedbackEvent;
 import com.wd.workoffice.bean.mesBean.FeedbackBean;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.mes.ticket.MesTicketAddActivity;
 import com.wd.workoffice.ui.adapter.MesQualityAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -141,8 +142,12 @@ public class MesQualityActivity extends WorkToolBarActivity {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                if (TextUtils.equals(dataList.get(position).getStatus(), "1")) {
+                    startActivity(MesQualityAddActivity.class, "data", JSON.toJSONString(dataList.get(position)));
+                } else {
                     startActivity(MesQualityDetailActivity.class, "id", dataList.get(position).getId() + "");
                 }
+            }
         });
     }
 

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAddActivity.java

 package com.wd.workoffice.ui.activity.mes.quality;
 
 import android.content.Intent;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -10,13 +11,19 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.BaseMesBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.event.CheckFeedbackEvent;
 import com.wd.workoffice.bean.mesBean.BoxBean;
 import com.wd.workoffice.bean.mesBean.ChooseMachineBean;
 import com.wd.workoffice.bean.mesBean.DefectBean;
+import com.wd.workoffice.bean.mesBean.FeedbackBean;
+import com.wd.workoffice.bean.mesBean.JobTypeBean;
 import com.wd.workoffice.bean.mesBean.MesClientBean;
+import com.wd.workoffice.bean.mesBean.TakeOnBean;
+import com.wd.workoffice.bean.mesBean.TicketBean;
+import com.wd.workoffice.bean.workEnum.OrderType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.mes.ticket.MesTicketClientActivity;
@@ -31,6 +38,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;
 
 /**
@@ -91,7 +99,68 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
     @Override
     protected void initData() {
         param = WorkUtils.simpleParam();
+        String data = getIntent().getStringExtra("data");
+        if (!TextUtils.isEmpty(data)) {
+            FeedbackBean.ListBean ticketBean = JSON.parseObject(data, FeedbackBean.ListBean.class);
+            chooseClient = new MesClientBean.ListBean();
+            chooseClient.setCustomerCode(ticketBean.getCustomerId());
+            chooseClient.setCustomerName(ticketBean.getCustomerName());
+            chooseClient.setSalesManagerCode(ticketBean.getSaleUserCode());
+            chooseClient.setSalesManagerName(ticketBean.getSaleUserName());
+            tvClient.setText(chooseClient.getCustomerName());
+//              tvPhone.setText(chooseClient.get());
+            tvManager.setText(chooseClient.getSalesManagerName());
+            param.put("customerId", chooseClient.getCustomerCode());
+            param.put("customerName", chooseClient.getCustomerName());
+            param.put("saleUserCode", chooseClient.getSalesManagerCode());
+            param.put("saleUserName", chooseClient.getSalesManagerName());
+
 
+            chooseMachine = new ChooseMachineBean();
+            chooseMachine.setSteelTypeId(ticketBean.getSteelTypeId());
+            chooseMachine.setCasterName(ticketBean.getCasterName());
+            chooseMachine.setDefectCount(ticketBean.getDefectCount() + "");
+            tvMachine.setText(chooseMachine.getCasterName());
+            tvSteel.setText(chooseMachine.getSteelTypeId());
+            etNum.setText(chooseMachine.getDefectCount());
+            param.put("steelTypeId", chooseMachine.getSteelTypeId());
+            param.put("casterName", chooseMachine.getCasterName());
+            param.put("defectCount", chooseMachine.getDefectCount());
+
+            chooseBox = new BoxBean();
+            chooseBox.setSerialNumber(ticketBean.getSerialNumber());
+            chooseBox.setDrawingNumber(ticketBean.getDrawingNumber());
+            chooseBox.setSpecification(ticketBean.getSpecification() + "");
+            chooseBox.setProductCode(ticketBean.getProductCode());
+            chooseBox.setProductName(ticketBean.getProductName());
+            chooseBox.setBoxNumber(ticketBean.getBoxCode());
+            chooseBox.setBoxId(ticketBean.getBoxId());
+
+            tvProCode.setText(chooseBox.getProductCode());
+            tvProName.setText(chooseBox.getProductName());
+            tvSpec.setText(chooseBox.getSpecification());
+            tvImgCode.setText(chooseBox.getDrawingNumber());
+            tvMarkCode.setText(chooseBox.getSerialNumber());
+            tvBox.setText(chooseBox.getBoxId());
+            param.put("serialNumber", chooseBox.getSerialNumber());
+            param.put("drawingNumber", chooseBox.getDrawingNumber());
+            param.put("specification", chooseBox.getSpecification());
+            param.put("productCode", chooseBox.getProductCode());
+            param.put("productName", chooseBox.getProductName());
+            param.put("boxCode", chooseBox.getBoxNumber());
+            param.put("boxId", chooseBox.getBoxId());
+
+            chooseDefect = new DefectBean.ListBean();
+            chooseDefect.setRemark(ticketBean.getMainCause());
+            chooseDefect.setDefectCode(ticketBean.getDefectCode());
+            chooseDefect.setDefectName(ticketBean.getDefectName());
+
+            tvDefect.setText(chooseDefect.getDefectName());
+            etDesc.setText(chooseDefect.getRemark());
+            param.put("mainCause", chooseDefect.getRemark());
+            param.put("defectCode", chooseDefect.getDefectCode());
+            param.put("defectName", chooseDefect.getDefectName());
+        }
     }
 
 
@@ -186,7 +255,7 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_finish, menu);
+        getMenuInflater().inflate(R.menu.menu_finish_save, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -213,13 +282,24 @@ public class MesQualityAddActivity extends WorkToolBarActivity {
 //                param.put("", "");
                 submit();
                 break;
+            case R.id.save:
+                submit();
+                break;
         }
         return super.onOptionsItemSelected(item);
     }
 
     private void submit() {
-        param.put("status","1");
-        RtfUtils.getMesRtf().feedbackAdd("1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
+
+        Observable<BaseMesBean> observable;
+        if (TextUtils.isEmpty(getIntent().getStringExtra("data"))) {
+            param.put("status", "2");
+            observable = RtfUtils.getMesRtf().feedbackAdd("1", WorkUtils.convertMapToBody(param));
+        } else {
+            param.put("status", "1");
+            observable = RtfUtils.getMesRtf().feedbackUpdate("1", WorkUtils.convertMapToBody(param));
+        }
+        observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
             @Override
             public void doOnSubscribe(Disposable d) {
             }

app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDetailActivity.java

@@ -154,35 +154,43 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
     }
 
     private void changeView() {
+        //1 待提交、2 待审批、3 已驳回、4 待质量部分析、 5 待相关部门反馈、6 待关闭、7 已关闭
         imgList.clear();
         imgList.addAll(detailBean.getAttachments());
         imgAdapter.notifyDataSetChanged();
         switch (detailBean.getStatus()) {
-            case "0":
+            case "2":
                 llClient.setVisibility(View.GONE);
                 llCompany.setVisibility(View.GONE);
                 llManager.setVisibility(View.GONE);
                 llBottom.setVisibility(View.VISIBLE);
+                btnReviews.setVisibility(View.VISIBLE);
                 break;
-            case "1":
+            case "3":
+                llClient.setVisibility(View.GONE);
+                llCompany.setVisibility(View.GONE);
+                llManager.setVisibility(View.GONE);
+                llBottom.setVisibility(View.GONE);
+                break;
+            case "4":
                 llClient.setVisibility(View.GONE);
                 llCompany.setVisibility(View.GONE);
                 llManager.setVisibility(View.GONE);
                 llBottom.setVisibility(View.VISIBLE);
                 break;
-            case "2":
+            case "5":
                 llClient.setVisibility(View.GONE);
                 llCompany.setVisibility(View.GONE);
                 llManager.setVisibility(View.VISIBLE);
                 llBottom.setVisibility(View.VISIBLE);
                 break;
-            case "3":
+            case "6":
                 llClient.setVisibility(View.GONE);
                 llCompany.setVisibility(View.VISIBLE);
                 llManager.setVisibility(View.VISIBLE);
                 llBottom.setVisibility(View.VISIBLE);
                 break;
-            case "4":
+            case "7":
                 llClient.setVisibility(View.VISIBLE);
                 llCompany.setVisibility(View.VISIBLE);
                 llManager.setVisibility(View.VISIBLE);
@@ -237,16 +245,17 @@ public class MesQualityDetailActivity extends WorkToolBarActivity {
     @OnClick(R.id.btn_reviews)
     public void onViewClicked() {
         switch (detailBean.getStatus()) {
-            case "0":
-                startActivity(MesQualityManagerActivity.class,"data",JSON.toJSONString(detailBean));
-                break;
+            //1 待提交、2 待审批、3 已驳回、4 待质量部分析、 5 待相关部门反馈、6 待关闭、7 已关闭
             case "1":
                 startActivity(MesQualityManagerActivity.class,"data",JSON.toJSONString(detailBean));
                 break;
-            case "2":
+            case "4":
                 startActivity(MesQualityFactoryActivity.class,"data",JSON.toJSONString(detailBean));
                 break;
-            case "3":
+            case "5":
+                startActivity(MesQualityFactoryActivity.class,"data",JSON.toJSONString(detailBean));
+                break;
+            case "6":
                 startActivity(MesQualityClientActivity.class,"data",JSON.toJSONString(detailBean));
                 break;
         }

app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddSummaryActivity.java

@@ -60,7 +60,7 @@ import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
 /**
- * 工单新增
+ * 工单总结
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -247,6 +247,8 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
             llTech.setVisibility(View.VISIBLE);
         } else if (TextUtils.equals(jobTypeId, "05")) {
             llTender.setVisibility(View.VISIBLE);
+        }else if (TextUtils.equals(jobTypeId, "06")) {
+//            llDesign.setVisibility(View.VISIBLE);
         }
     }
 
@@ -335,7 +337,6 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
         param.put("attachments", uploadImg);
         RtfUtils.getMesRtf().summaryAdd("1", "1", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
 
-
             @Override
             public void doOnSubscribe(Disposable d) {
             }

app/src/main/res/layout/activity_mes_quality_detail.xml

@@ -11,17 +11,16 @@
         android:layout_alignParentBottom="true"
         android:background="@color/white"
         android:gravity="center"
-        android:visibility="gone"
         android:paddingVertical="10mm">
 
         <Button
-            android:visibility="gone"
             android:id="@+id/btn_refuse"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@drawable/shape_red_circle"
             android:paddingHorizontal="40mm"
             android:text="驳回"
+            android:visibility="gone"
             android:textColor="@color/white" />
 
         <Button

app/src/main/res/layout/activity_mes_ticket_summary_add.xml

@@ -9,6 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
+
         <RelativeLayout
             android:id="@+id/rl_finish"
             android:layout_width="match_parent"

app/src/main/res/menu/menu_finish_save.xml

+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/save"
+        android:title="暂存"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/finish"
+        android:title="完成"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file