Skip to content

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

1.供应订单，新加领料退回，未测试

上级 dd47f531
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 326 行增加 和 1 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 0ce36597
......@@ -2327,6 +2327,30 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.order.BackActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="领料退回申请"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.order.BackAddActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="领料退回新增"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.order.BackDetailActivity"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="领料退回详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/bean/OrderDetail.java
浏览文件 @ 0ce36597
......@@ -950,7 +950,15 @@ public class OrderDetail {
private List<StockQuantityDetailMapsBean> stockQuantityDetailMaps;
private String chooseNum;
private double productBeyondCount;
private String canPickReturnProductSum;
public String getCanPickReturnProductSum() {
return canPickReturnProductSum;
}
public void setCanPickReturnProductSum(String canPickReturnProductSum) {
this.canPickReturnProductSum = canPickReturnProductSum;
}
public String getCanReturnProductSum() {
return canReturnProductSum;
......
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 0ce36597
......@@ -1452,6 +1452,14 @@ public interface ApiService {
*/
@GET("/returnApply/fo/page/list")
Observable<BaseBean> returnFoApplyList(@QueryMap Map<String, Object> param);
/**
* 领料退回
*
* @return
*/
@GET("returnApply/fo/pick-return/page/list")
Observable<BaseBean> returnPickList(@QueryMap Map<String, Object> param);
/**
* step7_6 发送订单退货申请
*
......@@ -1459,6 +1467,14 @@ public interface ApiService {
*/
@POST("/procedureStart/po/applyReturn/{id}")
Observable<BaseBean> returnPoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
* 领料退回申请
*f
* @return
*/
@POST("/procedureStart/fo/pickReturn/{id}")
Observable<BaseBean> pickReturnFoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
* step7_6 发送订单退货申请
*
......@@ -1709,6 +1725,7 @@ public interface ApiService {
*/
@PUT("/returnApply/so/audit/group/{applyId}")
Observable<BaseBean> soGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 集团审核
*
......@@ -1724,6 +1741,14 @@ public interface ApiService {
*/
@PUT("/returnApply/fo/audit/group/{applyId}")
Observable<BaseBean> foGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 集团审核
*
* @return
*/
@PUT("/returnApply/fo/pick-return/audit/group/{applyId}")
Observable<BaseBean> foGroupPickReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
/**
* 获取一个订单子表的全部流水
*
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/BackActivity.java 0 → 100644
浏览文件 @ 0ce36597
package com.wd.workoffice.ui.activity.bat.order;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.scwang.smartrefresh.layout.api.RefreshLayout;
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.ReturnApplyBean;
import com.wd.workoffice.bean.event.CheckReturnEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ReturnSendApplyAdapter;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
/**
* 领料退回
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class BackActivity extends WorkToolBarActivity {
@BindView(R.id.rv_data)
RecyclerView rvData;
@BindView(R.id.srl_refresh)
SmartRefreshLayout srlRefresh;
private Map<String, Object> param;
private List<ReturnApplyBean.RecordsBean> dataList;
private ReturnSendApplyAdapter dataAdapter;
private int page = 1;
private String orderType;
@Override
protected void initView() {
ButterKnife.bind(this);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
@Override
protected void initData() {
orderType = getIntent().getStringExtra("orderType");
dataList = new ArrayList<>();
dataAdapter = new ReturnSendApplyAdapter(R.layout.item_return_apply, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
page = 1;
param.put("current", page);
param.put("orderId", getIntent().getStringExtra("orderId"));
param.put("productId", getIntent().getStringExtra("productId"));
getData();
}
private void getData() {
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().returnPickList(param);
} else {
observable = RtfUtils.getRtf().returnPickList(param);
}
observable.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;
}
List<ReturnApplyBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), ReturnApplyBean.class).getRecords();
if (page == 1) {
srlRefresh.finishRefresh();
dataList.clear();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
dataAdapter.loadMoreComplete();
} else {
dataAdapter.loadMoreComplete();
dataList.addAll(getList);
dataAdapter.notifyDataSetChanged();
}
if (getList.size() == 0) {
dataAdapter.loadMoreEnd();
} else {
page++;
}
}
});
}
@Override
protected void initEvent() {
srlRefresh.setOnRefreshListener(new OnRefreshListener() {
@Override
public void onRefresh(@NonNull RefreshLayout refreshLayout) {
page = 1;
param.put("current", page);
getData();
}
});
dataAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() {
@Override
public void onLoadMoreRequested() {
param.put("current", page);
getData();
}
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(BackDetailActivity.class,
"info", JSON.toJSONString(dataList.get(position)),
"orderType", orderType
, "status", getIntent().getStringExtra("status")
, "id", getIntent().getStringExtra("orderId")
, "identity", getIntent().getStringExtra("identity"));
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_pro_price;
}
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(CheckReturnEvent event) {
page = 1;
param.put("current", page);
getData();
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
String orderType = getIntent().getStringExtra("orderType");
String num = getIntent().getStringExtra("num");
if (Double.valueOf(num) == 0d) {
return super.onCreateOptionsMenu(menu);
}
if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.FO_PICK_RETURN_SAVE.getPermission())) {
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(BackAddActivity.class,
"returnNum", getIntent().getStringExtra("returnNum"),
"orderType", getIntent().getStringExtra("orderType"),
"productId", getIntent().getStringExtra("productId"),
"orderItemId", getIntent().getStringExtra("orderItemId"),
"enterStockType", getIntent().getStringExtra("enterStockType"),
"deptId", getIntent().getStringExtra("deptId"),
"id", getIntent().getStringExtra("orderId"));
break;
}
return super.onOptionsItemSelected(item);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnDetailActivity.java
浏览文件 @ 0ce36597
......@@ -390,7 +390,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().poGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().poGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
observable = RtfUtils.getRtf().foGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().soReturnApply(id + "", WorkUtils.convertMapToBody(param));
}
......@@ -419,6 +419,8 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
changeView();
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
llBottom.setVisibility(View.GONE);
}else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
llBottom.setVisibility(View.GONE);
}
EventBus.getDefault().post(new CheckReturnEvent());
}
......@@ -456,6 +458,15 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
"identity", getIntent().getStringExtra("identity"),
"id", getIntent().getStringExtra("id"),
"status", getIntent().getStringExtra("status"));
}else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_DETAILS.getPermission())){
toast(R.string.permission);
return;
}
startActivity(OutOrderDetailActivity.class,
"identity", getIntent().getStringExtra("identity"),
"id", getIntent().getStringExtra("id"),
"status", getIntent().getStringExtra("status"));
}
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ 0ce36597
......@@ -334,6 +334,21 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_back:
startActivity(BackActivity.class,
"identity", identity,
"status", dataBean.getStatus() + "",
"enterStockType", dataBean.getEnterStockType(),
"deptId", dataBean.getLaunchDeptId() + "",
"returnNum", proList.get(position).getCanPickReturnProductSum(),
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"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_flow:
startActivity(ProFlowActivity.class,
"status", dataBean.getStatus() + "",
......
app/src/main/java/com/wd/workoffice/ui/adapter/SupplierOrderDetailProductAdapter.java
浏览文件 @ 0ce36597
......@@ -49,6 +49,7 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet
helper.addOnClickListener(R.id.tv_flow);
helper.addOnClickListener(R.id.tv_add);
helper.addOnClickListener(R.id.tv_quality);
helper.addOnClickListener(R.id.tv_back);
helper.setGone(R.id.fl_quality, true);
switch (status) {
// "待审核", "待接单", "待生产", "已入库","已交付"};
......@@ -91,6 +92,7 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet
if (!WorkUtils.hasPermission(PagePermissionType.FO_RETURN_LIST.getPermission())) {
helper.setGone(R.id.fl_return, false);
}
helper.setGone(R.id.fl_back, WorkUtils.hasPermission(PagePermissionType.FO_RETURN_LIST.getPermission()));
changeStats(helper, item.getProductId());
}
private void changeStats(BaseViewHolder helper, int productId) {
......
app/src/main/res/layout/item_order_product.xml
浏览文件 @ 0ce36597
......@@ -255,6 +255,32 @@
android:layout_gravity="right"
android:layout_marginTop="10mm"
android:visibility="gone">
<FrameLayout
android:id="@+id/fl_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginRight="10mm">
<TextView
android:id="@+id/tv_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="10mm"
android:paddingVertical="5mm"
android:text="领料退回"
android:textColor="@color/white" />
<View
android:id="@+id/view_back"
android:layout_width="8mm"
android:layout_height="8mm"
android:visibility="gone"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle" />
</FrameLayout>
<FrameLayout
android:id="@+id/fl_get"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论