Skip to content

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

1.坩埚初版 

2.//TODO erp用户激活测试，忘记/重置密码测试，审核规则，领用申请列表/退件列表/参数，坩埚下单页面，组装下单，产品下单还差附件测试，mes，刷新token
上级 2491a337
显示空白字符变更
内嵌 并排
正在显示 包含 1029 行增加 和 5 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 366ef0c7
...@@ -1000,6 +1000,22 @@ ...@@ -1000,6 +1000,22 @@
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.ProductOrderDetailActivity"
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.CrucibleOrderDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="订单详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.bat.order.QualityApplyActivity" android:name=".ui.activity.bat.order.QualityApplyActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
......
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 366ef0c7
...@@ -1247,6 +1247,14 @@ public interface ApiService { ...@@ -1247,6 +1247,14 @@ public interface ApiService {
@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/co/applyStock/{orderItemId}")
Observable<BaseBean> addStockCoApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
/** /**
* step4_1-发起入库申请 * step4_1-发起入库申请
* *
...@@ -1277,6 +1285,15 @@ public interface ApiService { ...@@ -1277,6 +1285,15 @@ public interface ApiService {
*/ */
@POST("/enterStoreApply/fo/app/page/list") @POST("/enterStoreApply/fo/app/page/list")
Observable<BaseBean> addFoStockApplyList(@QueryMap Map<String, Object> param); Observable<BaseBean> addFoStockApplyList(@QueryMap Map<String, Object> param);
/**
* s入库申请列表
*
* @return
*/
@POST("/enterStoreApply/co/app/page/list")
Observable<BaseBean> addCoStockApplyList(@QueryMap Map<String, Object> param);
/** /**
* step4_3-入库申请列表 * step4_3-入库申请列表
* *
...@@ -1306,6 +1323,14 @@ public interface ApiService { ...@@ -1306,6 +1323,14 @@ public interface ApiService {
*/ */
@PUT("/enterStoreApply/fo/audit/{id}") @PUT("/enterStoreApply/fo/audit/{id}")
Observable<BaseBean> addFoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody); Observable<BaseBean> addFoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/**
* step4_2-入库申请审核
*
* @return
*/
@PUT("/enterStoreApply/co/audit/{id}")
Observable<BaseBean> addCoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
/** /**
* 质检申请列表 * 质检申请列表
* *
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddStockApplyAddActivity.java
浏览文件 @ 366ef0c7
...@@ -118,6 +118,8 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity { ...@@ -118,6 +118,8 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().addPoStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addPoStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().addFoStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addFoStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().addStockCoApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else { } else {
observable = RtfUtils.getRtf().addStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddStockApplyDetailActivity.java
浏览文件 @ 366ef0c7
...@@ -180,6 +180,8 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity { ...@@ -180,6 +180,8 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().addPoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addPoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else { } else {
observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java 0 → 100644
浏览文件 @ 366ef0c7
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;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.event.CheckOrderEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.ui.adapter.SupplierOrderDetailProductAdapter;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 坩埚详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_status)
TextView tvStatus;
@BindView(R.id.tv_desc)
TextView tvDesc;
@BindView(R.id.ll_top)
RelativeLayout llTop;
@BindView(R.id.tv_refuse)
TextView tvRefuse;
@BindView(R.id.tv_agree)
TextView tvAgree;
@BindView(R.id.ll_check)
LinearLayout llCheck;
@BindView(R.id.tv_finish_apply)
TextView tvFinishApply;
@BindView(R.id.tv_send_apply)
TextView tvSendApply;
@BindView(R.id.ll_apply)
LinearLayout llApply;
@BindView(R.id.ll_bottom)
LinearLayout llBottom;
@BindView(R.id.rv_process)
RecyclerView rvProcess;
@BindView(R.id.tv_name)
TextView tvName;
@BindView(R.id.tv_dep)
TextView tvDep;
@BindView(R.id.rl_dep)
RelativeLayout rlDep;
@BindView(R.id.tv_place_name)
TextView tvPlaceName;
@BindView(R.id.tv_company)
TextView tvCompany;
@BindView(R.id.tv_stock)
TextView tvStock;
@BindView(R.id.rl_stock)
RelativeLayout rlStock;
@BindView(R.id.tv_order_no)
TextView tvOrderNo;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.tv_send_time)
TextView tvSendTime;
@BindView(R.id.tv_order_desc)
TextView tvOrderDesc;
@BindView(R.id.tv_price)
TextView tvPrice;
@BindView(R.id.rv_pro)
RecyclerView rvPro;
@BindView(R.id.tv_claim1)
TextView tvClaim1;
@BindView(R.id.tv_claim2)
TextView tvClaim2;
@BindView(R.id.tv_claim3)
TextView tvClaim3;
@BindView(R.id.tv_claim4)
TextView tvClaim4;
@BindView(R.id.tv_claim5)
TextView tvClaim5;
@BindView(R.id.tv_claim6)
TextView tvClaim6;
private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter;
private SupplierOrderDetailProductAdapter proAdapter;
private List<OrderDetail.OrderItemsBean> proList;
private Integer status;
private String identity;
private QMUIDialog.MenuDialogBuilder settingDialog;
@Override
protected void initView() {
ButterKnife.bind(this);
rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
status = Integer.valueOf(getIntent().getStringExtra("status"));
identity = getIntent().getStringExtra("identity");
String type = getIntent().getStringExtra("type");
if (TextUtils.equals(type, "1")) {//1坩埚销售 2 坩埚生产
} else {
rlDep.setVisibility(View.GONE);
rlStock.setVisibility(View.GONE);
}
// if (TextUtils.equals(identity, "1")) {//1销售 2生产
//
// } else {
// rlDep.setVisibility(View.GONE);
// }
switch (status) {
// {"待审核", "待接单", "待生产", "已入库","已交付"};
// { "100", "200", "710", "500","600"};
case 100:
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
break;
case 200:
break;
case 300:
llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE);
break;
case 410:
llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE);
break;
case 500:
llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE);
break;
case 600:
llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE);
break;
default:
llBottom.setVisibility(View.VISIBLE);
llApply.setVisibility(View.VISIBLE);
tvSendApply.setVisibility(View.GONE);
break;
}
}
@Override
protected void initData() {
getData();
flowList = new ArrayList<>();
flowAdapter = new OrderProcessAdapter(R.layout.item_order_process, flowList);
flowAdapter.bindToRecyclerView(rvProcess);
flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
proList = new ArrayList<>();
proAdapter = new SupplierOrderDetailProductAdapter(R.layout.item_order_product, proList, status);
proAdapter.bindToRecyclerView(rvPro);
proAdapter.setEmptyView(R.layout.view_empty_order, rvPro);
}
private void getData() {
RtfUtils.getRtf().supplierOrderDetail(getIntent().getStringExtra("id"), "3").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;
}
dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
flowList.addAll(dataBean.getOrderFlows());
flowAdapter.notifyDataSetChanged();
proList.addAll(dataBean.getOrderItems());
proAdapter.notifyDataSetChanged();
tvName.setText(dataBean.getSupplierName());
tvDep.setText(dataBean.getReceiveDeptName());
tvStatus.setText(dataBean.getStatusName());
tvPlaceName.setText(dataBean.getLaunchUserName());
tvCompany.setText(dataBean.getLaunchDeptName());
tvStock.setText(dataBean.getInStockName());
tvOrderNo.setText(dataBean.getId());
tvTime.setText(dataBean.getCreatedTime());
tvSendTime.setText(dataBean.getRequireTime());
tvDesc.setText(dataBean.getAttrName());
tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
tvClaim1.setText(expandInfo.getDemond4());
tvClaim2.setText(expandInfo.getDemond5());
tvClaim3.setText(expandInfo.getDemond1());
tvClaim4.setText(expandInfo.getDemond2());
tvClaim5.setText(expandInfo.getDemond3());
tvClaim6.setText(expandInfo.getComments());
tvDesc.setText(dataBean.getAttrName());
tvStatus.setText(dataBean.getStatusName());
}
});
}
@Override
protected void initEvent() {
proAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
switch (view.getId()) {
case R.id.tv_get:
startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "",
"num", proList.get(position).getCanOutStoreProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
startActivity(AddStockApplyActivity.class,
"status", dataBean.getStatus() + "",
"orderType", dataBean.getOrderType() + "",
"num", proList.get(position).getCanInStoreProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_return:
startActivity(ReturnApplyActivity.class,
"status", dataBean.getStatus() + "",
"orderType", dataBean.getOrderType() + "",
"num", proList.get(position).getStoreSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_flow:
startActivity(ProFlowActivity.class,
"status", dataBean.getStatus() + "",
"num", proList.get(position).getStoreSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"productId", proList.get(position).getProductId() + "",
"orderItemId", proList.get(position).getId(),
"info", JSON.toJSONString(proList.get(position)));
break;
case R.id.tv_quality:
startActivity(QualityApplyActivity.class,
"status", dataBean.getStatus() + "",
"num", proList.get(position).getStoreSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"productId", proList.get(position).getProductId() + "",
"orderItemId", proList.get(position).getId(),
"info", JSON.toJSONString(proList.get(position)));
break;
}
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_crucible_order;
}
@OnClick({R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_refuse:
checkDialog(2);
break;
case R.id.tv_agree:
checkDialog(1);
break;
case R.id.tv_finish_apply:
if (dataBean == null) {
toast("正在加载中，请稍后");
return;
}
startActivity(EndApplyActivity.class,
"status", getIntent().getStringExtra("status"),
"orderType", dataBean.getOrderType(),
"orderId", getIntent().getStringExtra("id"));
break;
case R.id.tv_send_apply:
startActivity(SendApplyActivity.class, "orderId", getIntent().getStringExtra("id"));
break;
}
}
private void checkDialog(int status) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
View view = LayoutInflater.from(this).inflate(R.layout.view_check_order, null);
TextView tvOk = view.findViewById(R.id.tv_ok);
TextView tvPrice = view.findViewById(R.id.tv_price);
tvPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
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(status, etRemark.getText().toString());
addCartDialog.dismiss();
}
});
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
addCartDialog.dismiss();
}
});
addCartDialog.show();
}
private void check(int status, String remark) {
Map<String, Object> dataParam = WorkUtils.simpleParam();
dataParam.put("result", status);
dataParam.put("comment", remark);
RtfUtils.getRtf().saleOrderCheck(dataBean.getId(), WorkUtils.convertMapToBody(dataParam)).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("操作成功");
llBottom.setVisibility(View.GONE);
EventBus.getDefault().post(new CheckOrderEvent());
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/SaleCruibleAdapter.java
浏览文件 @ 366ef0c7
...@@ -25,6 +25,7 @@ public class SaleCruibleAdapter extends BaseQuickAdapter<OrderBean, BaseViewHold ...@@ -25,6 +25,7 @@ public class SaleCruibleAdapter extends BaseQuickAdapter<OrderBean, BaseViewHold
helper.setText(R.id.tv_status, item.getStatusName()); helper.setText(R.id.tv_status, item.getStatusName());
helper.setText(R.id.tv_dep, item.getReceiveDeptName()); helper.setText(R.id.tv_dep, item.getReceiveDeptName());
helper.setText(R.id.tv_place_name, item.getLaunchUserName()); helper.setText(R.id.tv_place_name, item.getLaunchUserName());
helper.setText(R.id.tv_stock, item.getInStockName());
helper.setText(R.id.tv_company, item.getLaunchDeptName()); helper.setText(R.id.tv_company, item.getLaunchDeptName());
helper.setText(R.id.tv_order_no, item.getId()); helper.setText(R.id.tv_order_no, item.getId());
helper.setText(R.id.tv_time, item.getCreatedTime()); helper.setText(R.id.tv_time, item.getCreatedTime());
......
app/src/main/java/com/wd/workoffice/ui/fg/AddStockApplyFragment.java
浏览文件 @ 366ef0c7
...@@ -108,7 +108,9 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -108,7 +108,9 @@ public class AddStockApplyFragment extends WorkBaseFg {
observable = RtfUtils.getRtf().addPoStockApplyList(param); observable = RtfUtils.getRtf().addPoStockApplyList(param);
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().addFoStockApplyList(param); observable = RtfUtils.getRtf().addFoStockApplyList(param);
} else { } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().addCoStockApplyList(param);
}else {
observable = RtfUtils.getRtf().addStockApplyList(param); observable = RtfUtils.getRtf().addStockApplyList(param);
} }
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
...@@ -246,7 +248,9 @@ public class AddStockApplyFragment extends WorkBaseFg { ...@@ -246,7 +248,9 @@ public class AddStockApplyFragment extends WorkBaseFg {
observable = RtfUtils.getRtf().addPoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addPoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) { } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} else { } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
}else {
observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
} }
observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
......
app/src/main/java/com/wd/workoffice/ui/fg/CrucibleOrderBuyListFragment.java
浏览文件 @ 366ef0c7
...@@ -14,6 +14,8 @@ import com.wd.workoffice.bean.OrderBean; ...@@ -14,6 +14,8 @@ import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.event.CheckOrderEvent; import com.wd.workoffice.bean.event.CheckOrderEvent;
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.CrucibleOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkLogisticsDetailActivity; import com.wd.workoffice.ui.activity.bat.work.WorkLogisticsDetailActivity;
import com.wd.workoffice.ui.adapter.ProCruibleAdapter; import com.wd.workoffice.ui.adapter.ProCruibleAdapter;
import com.wd.workoffice.ui.adapter.SaleCruibleAdapter; import com.wd.workoffice.ui.adapter.SaleCruibleAdapter;
...@@ -141,8 +143,10 @@ public class CrucibleOrderBuyListFragment extends WorkBaseFg { ...@@ -141,8 +143,10 @@ public class CrucibleOrderBuyListFragment 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(WorkLogisticsDetailActivity.class, "info", JSON.toJSONString(dataList.get(position))); startActivity(CrucibleOrderDetailActivity.class,
} "identity",identity,
"id", dataList.get(position).getId() + "",
"status", dataList.get(position).getStatus() + ""); }
}); });
} }
......
app/src/main/java/com/wd/workoffice/ui/fg/CrucibleOrderSaleListFragment.java
浏览文件 @ 366ef0c7
...@@ -14,6 +14,7 @@ import com.wd.workoffice.bean.OrderBean; ...@@ -14,6 +14,7 @@ import com.wd.workoffice.bean.OrderBean;
import com.wd.workoffice.bean.event.CheckOrderEvent; import com.wd.workoffice.bean.event.CheckOrderEvent;
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.CrucibleOrderDetailActivity;
import com.wd.workoffice.ui.activity.bat.work.WorkLogisticsDetailActivity; import com.wd.workoffice.ui.activity.bat.work.WorkLogisticsDetailActivity;
import com.wd.workoffice.ui.adapter.SaleCruibleAdapter; import com.wd.workoffice.ui.adapter.SaleCruibleAdapter;
import com.wd.workoffice.ui.adapter.SaleProductApplyAdapter; import com.wd.workoffice.ui.adapter.SaleProductApplyAdapter;
...@@ -140,7 +141,10 @@ public class CrucibleOrderSaleListFragment extends WorkBaseFg { ...@@ -140,7 +141,10 @@ public class CrucibleOrderSaleListFragment 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(WorkLogisticsDetailActivity.class, "info", JSON.toJSONString(dataList.get(position))); startActivity(CrucibleOrderDetailActivity.class,
"identity", identity,
"id", dataList.get(position).getId() + "",
"status", dataList.get(position).getStatus() + "");
} }
}); });
} }
......
app/src/main/java/com/wd/workoffice/ui/fg/SendApplyFragment.java
浏览文件 @ 366ef0c7
...@@ -17,6 +17,7 @@ import com.wd.workoffice.app.BaseBean; ...@@ -17,6 +17,7 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.bean.SendApplyBean; import com.wd.workoffice.bean.SendApplyBean;
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.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.SendApplyDetailActivity; import com.wd.workoffice.ui.activity.bat.order.SendApplyDetailActivity;
...@@ -37,6 +38,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -37,6 +38,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;
...@@ -57,6 +59,7 @@ public class SendApplyFragment extends WorkBaseFg { ...@@ -57,6 +59,7 @@ public class SendApplyFragment extends WorkBaseFg {
private SendApplyAdapter dataAdapter; private SendApplyAdapter dataAdapter;
private List<SendApplyBean.RecordsBean> dataList; private List<SendApplyBean.RecordsBean> dataList;
private String orderId; private String orderId;
private String orderType;
@Override @Override
protected void initView() { protected void initView() {
...@@ -86,6 +89,7 @@ public class SendApplyFragment extends WorkBaseFg { ...@@ -86,6 +89,7 @@ public class SendApplyFragment extends WorkBaseFg {
if (arguments != null) { if (arguments != null) {
state = arguments.getString("state"); state = arguments.getString("state");
orderId = arguments.getString("orderId"); orderId = arguments.getString("orderId");
orderType = arguments.getString("orderType");
} }
} }
......
app/src/main/res/layout/activity_crucible_order.xml 0 → 100644
浏览文件 @ 366ef0c7
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/ll_top"
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentTop="true"
android:background="@color/blue_bg"
android:gravity="center_vertical|right"
android:orientation="horizontal"
android:paddingHorizontal="20mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true">
<ImageView
android:layout_width="18mm"
android:layout_height="18mm"
android:src="@mipmap/order_detail_bell" />
<TextView
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="拒绝"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10mm"
android:text="同意"
android:textColor="@color/white"
android:textSize="16sp" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentBottom="true"
android:gravity="center_vertical|right"
android:orientation="horizontal"
android:visibility="gone">
<LinearLayout
android:id="@+id/ll_check"
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentBottom="true"
android:gravity="center_vertical|right"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:id="@+id/tv_refuse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_red_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="拒绝"
android:textColor="@color/white" />
<TextView
android:id="@+id/tv_agree"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_green_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="同意"
android:textColor="@color/white" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_apply"
android:layout_width="match_parent"
android:layout_height="60mm"
android:layout_alignParentBottom="true"
android:gravity="center"
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:id="@+id/tv_finish_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="提前结束申请"
android:textColor="@color/white" />
<TextView
android:id="@+id/tv_send_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="发货申请"
android:textColor="@color/white" />
</LinearLayout>
</LinearLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:layout_below="@id/ll_top"
android:background="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:orientation="vertical"
android:paddingBottom="20mm">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_process"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="10mm" />
<View style="@style/ViewX" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="订单信息"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="10mm"
android:paddingTop="10mm"
android:paddingBottom="20mm"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="邢台德龙钢铁客户"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="#0841F0"
android:textSize="14sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:paddingVertical="10mm"
android:background="#FCFCFD"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_dep"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="接单部门"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="下单人"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_place_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="所属公司"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_company"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_stock"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="代管仓库"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_stock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="订单编号"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_order_no"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="下单时间"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="要求发货时间"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_send_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:gravity="right">
<TextView
android:id="@+id/tv_order_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15mm"
android:text="对方发起提前结束"
android:textColor="@color/red_btn_bg"
android:textSize="13sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="订单总价:￥"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>
<View style="@style/ViewX" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="货品信息"
android:textSize="15sp" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_pro"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<View style="@style/ViewX" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="订单要求"
android:textSize="15sp" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="18mm"
android:paddingVertical="10mm"
android:text="交提货地点:"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_claim1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:background="@drawable/shape_confirm_order"
android:paddingVertical="5mm" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="18mm"
android:paddingVertical="10mm"
android:text="运输方式及费用承担:"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_claim2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:background="@drawable/shape_confirm_order"
android:paddingVertical="10mm" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="18mm"
android:paddingVertical="10mm"
android:text="质量要求技术标准，供方对质量负责的条件和期限："
android:textSize="16sp" />
<TextView
android:id="@+id/tv_claim3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:background="@drawable/shape_confirm_order"
android:paddingVertical="10mm" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="18mm"
android:paddingVertical="10mm"
android:text="包装、唛头及发货要求："
android:textSize="16sp" />
<TextView
android:id="@+id/tv_claim4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:background="@drawable/shape_confirm_order"
android:paddingVertical="10mm" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="18mm"
android:paddingVertical="10mm"
android:text="注意事项："
android:textSize="16sp" />
<TextView
android:id="@+id/tv_claim5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:background="@drawable/shape_confirm_order"
android:paddingVertical="10mm" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="18mm"
android:paddingVertical="10mm"
android:text="备注："
android:textSize="16sp" />
<TextView
android:id="@+id/tv_claim6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:background="@drawable/shape_confirm_order"
android:paddingVertical="10mm" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论