Skip to content

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

1.修改订单详情文案描述

上级 48326a76
显示空白字符变更
内嵌 并排
正在显示 包含 171 行增加 和 10 行删除
app/src/main/java/com/wd/workoffice/bean/OrderDetail.java
浏览文件 @ 4f09981c
......@@ -922,6 +922,15 @@ public class OrderDetail {
private List<ItemFlowsBean> itemFlows;
private List<StockQuantityDetailMapsBean> stockQuantityDetailMaps;
private String chooseNum;
private double productBeyondCount;
public double getProductBeyondCount() {
return productBeyondCount;
}
public void setProductBeyondCount(double productBeyondCount) {
this.productBeyondCount = productBeyondCount;
}
public String getCanOutReturnSum() {
return canOutReturnSum;
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ 4f09981c
......@@ -12,6 +12,8 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
......@@ -21,6 +23,7 @@ import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.CruibleOrderDetailProductAdapter;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
......@@ -381,9 +384,36 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_agree:
if (status == 200) {
checkReceiveDialog(1, dataBean.getId());
} else {
if (status == 200) {
checkReceiveDialog(1, dataBean.getId());
} else {
boolean hasBeyond = false;
for (OrderDetail.OrderItemsBean orderItemsBean : proList) {
if (orderItemsBean.getProductBeyondCount() > 0d) {
hasBeyond = true;
}
}
if (hasBeyond) {
QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(CrucibleOrderDetailActivity.this);
dialog.setTitle("产品超出安全库存").setMessage("是否继续").addAction("取消", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
}
}).addAction("确定", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
checkDialog(1);
dialog.dismiss();
}
}).show();
} else {
checkDialog(1);
}
}
}
break;
case R.id.tv_finish_apply:
if (dataBean == null) {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ 4f09981c
......@@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
......@@ -391,9 +392,36 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_agree:
if (status == 200) {
checkReceiveDialog(1, dataBean.getId());
} else {
if (status == 200) {
checkReceiveDialog(1, dataBean.getId());
} else {
boolean hasBeyond = false;
for (OrderDetail.OrderItemsBean orderItemsBean : proList) {
if (orderItemsBean.getProductBeyondCount() > 0d) {
hasBeyond = true;
}
}
if (hasBeyond) {
QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(OutOrderDetailActivity.this);
dialog.setTitle("产品超出安全库存").setMessage("是否继续").addAction("取消", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
}
}).addAction("确定", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
checkDialog(1);
dialog.dismiss();
}
}).show();
} else {
checkDialog(1);
}
}
}
break;
case R.id.tv_finish_apply:
if (dataBean == null) {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ 4f09981c
......@@ -12,16 +12,21 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
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.bean.event.CheckSendEvent;
import com.wd.workoffice.bean.event.ModifyCarEvent;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.store.StoreTradingCarActivity;
import com.wd.workoffice.ui.adapter.OrderDetailProductAdapter;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
......@@ -284,7 +289,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
"status", dataBean.getStatus() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"customerId", dataBean.getCustomerId()+"",
"customerId", dataBean.getCustomerId() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
......@@ -356,7 +361,29 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
if (status == 200) {
checkReceiveDialog(1, dataBean.getId());
} else {
boolean hasBeyond = false;
for (OrderDetail.OrderItemsBean orderItemsBean : proList) {
if (orderItemsBean.getProductBeyondCount() > 0d) {
hasBeyond = true;
}
}
if (hasBeyond) {
QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(SaleOrderDetailActivity.this);
dialog.setTitle("产品超出安全库存").setMessage("是否继续").addAction("取消", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
}
}).addAction("确定", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
checkDialog(1);
dialog.dismiss();
}
}).show();
} else {
checkDialog(1);
}
}
break;
case R.id.tv_finish_apply:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ 4f09981c
......@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
......@@ -22,6 +23,7 @@ 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.DialogUtils;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils;
......@@ -350,9 +352,36 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_agree:
if (status == 200) {
checkReceiveDialog(1, dataBean.getId());
} else {
if (status == 200) {
checkReceiveDialog(1, dataBean.getId());
} else {
boolean hasBeyond = false;
for (OrderDetail.OrderItemsBean orderItemsBean : proList) {
if (orderItemsBean.getProductBeyondCount() > 0d) {
hasBeyond = true;
}
}
if (hasBeyond) {
QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(SupplierOrderDetailActivity.this);
dialog.setTitle("产品超出安全库存").setMessage("是否继续").addAction("取消", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
}
}).addAction("确定", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
checkDialog(1);
dialog.dismiss();
}
}).show();
} else {
checkDialog(1);
}
}
}
break;
case R.id.tv_finish_apply:
if (dataBean == null) {
......
app/src/main/java/com/wd/workoffice/ui/adapter/CruibleOrderDetailProductAdapter.java
浏览文件 @ 4f09981c
......@@ -45,6 +45,11 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
//// "待审核", "待接单", "待生产", "已入库","已交付"};
// "100", "200", "300", "500","600"};
case 100:
if (item.getProductBeyondCount() == 0d) {
helper.setVisible(R.id.tv_stock_desc, false);
}else{
helper.setVisible(R.id.tv_stock_desc, true);
}
break;
case 200:
break;
......
app/src/main/java/com/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java
浏览文件 @ 4f09981c
......@@ -38,12 +38,12 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
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(MathUtils.converData(item.getInnerPrice(),3)));
helper.setText(R.id.tv_all_price, "￥".concat(MathUtils.multiply(MathUtils.converData(item.getProductCount(),3),
MathUtils.converData(item.getInnerPrice(),3),3)));
helper.setText(R.id.tv_price, "￥".concat(MathUtils.converData(item.getInnerPrice(), 3)));
helper.setText(R.id.tv_all_price, "￥".concat(MathUtils.multiply(MathUtils.converData(item.getProductCount(), 3),
MathUtils.converData(item.getInnerPrice(), 3), 3)));
helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, MathUtils.converData(item.getProductCount(),3));
helper.setText(R.id.tv_num, MathUtils.converData(item.getProductCount(), 3));
helper.addOnClickListener(R.id.tv_get);
helper.addOnClickListener(R.id.tv_return);
helper.addOnClickListener(R.id.tv_flow);
......@@ -56,6 +56,11 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
// "", "100", "200", "710", "500",
// "600"};
case 100:
if (item.getProductBeyondCount() == 0d) {
helper.setVisible(R.id.tv_stock_desc, false);
}else{
helper.setVisible(R.id.tv_stock_desc, true);
}
break;
case 200:
break;
......@@ -67,7 +72,7 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
break;
case 420:
helper.setGone(R.id.ll_btn, true);
if (attr==400){
if (attr == 400) {
helper.setGone(R.id.ll_btn, false);
}
break;
......
app/src/main/java/com/wd/workoffice/ui/adapter/OutOrderDetailProductAdapter.java
浏览文件 @ 4f09981c
......@@ -43,6 +43,11 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
// "待审核", "待接单", "待生产", "已入库","已交付"};
// "100", "200", "710", "500","600"};
case 100:
if (item.getProductBeyondCount() == 0d) {
helper.setVisible(R.id.tv_stock_desc, false);
}else{
helper.setVisible(R.id.tv_stock_desc, true);
}
break;
case 200:
break;
......
app/src/main/java/com/wd/workoffice/ui/adapter/SupplierOrderDetailProductAdapter.java
浏览文件 @ 4f09981c
......@@ -46,6 +46,11 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet
// "待审核", "待接单", "待生产", "已入库","已交付"};
// "100", "200", "710", "500","600"};
case 100:
if (item.getProductBeyondCount() == 0d) {
helper.setVisible(R.id.tv_stock_desc, false);
}else{
helper.setVisible(R.id.tv_stock_desc, true);
}
break;
case 200:
break;
......
app/src/main/res/layout/item_order_product.xml
浏览文件 @ 4f09981c
......@@ -208,9 +208,25 @@
</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_stock_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:visibility="gone"
android:text="该产品超出安全库存"
android:textColor="@color/red" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_gravity="right"
android:layout_marginTop="4mm">
......@@ -227,14 +243,15 @@
android:text="0"
android:textColor="@color/flexible_text_gray" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:visibility="gone"
android:layout_marginTop="10mm">
android:layout_marginTop="10mm"
android:visibility="gone">
<TextView
android:id="@+id/tv_get"
......@@ -257,17 +274,18 @@
android:paddingVertical="5mm"
android:text="退货"
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" />
android:textColor="@color/white"
android:visibility="gone" />
<TextView
android:id="@+id/tv_add"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论