1.入库申请

2.质检红点

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

@@ -69,6 +69,15 @@ public class OrderCheckStatusBean {
             @JSONField(name = "return")
             private boolean returnX;
             private boolean used;
+            private boolean qualityInspection;
+
+            public boolean isQualityInspection() {
+                return qualityInspection;
+            }
+
+            public void setQualityInspection(boolean qualityInspection) {
+                this.qualityInspection = qualityInspection;
+            }
 
             public int getProductId() {
                 return productId;

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

 package com.wd.workoffice.ui.activity.bat.order;
 
-import android.os.Bundle;
-import android.text.Editable;
 import android.text.TextUtils;
-import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
@@ -15,9 +12,7 @@ import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
 import com.wd.workoffice.bean.AddStockBean;
-import com.wd.workoffice.bean.UseApplyBean;
 import com.wd.workoffice.bean.event.CheckAddStockEvent;
-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;
@@ -36,7 +31,7 @@ import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
- * 领用详情
+ * 入库申请详情
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -86,7 +81,11 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
         tvTime.setText(info.getCreatedTime());
         tvRemark.setText(String.valueOf(info.getApplyRemark()));
         if (TextUtils.equals(info.getStatus(), "0")) {
-            llBottom.setVisibility(View.VISIBLE);
+            if (TextUtils.equals(getIntent().getStringExtra("hasPermission"),"1")) {
+                llBottom.setVisibility(View.VISIBLE);
+            }else {
+                llBottom.setVisibility(View.GONE);
+            }
             llCheck.setVisibility(View.GONE);
         } else {
             llBottom.setVisibility(View.GONE);
@@ -136,7 +135,7 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (status!=1&&TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
+                if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString())) {
                     toast("请填写备注");
                     return;
                 }
@@ -170,7 +169,7 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
             observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
         } else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
             observable = RtfUtils.getRtf().addIoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
-        }else {
+        } else {
             observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
         }
         observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {

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

@@ -34,7 +34,7 @@ import io.reactivex.Observable;
 import io.reactivex.disposables.Disposable;
 
 /**
- * 领用详情
+ * 质检详情
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -130,8 +130,7 @@ public class QualityApplyDetailActivity extends WorkToolBarActivity {
             hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_QUALITY_AUDIT.getPermission());
         }
         if (!hasPermission) {
-            tvRefuse.setVisibility(View.GONE);
-            tvAgree.setVisibility(View.GONE);
+            llBottom.setVisibility(View.GONE);
         }
     }
 

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

@@ -20,7 +20,8 @@ import androidx.annotation.Nullable;
 
 public class AddStockSendApplyAdapter extends BaseQuickAdapter<AddStockBean.RecordsBean, BaseViewHolder> {
     int status;
-    boolean hasPermission=true;
+    boolean hasPermission = true;
+
     public AddStockSendApplyAdapter(int layoutResId, List data) {
         super(layoutResId, data);
     }
@@ -33,16 +34,20 @@ public class AddStockSendApplyAdapter extends BaseQuickAdapter<AddStockBean.Reco
     @Override
     protected void convert(BaseViewHolder helper, AddStockBean.RecordsBean item) {
         helper.setText(R.id.tv_name, item.getSerialNumber());
-        helper.setText(R.id.tv_num, MathUtils.converData(item.getProductAmount(),3));
+        helper.setText(R.id.tv_num, MathUtils.converData(item.getProductAmount(), 3));
         helper.setText(R.id.tv_box_num, String.valueOf(item.getBoxCode()));
         helper.setText(R.id.tv_time, item.getCreatedTime());
         helper.setText(R.id.tv_status, WorkUtils.getReturnStatus(Integer.valueOf(item.getStatus())));
         if (status == 0) {
-            if (hasPermission){
-                helper.setVisible(R.id.ll_btn, true);
+            if (hasPermission) {
+                helper.setGone(R.id.ll_btn, true);
                 helper.addOnClickListener(R.id.tv_agree);
                 helper.addOnClickListener(R.id.tv_refuse);
+            } else {
+                helper.setGone(R.id.ll_btn, false);
             }
+        }else {
+            helper.setGone(R.id.ll_btn, false);
         }
     }
 

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

@@ -168,7 +168,7 @@ public class AddStockApplyFragment extends WorkBaseFg {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
                 startActivity(AddStockApplyDetailActivity.class,
-                        "orderType", orderType,
+                        "orderType", orderType,"hasPermission",dataAdapter.isHasPermission()?"1":"0",
                         "info", JSON.toJSONString(dataList.get(position)));
             }
         });