Skip to content

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

1.修改数量逻辑 

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 38232a23
显示空白字符变更
内嵌 并排
正在显示 包含 175 行增加 和 9 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddStockApplyAddActivity.java
浏览文件 @ 5d81ede7
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.widget.EditText; import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON;
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.OrderDetail;
import com.wd.workoffice.bean.event.CheckAddStockEvent; import com.wd.workoffice.bean.event.CheckAddStockEvent;
import com.wd.workoffice.bean.workEnum.OrderType; 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.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
...@@ -61,11 +63,60 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity { ...@@ -61,11 +63,60 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
orderType = getIntent().getStringExtra("orderType"); orderType = getIntent().getStringExtra("orderType");
tvNum.setText(String.format("最大领用数量(%s)", getIntent().getStringExtra("num"))); // tvNum.setText(String.format("入库数量(%s)", getIntent().getStringExtra("num")));
param = new HashMap<>(); param = new HashMap<>();
param.put("productId", getIntent().getStringExtra("productId")); param.put("productId", getIntent().getStringExtra("productId"));
param.put("simpleCode", getIntent().getStringExtra("simpleCode")); param.put("simpleCode", getIntent().getStringExtra("simpleCode"));
etImgCode.setText(getIntent().getStringExtra("simpleCode")); etImgCode.setText(getIntent().getStringExtra("simpleCode"));
getNum();
}
/**
* 获取数量
*/
private void getNum() {
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().saleOrderDetail(getIntent().getStringExtra("id"),"1");
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().purchaseOrderDetail(getIntent().getStringExtra("id"),"1");
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().supplierOrderDetail(getIntent().getStringExtra("id"),"1");
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().crucibleOrderDetail(getIntent().getStringExtra("id"),"1");
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().insideOrderDetail(getIntent().getStringExtra("id"),"1");
} else {
observable = RtfUtils.getRtf().insideOrderDetail(getIntent().getStringExtra("id"),"1");
}
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;
}
OrderDetail dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
for (OrderDetail.OrderItemsBean orderItem : orderItems) {
if (TextUtils.equals(orderItem.getId(),getIntent().getStringExtra("orderItemId"))) {
tvNum.setText(String.format("入库数量(%s)", MathUtils.converData(orderItem.getCanInStoreProductSum(),3)));
}
}
}
});
} }
@Override @Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnAddActivity.java
浏览文件 @ 5d81ede7
...@@ -17,12 +17,14 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialog; ...@@ -17,12 +17,14 @@ import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
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.OrderDetail;
import com.wd.workoffice.bean.event.CheckReturnEvent; import com.wd.workoffice.bean.event.CheckReturnEvent;
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.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.util.DialogUtils; import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.UserKeeper; import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
...@@ -146,16 +148,74 @@ public class ReturnAddActivity extends WorkToolBarActivity { ...@@ -146,16 +148,74 @@ public class ReturnAddActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
String num = getIntent().getStringExtra("returnNum"); // String num = getIntent().getStringExtra("returnNum");
tvMaxNum.setText(String.format("*退货最大数量(%s)", num)); // tvMaxNum.setText(String.format("*退货最大数量(%s)", num));
param = new HashMap<>(); param = new HashMap<>();
param.put("orderId", getIntent().getStringExtra("id")); param.put("orderId", getIntent().getStringExtra("id"));
param.put("productId", getIntent().getStringExtra("productId")); param.put("productId", getIntent().getStringExtra("productId"));
param.put("orderItemId", getIntent().getStringExtra("orderItemId")); param.put("orderItemId", getIntent().getStringExtra("orderItemId"));
changeView(); changeView();
getDept(); getDept();
getNum();
} }
/**
* 获取数量
*/
private void getNum() {
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().saleOrderDetail(getIntent().getStringExtra("id"), "1");
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().purchaseOrderDetail(getIntent().getStringExtra("id"), "1");
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().supplierOrderDetail(getIntent().getStringExtra("id"), "1");
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().crucibleOrderDetail(getIntent().getStringExtra("id"), "1");
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().insideOrderDetail(getIntent().getStringExtra("id"), "1");
} else {
observable = RtfUtils.getRtf().insideOrderDetail(getIntent().getStringExtra("id"), "1");
}
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;
}
OrderDetail dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
for (OrderDetail.OrderItemsBean orderItem : orderItems) {
if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
if (TextUtils.isEmpty(enterStockType)){
tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
}else {
String returnNum = TextUtils.equals(enterStockType, "1") ?
orderItem.getCanOutReturnSum() : orderItem.getCanUsedReturnSum();
tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(returnNum, 3)));
}
}
}
}
});
}
private void getDept() { private void getDept() {
RtfUtils.getRtf().returnDept(UserKeeper.getInstance().getUserDepId()).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() { RtfUtils.getRtf().returnDept(UserKeeper.getInstance().getUserDepId()).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override @Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnDetailActivity.java
浏览文件 @ 5d81ede7
...@@ -370,6 +370,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity { ...@@ -370,6 +370,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
param.put("productAmount", info.getProductAmount()); param.put("productAmount", info.getProductAmount());
} }
param.put("auditRemark", remark); param.put("auditRemark", remark);
param.put("productAmount", info.getProductAmount());
param.put("id", id); param.put("id", id);
Observable<BaseBean> observable; Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) { if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/UseApplyAddActivity.java
浏览文件 @ 5d81ede7
...@@ -6,18 +6,22 @@ import android.text.TextWatcher; ...@@ -6,18 +6,22 @@ import android.text.TextWatcher;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON;
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.OrderDetail;
import com.wd.workoffice.bean.event.CheckUseEvent; import com.wd.workoffice.bean.event.CheckUseEvent;
import com.wd.workoffice.bean.workEnum.OrderType; 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.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import butterknife.BindView; import butterknife.BindView;
...@@ -59,12 +63,13 @@ public class UseApplyAddActivity extends WorkToolBarActivity { ...@@ -59,12 +63,13 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
@Override @Override
protected void initData() { protected void initData() {
orderType = getIntent().getStringExtra("orderType"); orderType = getIntent().getStringExtra("orderType");
tvNum.setText(String.format("最大领用数量(%s)", getIntent().getStringExtra("num"))); // tvNum.setText(String.format("最大领用数量(%s)", getIntent().getStringExtra("num")));
param = new HashMap<>(); param = new HashMap<>();
param.put("productId", getIntent().getStringExtra("productId")); param.put("productId", getIntent().getStringExtra("productId"));
param.put("orderItemId", getIntent().getStringExtra("orderItemId")); param.put("orderItemId", getIntent().getStringExtra("orderItemId"));
param.put("simpleCode", getIntent().getStringExtra("simpleCode")); param.put("simpleCode", getIntent().getStringExtra("simpleCode"));
etImgCode.setText(getIntent().getStringExtra("simpleCode")); etImgCode.setText(getIntent().getStringExtra("simpleCode"));
getNum();
} }
@Override @Override
...@@ -72,6 +77,55 @@ public class UseApplyAddActivity extends WorkToolBarActivity { ...@@ -72,6 +77,55 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
} }
/**
* 获取数量
*/
private void getNum() {
Observable<BaseBean> observable;
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
observable = RtfUtils.getRtf().saleOrderDetail(getIntent().getStringExtra("id"), "1");
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().purchaseOrderDetail(getIntent().getStringExtra("id"), "1");
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().supplierOrderDetail(getIntent().getStringExtra("id"), "1");
} else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
observable = RtfUtils.getRtf().crucibleOrderDetail(getIntent().getStringExtra("id"), "1");
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
observable = RtfUtils.getRtf().insideOrderDetail(getIntent().getStringExtra("id"), "1");
} else {
observable = RtfUtils.getRtf().insideOrderDetail(getIntent().getStringExtra("id"), "1");
}
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;
}
OrderDetail dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
for (OrderDetail.OrderItemsBean orderItem : orderItems) {
if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
tvNum.setText(String.format("最大领用数量(%s)", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
}
}
}
});
}
@Override @Override
protected int layoutId() { protected int layoutId() {
return R.layout.activity_use_apply_add; return R.layout.activity_use_apply_add;
...@@ -99,7 +153,7 @@ public class UseApplyAddActivity extends WorkToolBarActivity { ...@@ -99,7 +153,7 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
observable = RtfUtils.getRtf().useApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().useApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) { } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().usePoApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().usePoApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
}else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) { } else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
observable = RtfUtils.getRtf().useAoApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().useAoApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
} else { } else {
observable = RtfUtils.getRtf().useApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param)); observable = RtfUtils.getRtf().useApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
......
app/src/main/res/layout/activity_bat_retrun_detail.xml
浏览文件 @ 5d81ede7
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:tag="order:crucible-order:audit" android:tag="order:crucible-order:audit"
android:text="拒绝" android:text="驳回"
android:textColor="@color/white" /> android:textColor="@color/white" />
<TextView <TextView
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
android:paddingHorizontal="20mm" android:paddingHorizontal="20mm"
android:paddingVertical="5mm" android:paddingVertical="5mm"
android:tag="order:crucible-order:audit" android:tag="order:crucible-order:audit"
android:text="同意" android:text="通过"
android:textColor="@color/white" /> android:textColor="@color/white" />
</LinearLayout> </LinearLayout>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论