1.上下架

2.//TODO erp用户激活，忘记密码测试，产品下单还差附件，bat，mes，消息，我的，刷新token

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

@@ -126,6 +126,7 @@ public class ProductBean {
          * transitPartId : null
          * transitPartTypeCode : null
          * remark : null
+         *
          */
 
         private int createdBy;
@@ -156,7 +157,7 @@ public class ProductBean {
         private Object outDeptName;
         private String productTypeName;
         private Object expectOutputDeptName;
-        private Object isExpectOut;
+        private int isExpectOut;
         private Object ofKindName;
         private String statusName;
         private Object relList;
@@ -425,11 +426,11 @@ public class ProductBean {
             this.expectOutputDeptName = expectOutputDeptName;
         }
 
-        public Object getIsExpectOut() {
+        public int getIsExpectOut() {
             return isExpectOut;
         }
 
-        public void setIsExpectOut(Object isExpectOut) {
+        public void setIsExpectOut(int isExpectOut) {
             this.isExpectOut = isExpectOut;
         }
 

app/src/main/java/com/wd/workoffice/model/WorkProModel.java

@@ -35,7 +35,7 @@ public class WorkProModel implements WorkProContract.Model {
         Map<String,Object> param =new HashMap<>();
         param.put("id",id);
         param.put("shelfAction",shelfAction);
-        return RtfUtils.getRtf().onSalePro(WorkUtils.convertMapToBody(param));
+        return RtfUtils.getRtf().onSalePro(param);
     }
 
     public static WorkProModel newInstance() {

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

@@ -403,8 +403,8 @@ public interface ApiService {
      * @return
      */
     @PUT("/product/app/shelf")
-    Observable<BaseBean> onSalePro(@Body RequestBody requestBody);
-
+//    Observable<BaseBean> onSalePro(@Body RequestBody requestBody);
+    Observable<BaseBean> onSalePro(@QueryMap Map<String, Object> param);
     /**
      * 下单
      * <p>

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsSearchActivity.java

 package com.wd.workoffice.ui.activity.bat.work;
 
 import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.MenuItem;
-import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.google.android.material.tabs.TabLayout;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkBaseActivity;
 import com.wd.workoffice.bean.ContactsBean;
-import com.wd.workoffice.bean.ProductBean;
 import com.wd.workoffice.contract.WorkContactsContract;
-import com.wd.workoffice.contract.WorkProContract;
 import com.wd.workoffice.presenter.WorkContactsPresenter;
-import com.wd.workoffice.presenter.WorkProPresenter;
 import com.wd.workoffice.ui.adapter.WorkContactsAdapter;
-import com.wd.workoffice.ui.adapter.WorkProductAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

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

@@ -21,12 +21,17 @@ public class WorkProductAdapter extends BaseQuickAdapter<ProductBean.RecordsBean
     @Override
     protected void convert(BaseViewHolder helper, ProductBean.RecordsBean item) {
         helper.setText(R.id.tv_name, item.getSimpleCode());
-        helper.setText(R.id.tv_card, "品号:"+item.getSoleCode());
-        helper.setText(R.id.tv_img_card, "图号:"+item.getSimpleCode());
-        helper.setText(R.id.tv_spec, "规格:"+item.getSpec());
+        helper.setText(R.id.tv_card, "品号:" + item.getSoleCode());
+        helper.setText(R.id.tv_img_card, "图号:" + item.getSimpleCode());
+        helper.setText(R.id.tv_spec, "规格:" + item.getSpec());
         helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInternalPrice())));
         helper.addOnClickListener(R.id.btn_modify);
         helper.addOnClickListener(R.id.btn_on_sale);
+        if (item.getIsExpectOut() == 0) {//未上架
+            helper.setText(R.id.btn_on_sale, "上架");
+        } else {
+            helper.setText(R.id.btn_on_sale, "下架");
+        }
     }
 }
 

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

 package com.wd.workoffice.ui.fg;
 
 import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.EditText;
-import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.ContactsBean;
-import com.wd.workoffice.bean.ProductBean;
-import com.wd.workoffice.bean.listener.ProFilterClickListener;
 import com.wd.workoffice.contract.WorkContactsContract;
-import com.wd.workoffice.contract.WorkProContract;
 import com.wd.workoffice.presenter.WorkContactsPresenter;
-import com.wd.workoffice.presenter.WorkProPresenter;
-import com.wd.workoffice.ui.activity.bat.work.WorkProDetailActivity;
 import com.wd.workoffice.ui.adapter.WorkContactsAdapter;
-import com.wd.workoffice.ui.adapter.WorkProductAdapter;
-import com.wd.workoffice.util.ProFilterData;
 import com.wd.workoffice.util.WorkUtils;
-import com.wd.workoffice.widget.DropDownMenu;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;

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

@@ -209,6 +209,15 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View
         TextView tvOk = view.findViewById(R.id.tv_ok);
         TextView tvCancel = view.findViewById(R.id.tv_cancel);
         TextView tvTitle = view.findViewById(R.id.tv_title);
+        String shelfAction;
+        if (data.getIsExpectOut() == 0) {//未上架
+            tvTitle.setText("确认上架？");
+            shelfAction="up";
+        } else {
+            tvTitle.setText( "确认下架？");
+            shelfAction="down";
+
+        }
         TextView tvPrice = view.findViewById(R.id.tv_price);
         TextView tvName = view.findViewById(R.id.tv_name);
         tvPrice.setText(String.valueOf(data.getInternalPrice()).concat("/").concat(data.getUnit()));
@@ -218,7 +227,7 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View
         tvOk.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                workProPresenter.onSale(data.getId(), "down");
+                workProPresenter.onSale(data.getId(), shelfAction);
                 addCartDialog.dismiss();
             }
         });
@@ -260,6 +269,7 @@ public class WorkProFragment extends WorkBaseFg implements WorkProContract.View
     @Override
     public void modify(String msg) {
         page = 1;
+        param.put("current", page);
         workProPresenter.getPro(param);
         toast(msg);
     }