Skip to content

W
workoffice
提交 88fa03d6 authored 作者: lgd's avatar lgd
浏览文件
操作

1.4个订单详情初版 

2.//TODO erp用户激活测试，忘记/重置密码测试，审核规则，领用申请列表/退件列表/参数，坩埚下单页面，组装下单，产品下单还差附件测试，mes，刷新token
上级 25a288b1
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 541 行增加 和 116 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 88fa03d6
...@@ -857,7 +857,7 @@ ...@@ -857,7 +857,7 @@
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.bat.order.sale.SaleOrderDetailActivity" android:name=".ui.activity.bat.order.SaleOrderDetailActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
android:label="订单详情" android:label="订单详情"
android:launchMode="singleTop" android:launchMode="singleTop"
...@@ -976,6 +976,38 @@ ...@@ -976,6 +976,38 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.order.OutOrderDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="订单详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.order.SupplierOrderDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="订单详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.order.InsideOrderDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="订单详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.order.QualityApplyActivity"
android:configChanges="keyboardHidden|orientation"
android:label="质检申请列表"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
......
app/src/main/java/com/wd/workoffice/bean/OrderDetail.java
浏览文件 @ 88fa03d6
...@@ -88,6 +88,33 @@ public class OrderDetail { ...@@ -88,6 +88,33 @@ public class OrderDetail {
private Object deptId; private Object deptId;
private List<OrderItemsBean> orderItems; private List<OrderItemsBean> orderItems;
private List<OrderFlowsBean> orderFlows; private List<OrderFlowsBean> orderFlows;
private String supplierName;
private String enterStockType;
private String inStockName;
public String getInStockName() {
return inStockName;
}
public void setInStockName(String inStockName) {
this.inStockName = inStockName;
}
public String getEnterStockType() {
return enterStockType;
}
public void setEnterStockType(String enterStockType) {
this.enterStockType = enterStockType;
}
public String getSupplierName() {
return supplierName;
}
public void setSupplierName(String supplierName) {
this.supplierName = supplierName;
}
public int getCreatedBy() { public int getCreatedBy() {
return createdBy; return createdBy;
......
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 88fa03d6
...@@ -1124,6 +1124,18 @@ public interface ApiService { ...@@ -1124,6 +1124,18 @@ public interface ApiService {
@GET("/saleOrder/oneInfo/{orderId}") @GET("/saleOrder/oneInfo/{orderId}")
Observable<BaseBean> saleOrderDetail(@Path("orderId") String orderId, @Query("type") String type); Observable<BaseBean> saleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
*
* @return
*/
@GET("/purchaseOrder/oneInfo/{orderId}")
Observable<BaseBean> purchaseOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/**
*
* @return
*/
@GET("/supplierOrder/oneInfo/{orderId}")
Observable<BaseBean> supplierOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
/** /**
* 获取发货申请分页列表 * 获取发货申请分页列表
* *
...@@ -1203,30 +1215,90 @@ public interface ApiService { ...@@ -1203,30 +1215,90 @@ public interface ApiService {
*/ */
@GET("/returnApply/so/page/list") @GET("/returnApply/so/page/list")
Observable<BaseBean> returnApplyList(@QueryMap Map<String, Object> param); Observable<BaseBean> returnApplyList(@QueryMap Map<String, Object> param);
/**
* step7_7-退货申请流水列表
*
* @return
*/
@GET("/returnApply/po/page/list")
Observable<BaseBean> returnPoApplyList(@QueryMap Map<String, Object> param);
/** /**
* step4_1-发起入库申请 * step4_1-发起入库申请
* *
* @return * @return
*/ */
@POST(" /procedureStart/so/applyStock/{orderItemId}") @POST("/procedureStart/so/applyStock/{orderItemId}")
Observable<BaseBean> addStockApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody); Observable<BaseBean> addStockApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
/**
* step4_1-发起入库申请
*
* @return
*/
@POST("/procedureStart/fo/applyStock/{orderItemId}")
Observable<BaseBean> addFoStockApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
/** /**
* /enterStoreApply/so/app/page/list * step4_1-发起入库申请
*
* @return
*/
@POST("/procedureStart/po/applyStock/{orderItemId}")
Observable<BaseBean> addPoStockApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
/**
* 入库申请列表
* *
* @return * @return
*/ */
@GET("/enterStoreApply/so/app/page/list") @GET("/enterStoreApply/so/app/page/list")
Observable<BaseBean> addStockApplyList(@QueryMap Map<String, Object> param); Observable<BaseBean> addStockApplyList(@QueryMap Map<String, Object> param);
/** /**
* /enterStoreApply/so/app/page/list * s入库申请列表
*
* @return
*/
@POST("/enterStoreApply/fo/app/page/list")
Observable<BaseBean> addFoStockApplyList(@QueryMap Map<String, Object> param);
/**
* step4_3-入库申请列表
*
* @return
*/
@GET("/enterStoreApply/po/app/page/list")
Observable<BaseBean> addPoStockApplyList(@QueryMap Map<String, Object> param);
/**
* /step4_2-入库申请审核
*
* @return
*/
@PUT("/enterStoreApply/po/audit/{id}")
Observable<BaseBean> addPoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/**
* step4_2-入库申请审核
* *
* @return * @return
*/ */
@PUT("/enterStoreApply/so/audit/{id}") @PUT("/enterStoreApply/so/audit/{id}")
Observable<BaseBean> addStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody); Observable<BaseBean> addStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/**
* step4_2-入库申请审核
*
* @return
*/
@PUT("/enterStoreApply/fo/audit/{id}")
Observable<BaseBean> addFoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/**
* 质检申请列表
*
* @return
*/
@GET("/enterStoreApply/fo/quality-inspection/page/list")
Observable<BaseBean> enterStoreApplyList(@QueryMap Map<String, Object> param);
/** /**
* 获取一个订单子表的全部流水 * 获取一个订单子表的全部流水
* *
...@@ -1266,4 +1338,12 @@ public interface ApiService { ...@@ -1266,4 +1338,12 @@ public interface ApiService {
@GET("/notice-message-item/content") @GET("/notice-message-item/content")
Observable<BaseBean> msgContent(@Query("id") String id); Observable<BaseBean> msgContent(@Query("id") String id);
/**
* 设置入库方式
*
* @return
*/
@PUT("/purchaseOrder/enter-stock-type")
Observable<BaseBean> purchaseOrderStockType(@QueryMap Map<String, Object> param);
} }
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/QualityApplyActivity.java 0 → 100644
浏览文件 @ 88fa03d6
package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import com.google.android.material.tabs.TabLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.adapter.VpDataAdapter;
import com.wd.workoffice.ui.fg.AddStockApplyFragment;
import com.wd.workoffice.ui.fg.QualityApplyFragment;
import java.util.ArrayList;
import java.util.List;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 质检
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class QualityApplyActivity extends WorkToolBarActivity {
@BindView(R.id.tl_tab)
TabLayout tlTab;
@BindView(R.id.vp_data)
ViewPager vpData;
private String tab[] = {
"待审核", "已通过", "已驳回"};
private String order[] = {
"0", "1", "2"};
@Override
protected void initView() {
ButterKnife.bind(this);
tlTab.setupWithViewPager(vpData);
tlTab.setTabMode(TabLayout.MODE_FIXED);
}
@Override
protected void initData() {
FragmentManager sfm = getSupportFragmentManager();
List<Fragment> data = new ArrayList<>();
for (int i = 0; i < tab.length; i++) {
QualityApplyFragment saleFragment = new QualityApplyFragment();
Bundle bundle = new Bundle();
bundle.putString("state", order[i]);
bundle.putString("orderId", getIntent().getStringExtra("orderId"));
bundle.putString("orderType", getIntent().getStringExtra("orderType"));
bundle.putString("productId", getIntent().getStringExtra("productId"));
bundle.putString("num", getIntent().getStringExtra("num"));
saleFragment.setArguments(bundle);
data.add(saleFragment);
}
VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
vpData.setAdapter(vpFgAdapter);
for (int i = 0; i < tab.length; i++) {
tlTab.getTabAt(i).setText(tab[i]);
}
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_order;
}
// @Override
// public boolean onCreateOptionsMenu(Menu menu) {
// if (TextUtils.equals(getIntent().getStringExtra("status"), "300")) {
// getMenuInflater().inflate(R.menu.menu_add, menu);
// }
// return super.onCreateOptionsMenu(menu);
// }
//
// @Override
// public boolean onOptionsItemSelected(MenuItem item) {
// switch (item.getItemId()) {
// case R.id.add:
// startActivity(AddStockApplyAddActivity.class,
// "num", getIntent().getStringExtra("num"),
// "orderType",getIntent().getStringExtra("orderType"),
// "productId", getIntent().getStringExtra("productId"),
// "orderItemId", getIntent().getStringExtra("orderItemId"),
// "simpleCode", getIntent().getStringExtra("simpleCode"),
// "id", getIntent().getStringExtra("orderId"));
// break;
// }
// return super.onOptionsItemSelected(item);
// }
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnApplyActivity.java
浏览文件 @ 88fa03d6
package com.wd.workoffice.ui.activity.bat.order; package com.wd.workoffice.ui.activity.bat.order;
import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.EditText;
import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
...@@ -18,11 +11,10 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshListener; ...@@ -18,11 +11,10 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.EndApplyBean;
import com.wd.workoffice.bean.ReturnApplyBean; import com.wd.workoffice.bean.ReturnApplyBean;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.EndApplyAdapter;
import com.wd.workoffice.ui.adapter.RetrunSendApplyAdapter; import com.wd.workoffice.ui.adapter.RetrunSendApplyAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -31,16 +23,16 @@ import java.util.List; ...@@ -31,16 +23,16 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
/** /**
* 提前结束 * 退货
* author : flexible * author : flexible
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
...@@ -55,6 +47,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity { ...@@ -55,6 +47,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
private List<ReturnApplyBean.RecordsBean> dataList; private List<ReturnApplyBean.RecordsBean> dataList;
private RetrunSendApplyAdapter dataAdapter; private RetrunSendApplyAdapter dataAdapter;
private int page = 1; private int page = 1;
private String orderType;
@Override @Override
protected void initView() { protected void initView() {
...@@ -65,6 +58,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity { ...@@ -65,6 +58,7 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
orderType = getIntent().getStringExtra("orderType");
dataList = new ArrayList<>(); dataList = new ArrayList<>();
dataAdapter = new RetrunSendApplyAdapter(R.layout.item_return_apply, dataList); dataAdapter = new RetrunSendApplyAdapter(R.layout.item_return_apply, dataList);
dataAdapter.bindToRecyclerView(rvData); dataAdapter.bindToRecyclerView(rvData);
...@@ -78,7 +72,15 @@ public class ReturnApplyActivity extends WorkToolBarActivity { ...@@ -78,7 +72,15 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
} }
private void getData() { private void getData() {
RtfUtils.getRtf().returnApplyList(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().returnApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().returnPoApplyList(param);
} else {
observable = RtfUtils.getRtf().returnApplyList(param);
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
...@@ -138,7 +140,8 @@ public class ReturnApplyActivity extends WorkToolBarActivity { ...@@ -138,7 +140,8 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(EndApplyDetailActivity.class, "info", JSON.toJSONString(dataList.get(position))); startActivity(EndApplyDetailActivity.class,
"info", JSON.toJSONString(dataList.get(position)));
} }
}); });
} }
...@@ -148,100 +151,4 @@ public class ReturnApplyActivity extends WorkToolBarActivity { ...@@ -148,100 +151,4 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
return R.layout.activity_pro_price; return R.layout.activity_pro_price;
} }
// @Override
// public boolean onCreateOptionsMenu(Menu menu) {
// if (TextUtils.equals("status", getIntent().getStringExtra("300"))) {
// getMenuInflater().inflate(R.menu.menu_add, menu);
// }
// return super.onCreateOptionsMenu(menu);
// }
//
// @Override
// public boolean onOptionsItemSelected(MenuItem item) {
// switch (item.getItemId()) {
// case R.id.add:
// checkDialog();
// break;
// }
// return super.onOptionsItemSelected(item);
// }
// private void checkDialog() {
// AlertDialog.Builder builder = new AlertDialog.Builder(this);
// View view = LayoutInflater.from(this).inflate(R.layout.view_check, null);
// TextView tvOk = view.findViewById(R.id.tv_ok);
// TextView tvDesc = view.findViewById(R.id.tv_desc);
// tvDesc.setText("提前申请结束");
// TextView tvNum = view.findViewById(R.id.tv_num);
// TextView tvCancel = view.findViewById(R.id.tv_cancel);
// EditText etRemark = view.findViewById(R.id.et_content);
// etRemark.addTextChangedListener(new TextWatcher() {
// @Override
// public void beforeTextChanged(CharSequence s, int start, int count, int after) {
//
// }
//
// @Override
// public void onTextChanged(CharSequence s, int start, int before, int count) {
//
// }
//
// @Override
// public void afterTextChanged(Editable s) {
// tvNum.setText(s.length() + "/140");
// }
// });
// builder.setView(view);
// AlertDialog addCartDialog = builder.create();
// tvOk.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// if (TextUtils.isEmpty(etRemark.getText().toString())) {
// toast("请填写原因");
// return;
// }
// check(etRemark.getText().toString());
// addCartDialog.dismiss();
// }
// });
// tvCancel.setOnClickListener(new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// addCartDialog.dismiss();
// }
// });
// addCartDialog.show();
// }
//
//
// private void check(String remark) {
// Map<String, Object> param = WorkUtils.simpleParam();
// param.put("orderType", getIntent().getStringExtra("orderType"));
// param.put("applyRemark", remark);
// param.put("orderId", getIntent().getStringExtra("orderId"));
// RtfUtils.getRtf().endApply(getIntent().getStringExtra("orderId"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
// @Override
// public void doOnSubscribe(Disposable d) {
// }
//
// @Override
// public void onFail(String errorMsg) {
// hideLoading();
// toast(errorMsg);
// }
//
// @Override
// public void onSuccess(BaseBean data) {
// hideLoading();
// if (data.getCode() != 0) {
// toast(data.getMessage());
// return;
// }
// toast("操作成功");
// getData();
// }
// });
// }
} }
app/src/main/java/com/wd/workoffice/ui/adapter/InsideOrderDetailProductAdapter.java 0 → 100644
浏览文件 @ 88fa03d6
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBean, BaseViewHolder> {
int status;
public InsideOrderDetailProductAdapter(int layoutResId, List data, Integer status) {
super(layoutResId, data);
this.status = status;
}
@Override
protected void convert(BaseViewHolder helper, OrderDetail.OrderItemsBean item) {
helper.setText(R.id.tv_name, item.getProductName());
helper.setText(R.id.tv_card, item.getProductSoleCode());
helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
helper.addOnClickListener(R.id.tv_get);
helper.addOnClickListener(R.id.tv_return);
helper.addOnClickListener(R.id.tv_flow);
helper.addOnClickListener(R.id.tv_add);
helper.addOnClickListener(R.id.tv_quality);
helper.setGone(R.id.tv_quality, true);
switch (status) {
// "待审核", "待接单", "待生产", "已入库","已交付"};
// "100", "200", "710", "500","600"};
case 100:
break;
case 200:
break;
case 300:
break;
case 400:
break;
case 500:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
helper.setGone(R.id.tv_flow, false);
break;
case 600:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_return, false);
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/OutOrderDetailProductAdapter.java 0 → 100644
浏览文件 @ 88fa03d6
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBean, BaseViewHolder> {
int status;
public OutOrderDetailProductAdapter(int layoutResId, List data, Integer status) {
super(layoutResId, data);
this.status = status;
}
@Override
protected void convert(BaseViewHolder helper, OrderDetail.OrderItemsBean item) {
helper.setText(R.id.tv_name, item.getProductName());
helper.setText(R.id.tv_card, item.getProductSoleCode());
helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
helper.addOnClickListener(R.id.tv_get);
helper.addOnClickListener(R.id.tv_return);
helper.addOnClickListener(R.id.tv_flow);
helper.addOnClickListener(R.id.tv_add);
switch (status) {
// "待审核", "待接单", "待生产", "已入库","已交付"};
// "100", "200", "710", "500","600"};
case 100:
break;
case 200:
break;
case 300:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
break;
case 400:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
break;
case 500:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
break;
case 600:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/SupplierOrderDetailProductAdapter.java 0 → 100644
浏览文件 @ 88fa03d6
package com.wd.workoffice.ui.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.util.WorkUtils;
import java.util.List;
/**
* Created by flexible on 2018/8/13.
*/
public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBean, BaseViewHolder> {
int status;
public SupplierOrderDetailProductAdapter(int layoutResId, List data, Integer status) {
super(layoutResId, data);
this.status = status;
}
@Override
protected void convert(BaseViewHolder helper, OrderDetail.OrderItemsBean item) {
helper.setText(R.id.tv_name, item.getProductName());
helper.setText(R.id.tv_card, item.getProductSoleCode());
helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
helper.addOnClickListener(R.id.tv_get);
helper.addOnClickListener(R.id.tv_return);
helper.addOnClickListener(R.id.tv_flow);
helper.addOnClickListener(R.id.tv_add);
helper.addOnClickListener(R.id.tv_quality);
helper.setGone(R.id.tv_quality, true);
switch (status) {
// "待审核", "待接单", "待生产", "已入库","已交付"};
// "100", "200", "710", "500","600"};
case 100:
break;
case 200:
break;
case 300:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
break;
case 400:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
break;
case 500:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false);
break;
case 600:
helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false);
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/fg/AddStockApplyFragment.java
浏览文件 @ 88fa03d6
...@@ -19,6 +19,8 @@ import com.wd.workoffice.bean.AddStockBean; ...@@ -19,6 +19,8 @@ import com.wd.workoffice.bean.AddStockBean;
import com.wd.workoffice.bean.SendApplyBean; import com.wd.workoffice.bean.SendApplyBean;
import com.wd.workoffice.bean.event.CheckAddStockEvent; import com.wd.workoffice.bean.event.CheckAddStockEvent;
import com.wd.workoffice.bean.event.CheckSendEvent; import com.wd.workoffice.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PermissionType;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver; import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.order.AddStockApplyDetailActivity; import com.wd.workoffice.ui.activity.bat.order.AddStockApplyDetailActivity;
...@@ -40,6 +42,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -40,6 +42,7 @@ import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
...@@ -61,6 +64,7 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -61,6 +64,7 @@ public class AddStockApplyFragment extends WorkBaseFg {
private List<AddStockBean.RecordsBean> dataList; private List<AddStockBean.RecordsBean> dataList;
private String orderId; private String orderId;
private String productId; private String productId;
private String orderType;
@Override @Override
protected void initView() { protected void initView() {
...@@ -92,11 +96,22 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -92,11 +96,22 @@ public class AddStockApplyFragment extends WorkBaseFg {
state = arguments.getString("state"); state = arguments.getString("state");
orderId = arguments.getString("orderId"); orderId = arguments.getString("orderId");
productId = arguments.getString("productId"); productId = arguments.getString("productId");
orderType = arguments.getString("orderType");
} }
} }
private void getData() { private void getData() {
RtfUtils.getRtf().addStockApplyList(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().addStockApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().addPoStockApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().addFoStockApplyList(param);
} else {
observable = RtfUtils.getRtf().addStockApplyList(param);
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
...@@ -149,7 +164,9 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -149,7 +164,9 @@ public class AddStockApplyFragment extends WorkBaseFg {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override @Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(AddStockApplyDetailActivity.class, "info", JSON.toJSONString(dataList.get(position))); startActivity(AddStockApplyDetailActivity.class,
"orderType",orderType,
"info", JSON.toJSONString(dataList.get(position)));
} }
}); });
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
...@@ -222,7 +239,17 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -222,7 +239,17 @@ public class AddStockApplyFragment extends WorkBaseFg {
param.put("result", status); param.put("result", status);
param.put("comment", remark); param.put("comment", remark);
param.put("id", id); param.put("id", id);
RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().addPoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
}
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
public void doOnSubscribe(Disposable d) { public void doOnSubscribe(Disposable d) {
} }
......
app/src/main/java/com/wd/workoffice/ui/fg/SaleInsideFragment.java
浏览文件 @ 88fa03d6
package com.wd.workoffice.ui.fg; package com.wd.workoffice.ui.fg;
import android.os.Bundle; import android.os.Bundle;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R; import com.wd.workoffice.R;
...@@ -8,6 +9,8 @@ import com.wd.workoffice.app.WorkBaseFg; ...@@ -8,6 +9,8 @@ import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.OrderBean; import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.contract.SaleSaleContract; import com.wd.workoffice.contract.SaleSaleContract;
import com.wd.workoffice.presenter.SaleSalePresenter; import com.wd.workoffice.presenter.SaleSalePresenter;
import com.wd.workoffice.ui.activity.bat.order.InsideOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
import com.wd.workoffice.ui.adapter.SaleInsideAdapter; import com.wd.workoffice.ui.adapter.SaleInsideAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -72,6 +75,15 @@ public class SaleInsideFragment extends WorkBaseFg implements SaleSaleContract.V ...@@ -72,6 +75,15 @@ public class SaleInsideFragment extends WorkBaseFg implements SaleSaleContract.V
saleSalePresenter.getInsideOrder(param); saleSalePresenter.getInsideOrder(param);
} }
}, rvData); }, rvData);
orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(InsideOrderDetailActivity.class,
"identity",identity,
"id", orderList.get(position).getId() + "",
"status", orderList.get(position).getStatus() + "");
}
});
} }
@Override @Override
......
app/src/main/java/com/wd/workoffice/util/WorkUtils.java
浏览文件 @ 88fa03d6
...@@ -105,6 +105,22 @@ public class WorkUtils { ...@@ -105,6 +105,22 @@ public class WorkUtils {
return "场外库"; return "场外库";
} }
} }
/**
* code： "1"：中转入库
* "2"：直接入库
*
* @param code
* @return
*/
public static String getEnterStockType(String code) {
if (TextUtils.equals("1", code)) {
return "中转入库";
} else if (TextUtils.equals("2", code)) {
return "直接入库";
} else {
return "";
}
}
/** /**
* name：订单code * name：订单code
......
app/src/main/res/layout/activity_out_order.xml 0 → 100644
浏览文件 @ 88fa03d6
差异被折叠。
app/src/main/res/layout/activity_sale_order.xml
浏览文件 @ 88fa03d6
...@@ -190,6 +190,7 @@ ...@@ -190,6 +190,7 @@
android:paddingVertical="10mm"> android:paddingVertical="10mm">
<RelativeLayout <RelativeLayout
android:id="@+id/rl_dep"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="10mm"> android:paddingHorizontal="10mm">
......
app/src/main/res/layout/item_order_product.xml
浏览文件 @ 88fa03d6
...@@ -231,6 +231,7 @@ ...@@ -231,6 +231,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right" android:layout_gravity="right"
android:visibility="gone"
android:layout_marginTop="10mm"> android:layout_marginTop="10mm">
<TextView <TextView
...@@ -254,6 +255,17 @@ ...@@ -254,6 +255,17 @@
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:text="退货" android:text="退货"
android:textColor="@color/white" /> android:textColor="@color/white" />
<TextView
android:id="@+id/tv_quality"
android:layout_width="wrap_content"
android:visibility="gone"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm"
android:paddingVertical="5mm"
android:text="质检"
android:textColor="@color/white" />
<TextView <TextView
android:id="@+id/tv_add" android:id="@+id/tv_add"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论