Skip to content

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

1.修改订单详情显示bug，修改组装坩埚变更 

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 1b2ddf5c
显示空白字符变更
内嵌 并排
正在显示 包含 73 行增加 和 114 行删除
app/src/main/java/com/wd/workoffice/bean/ProAddBean.java
浏览文件 @ ce65f23e
...@@ -126,6 +126,15 @@ public class ProAddBean { ...@@ -126,6 +126,15 @@ public class ProAddBean {
private String carPrice; private String carPrice;
private String spec; private String spec;
private double quantity; private double quantity;
private double internalPrice ;
public double getInternalPrice() {
return internalPrice;
}
public void setInternalPrice(double internalPrice) {
this.internalPrice = internalPrice;
}
public double getQuantity() { public double getQuantity() {
return quantity; return quantity;
......
app/src/main/java/com/wd/workoffice/bean/ProductBean.java
浏览文件 @ ce65f23e
...@@ -4,15 +4,6 @@ import java.util.List; ...@@ -4,15 +4,6 @@ import java.util.List;
public class ProductBean { public class ProductBean {
/**
* code : 0
* message : null
* data : {"records":[{"createdBy":111,"createdByName":null,"createdTime":"2019-10-30 17:42:02","updatedBy":111,"updatedByName":null,"updatedTime":"2020-02-24 09:46:45","id":29,"soleCode":"70BHZBHZ1-1001","simpleCode":"BHZ1-1","name":"保护渣","spec":"165*320（Q195）","unit":"支","weight":1000,"internalPrice":105.9,"processType":"PROCESS_SALE,PROCESS_CRUCIBLE,PROCESS_SUPPLY","processTypeList":null,"productTypeId":5,"ofKind":"SM","expectOutputDeptId":118,"erpId":"AG10086","status":"1","createdUser":null,"shelfAction":null,"updatedUser":null,"outDeptId":null,"outDeptName":null,"productTypeName":null,"expectOutputDeptName":null,"isExpectOut":null,"ofKindName":null,"statusName":null,"relList":null,"outDeptCreatedBy":null,"outDeptCreatedTime":null,"transitPartId":null,"transitPartTypeCode":null,"remark":null},{"createdBy":143,"createdByName":null,"createdTime":"2019-12-30 16:04:46","updatedBy":143,"updatedByName":null,"updatedTime":"2019-12-31 13:41:43","id":33,"soleCode":"白刚玉","simpleCode":"白刚玉","name":"白刚玉","spec":"80#","unit":"吨","weight":2,"internalPrice":100,"processType":"PROCESS_PURCHASE,PROCESS_SALE,PROCESS_SUPPLY,PROCESS_CRUCIBLE","processTypeList":null,"productTypeId":3,"ofKind":"OS","expectOutputDeptId":129,"erpId":"白刚玉","status":"1","createdUser":null,"shelfAction":null,"updatedUser":null,"outDeptId":null,"outDeptName":null,"productTypeName":null,"expectOutputDeptName":null,"isExpectOut":null,"ofKindName":null,"statusName":null,"relList":null,"outDeptCreatedBy":null,"outDeptCreatedTime":null,"transitPartId":null,"transitPartTypeCode":null,"remark":null}],"total":2,"size":10,"current":1,"orders":[],"searchCount":true,"pages":1}
* httpStatus : 0
* path : null
* ext : null
*/
/** /**
* records : [{"createdBy":111,"createdByName":null,"createdTime":"2019-10-30 17:42:02","updatedBy":111,"updatedByName":null,"updatedTime":"2020-02-24 09:46:45","id":29,"soleCode":"70BHZBHZ1-1001","simpleCode":"BHZ1-1","name":"保护渣","spec":"165*320（Q195）","unit":"支","weight":1000,"internalPrice":105.9,"processType":"PROCESS_SALE,PROCESS_CRUCIBLE,PROCESS_SUPPLY","processTypeList":null,"productTypeId":5,"ofKind":"SM","expectOutputDeptId":118,"erpId":"AG10086","status":"1","createdUser":null,"shelfAction":null,"updatedUser":null,"outDeptId":null,"outDeptName":null,"productTypeName":null,"expectOutputDeptName":null,"isExpectOut":null,"ofKindName":null,"statusName":null,"relList":null,"outDeptCreatedBy":null,"outDeptCreatedTime":null,"transitPartId":null,"transitPartTypeCode":null,"remark":null},{"createdBy":143,"createdByName":null,"createdTime":"2019-12-30 16:04:46","updatedBy":143,"updatedByName":null,"updatedTime":"2019-12-31 13:41:43","id":33,"soleCode":"白刚玉","simpleCode":"白刚玉","name":"白刚玉","spec":"80#","unit":"吨","weight":2,"internalPrice":100,"processType":"PROCESS_PURCHASE,PROCESS_SALE,PROCESS_SUPPLY,PROCESS_CRUCIBLE","processTypeList":null,"productTypeId":3,"ofKind":"OS","expectOutputDeptId":129,"erpId":"白刚玉","status":"1","createdUser":null,"shelfAction":null,"updatedUser":null,"outDeptId":null,"outDeptName":null,"productTypeName":null,"expectOutputDeptName":null,"isExpectOut":null,"ofKindName":null,"statusName":null,"relList":null,"outDeptCreatedBy":null,"outDeptCreatedTime":null,"transitPartId":null,"transitPartTypeCode":null,"remark":null}] * records : [{"createdBy":111,"createdByName":null,"createdTime":"2019-10-30 17:42:02","updatedBy":111,"updatedByName":null,"updatedTime":"2020-02-24 09:46:45","id":29,"soleCode":"70BHZBHZ1-1001","simpleCode":"BHZ1-1","name":"保护渣","spec":"165*320（Q195）","unit":"支","weight":1000,"internalPrice":105.9,"processType":"PROCESS_SALE,PROCESS_CRUCIBLE,PROCESS_SUPPLY","processTypeList":null,"productTypeId":5,"ofKind":"SM","expectOutputDeptId":118,"erpId":"AG10086","status":"1","createdUser":null,"shelfAction":null,"updatedUser":null,"outDeptId":null,"outDeptName":null,"productTypeName":null,"expectOutputDeptName":null,"isExpectOut":null,"ofKindName":null,"statusName":null,"relList":null,"outDeptCreatedBy":null,"outDeptCreatedTime":null,"transitPartId":null,"transitPartTypeCode":null,"remark":null},{"createdBy":143,"createdByName":null,"createdTime":"2019-12-30 16:04:46","updatedBy":143,"updatedByName":null,"updatedTime":"2019-12-31 13:41:43","id":33,"soleCode":"白刚玉","simpleCode":"白刚玉","name":"白刚玉","spec":"80#","unit":"吨","weight":2,"internalPrice":100,"processType":"PROCESS_PURCHASE,PROCESS_SALE,PROCESS_SUPPLY,PROCESS_CRUCIBLE","processTypeList":null,"productTypeId":3,"ofKind":"OS","expectOutputDeptId":129,"erpId":"白刚玉","status":"1","createdUser":null,"shelfAction":null,"updatedUser":null,"outDeptId":null,"outDeptName":null,"productTypeName":null,"expectOutputDeptName":null,"isExpectOut":null,"ofKindName":null,"statusName":null,"relList":null,"outDeptCreatedBy":null,"outDeptCreatedTime":null,"transitPartId":null,"transitPartTypeCode":null,"remark":null}]
* total : 2 * total : 2
...@@ -178,6 +169,15 @@ public class ProductBean { ...@@ -178,6 +169,15 @@ public class ProductBean {
private String productName; private String productName;
private double outerPrice; private double outerPrice;
private double quantity; private double quantity;
private double innerPrice;
public double getInnerPrice() {
return innerPrice;
}
public void setInnerPrice(double innerPrice) {
this.innerPrice = innerPrice;
}
public String getProductName() { public String getProductName() {
return productName; return productName;
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ ce65f23e
...@@ -114,7 +114,6 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity { ...@@ -114,7 +114,6 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
private List<OrderDetail.OrderItemsBean> proList; private List<OrderDetail.OrderItemsBean> proList;
private Integer status; private Integer status;
private String identity; private String identity;
private QMUIDialog.MenuDialogBuilder settingDialog;
private String type; private String type;
@Override @Override
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProductOrderDetailActivity.java
浏览文件 @ ce65f23e
package com.wd.workoffice.ui.activity.bat.order; package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
...@@ -17,26 +12,17 @@ import com.wd.workoffice.R; ...@@ -17,26 +12,17 @@ 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.OrderDetail;
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.adapter.OrderDetailProductAdapter;
import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
import com.wd.workoffice.ui.adapter.ProductOrderDetailProductAdapter; import com.wd.workoffice.ui.adapter.ProductOrderDetailProductAdapter;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
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 butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer; import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable; import io.reactivex.disposables.Disposable;
...@@ -49,22 +35,16 @@ import io.reactivex.disposables.Disposable; ...@@ -49,22 +35,16 @@ import io.reactivex.disposables.Disposable;
public class ProductOrderDetailActivity extends WorkToolBarActivity { public class ProductOrderDetailActivity extends WorkToolBarActivity {
@BindView(R.id.ll_bottom) @BindView(R.id.ll_bottom)
LinearLayout llBottom; LinearLayout llBottom;
@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_order_no) @BindView(R.id.tv_order_no)
TextView tvOrderNo; TextView tvOrderNo;
@BindView(R.id.tv_stock)
TextView tvStock;
@BindView(R.id.tv_place_name)
TextView tvPlaceName;
@BindView(R.id.tv_dep)
TextView tvDep;
@BindView(R.id.tv_time) @BindView(R.id.tv_time)
TextView tvTime; TextView tvTime;
@BindView(R.id.tv_send_time)
TextView tvSendTime;
@BindView(R.id.tv_order_price) @BindView(R.id.tv_order_price)
TextView tvOrderPrice; TextView tvOrderPrice;
@BindView(R.id.ll_sale) @BindView(R.id.ll_sale)
...@@ -83,11 +63,6 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity { ...@@ -83,11 +63,6 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
status = Integer.valueOf(getIntent().getStringExtra("status")); status = Integer.valueOf(getIntent().getStringExtra("status"));
identity = getIntent().getStringExtra("identity"); identity = getIntent().getStringExtra("identity");
if (TextUtils.equals(identity, "1")) {//销售1
} else {
rlDep.setVisibility(View.GONE);
}
} }
@Override @Override
...@@ -121,13 +96,11 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity { ...@@ -121,13 +96,11 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class); dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
proList.addAll(dataBean.getOrderItems()); proList.addAll(dataBean.getOrderItems());
proAdapter.notifyDataSetChanged(); proAdapter.notifyDataSetChanged();
tvName.setText(dataBean.getCustomerName()); tvStock.setText(dataBean.getExpandInfo().getOuterStoreName());
tvDep.setText(dataBean.getReceiveDeptName()); tvDep.setText(dataBean.getLaunchDeptName());
tvPlaceName.setText(dataBean.getLaunchUserName()); tvPlaceName.setText(dataBean.getLaunchUserName());
tvCompany.setText(dataBean.getLaunchDeptName());
tvOrderNo.setText(dataBean.getId()); tvOrderNo.setText(dataBean.getId());
tvTime.setText(dataBean.getCreatedTime()); tvTime.setText(dataBean.getCreatedTime());
tvSendTime.setText(dataBean.getRequireTime());
tvOrderPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount())); tvOrderPrice.setText(String.valueOf(dataBean.getLaunchOrderAmount()));
} }
...@@ -167,9 +140,9 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity { ...@@ -167,9 +140,9 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
"identity", identity, "identity", identity,
"status", dataBean.getStatus() + "", "status", dataBean.getStatus() + "",
"num", proList.get(position).getCanUseProductSum() + "", "num", proList.get(position).getCanUseProductSum() + "",
"enterStockType",dataBean.getEnterStockType(), "enterStockType", dataBean.getEnterStockType(),
"returnNum",TextUtils.equals(dataBean.getEnterStockType(),"1")? "returnNum", TextUtils.equals(dataBean.getEnterStockType(), "1") ?
proList.get(position).getCanOutReturnSum(): proList.get(position).getCanUsedReturnSum(), proList.get(position).getCanOutReturnSum() : proList.get(position).getCanUsedReturnSum(),
"product", proList.get(position).getProductName(), "product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(), "simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"), "orderId", getIntent().getStringExtra("id"),
......
app/src/main/java/com/wd/workoffice/ui/adapter/CruibleOrderDetailProductAdapter.java
浏览文件 @ ce65f23e
...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -30,10 +31,11 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta ...@@ -30,10 +31,11 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
helper.setText(R.id.tv_card_name, item.getProductSimpleCode()); helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec()); helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice()))); 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_all_price, "￥".concat(MathUtils.multiply(String.valueOf(item.getProductCount()),String.valueOf(item.getInnerPrice()),3)));
helper.setText(R.id.tv_unit, item.getProductUnit()); helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType())); helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, String.valueOf(item.getProductCount())); helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
helper.setVisible(R.id.ll_from,false);
helper.addOnClickListener(R.id.tv_get); helper.addOnClickListener(R.id.tv_get);
helper.addOnClickListener(R.id.tv_return); helper.addOnClickListener(R.id.tv_return);
helper.addOnClickListener(R.id.tv_flow); helper.addOnClickListener(R.id.tv_flow);
...@@ -48,13 +50,15 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta ...@@ -48,13 +50,15 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
break; break;
case 300: case 300:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.tv_add, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.tv_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
helper.setGone(R.id.tv_quality, false); helper.setGone(R.id.tv_quality, false);
helper.setGone(R.id.tv_quality, false);
break; break;
case 400: case 400:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_add, false);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.tv_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
...@@ -62,6 +66,7 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta ...@@ -62,6 +66,7 @@ public class CruibleOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
break; break;
case 500: case 500:
helper.setGone(R.id.ll_btn, true); helper.setGone(R.id.ll_btn, true);
helper.setGone(R.id.tv_add, false);
helper.setGone(R.id.tv_get, false); helper.setGone(R.id.tv_get, false);
helper.setGone(R.id.tv_return, false); helper.setGone(R.id.tv_return, false);
helper.setGone(R.id.tv_flow, false); helper.setGone(R.id.tv_flow, false);
......
app/src/main/java/com/wd/workoffice/ui/adapter/InsideOrderDetailProductAdapter.java
浏览文件 @ ce65f23e
...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -30,10 +31,11 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai ...@@ -30,10 +31,11 @@ public class InsideOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetai
helper.setText(R.id.tv_card_name, item.getProductSimpleCode()); helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec()); helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice()))); 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_all_price, "￥".concat(MathUtils.multiply(String.valueOf(item.getProductCount()),String.valueOf(item.getInnerPrice()),3)));
helper.setText(R.id.tv_unit, item.getProductUnit()); helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType())); helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, String.valueOf(item.getProductCount())); helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
helper.setGone(R.id.ll_from,false);
helper.addOnClickListener(R.id.tv_get); helper.addOnClickListener(R.id.tv_get);
helper.addOnClickListener(R.id.tv_return); helper.addOnClickListener(R.id.tv_return);
helper.addOnClickListener(R.id.tv_flow); helper.addOnClickListener(R.id.tv_flow);
......
app/src/main/java/com/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java
浏览文件 @ ce65f23e
...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -37,7 +38,7 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde ...@@ -37,7 +38,7 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
helper.setText(R.id.tv_card_name, item.getProductSimpleCode()); helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec()); helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice()))); 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_all_price, "￥".concat(MathUtils.multiply(String.valueOf(item.getProductCount()),String.valueOf(item.getInnerPrice()),3)));
helper.setText(R.id.tv_unit, item.getProductUnit()); helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType())); helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, String.valueOf(item.getProductCount())); helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
......
app/src/main/java/com/wd/workoffice/ui/adapter/OutOrderDetailProductAdapter.java
浏览文件 @ ce65f23e
...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -30,7 +31,7 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O ...@@ -30,7 +31,7 @@ public class OutOrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.O
helper.setText(R.id.tv_card_name, item.getProductSimpleCode()); helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec()); helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice()))); 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_all_price, "￥".concat(MathUtils.multiply(String.valueOf(item.getProductCount()),String.valueOf(item.getInnerPrice()),3)));
helper.setText(R.id.tv_unit, item.getProductUnit()); helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType())); helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, String.valueOf(item.getProductCount())); helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
......
app/src/main/java/com/wd/workoffice/ui/adapter/ProApplyDetailAdapter.java
浏览文件 @ ce65f23e
...@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProAddBean; import com.wd.workoffice.bean.ProAddBean;
import com.wd.workoffice.util.MathUtils;
import java.util.List; import java.util.List;
...@@ -25,8 +26,8 @@ public class ProApplyDetailAdapter extends BaseQuickAdapter<ProAddBean.RecordsBe ...@@ -25,8 +26,8 @@ public class ProApplyDetailAdapter extends BaseQuickAdapter<ProAddBean.RecordsBe
protected void convert(BaseViewHolder helper, ProAddBean.RecordsBean item) { protected void convert(BaseViewHolder helper, ProAddBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getProductName()); helper.setText(R.id.tv_name, item.getProductName());
helper.setText(R.id.tv_spec, item.getSpec()); helper.setText(R.id.tv_spec, item.getSpec());
helper.setText(R.id.tv_in_price, String.valueOf(item.getInnerPrice())); helper.setText(R.id.tv_in_price, MathUtils.converData(String.valueOf(item.getInternalPrice()),3));
helper.setText(R.id.tv_num, item.getQuantity() + ""); helper.setText(R.id.tv_num, MathUtils.converData(String.valueOf(item.getQuantity()),3) );
} }
} }
app/src/main/java/com/wd/workoffice/ui/adapter/ProApplyTargetAddAdapter.java
浏览文件 @ ce65f23e
...@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; ...@@ -5,6 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder; import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.ProductBean; import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.util.MathUtils;
import java.util.List; import java.util.List;
...@@ -24,10 +25,10 @@ public class ProApplyTargetAddAdapter extends BaseQuickAdapter<ProductBean.Recor ...@@ -24,10 +25,10 @@ public class ProApplyTargetAddAdapter extends BaseQuickAdapter<ProductBean.Recor
@Override @Override
protected void convert(BaseViewHolder helper, ProductBean.RecordsBean item) { protected void convert(BaseViewHolder helper, ProductBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getProductName()); helper.setText(R.id.tv_name, item.getProductName());
helper.setText(R.id.tv_in_price, String.valueOf(item.getInternalPrice())); helper.setText(R.id.tv_in_price, MathUtils.converData(String.valueOf(item.getOuterPrice()),3));
helper.setText(R.id.tv_spec, item.getSpec()); helper.setText(R.id.tv_spec, item.getSpec());
helper.setText(R.id.tv_num, item.getQuantity() + ""); helper.setText(R.id.tv_num, MathUtils.converData(String.valueOf(item.getQuantity()),3) );
helper.setText(R.id.tv_price, String.valueOf(item.getOuterPrice())); helper.setText(R.id.tv_price, MathUtils.converData(String.valueOf(item.getInnerPrice()),3));
helper.setVisible(R.id.iv_cart, false); helper.setVisible(R.id.iv_cart, false);
} }
} }
......
app/src/main/java/com/wd/workoffice/ui/adapter/ProductOrderDetailProductAdapter.java
浏览文件 @ ce65f23e
...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -29,11 +30,13 @@ public class ProductOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta ...@@ -29,11 +30,13 @@ public class ProductOrderDetailProductAdapter extends BaseQuickAdapter<OrderDeta
helper.setText(R.id.tv_card, item.getProductSoleCode()); helper.setText(R.id.tv_card, item.getProductSoleCode());
helper.setText(R.id.tv_card_name, item.getProductSimpleCode()); helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec()); helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice()))); helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getOuterPrice())));
helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice()))); helper.setText(R.id.tv_all_price, "￥".concat(MathUtils.multiply(String.valueOf(item.getProductCount()),String.valueOf(item.getOuterPrice()),3)));
helper.setText(R.id.tv_unit, item.getProductUnit()); helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType())); helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, String.valueOf(item.getProductCount())); helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
helper.setGone(R.id.ll_from,false);
helper.setGone(R.id.ll_annex,false);
helper.addOnClickListener(R.id.tv_get); helper.addOnClickListener(R.id.tv_get);
helper.addOnClickListener(R.id.tv_return); helper.addOnClickListener(R.id.tv_return);
helper.addOnClickListener(R.id.tv_flow); helper.addOnClickListener(R.id.tv_flow);
......
app/src/main/java/com/wd/workoffice/ui/adapter/SupplierOrderDetailProductAdapter.java
浏览文件 @ ce65f23e
...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder; ...@@ -6,6 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.bean.OrderDetail; import com.wd.workoffice.bean.OrderDetail;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.List; import java.util.List;
...@@ -30,7 +31,8 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet ...@@ -30,7 +31,8 @@ public class SupplierOrderDetailProductAdapter extends BaseQuickAdapter<OrderDet
helper.setText(R.id.tv_card_name, item.getProductSimpleCode()); helper.setText(R.id.tv_card_name, item.getProductSimpleCode());
helper.setText(R.id.tv_spec, item.getProductSpec()); helper.setText(R.id.tv_spec, item.getProductSpec());
helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice()))); 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_all_price, "￥".concat(MathUtils.multiply(String.valueOf(item.getProductCount()),String.valueOf(item.getInnerPrice()),3)));
helper.setText(R.id.tv_unit, item.getProductUnit()); helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType())); helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
helper.setText(R.id.tv_num, String.valueOf(item.getProductCount())); helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
......
app/src/main/java/com/wd/workoffice/ui/fg/CrucibleOrderSaleFragment.java
浏览文件 @ ce65f23e
...@@ -18,7 +18,7 @@ import butterknife.BindView; ...@@ -18,7 +18,7 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
/** /**
* 销售 - 供应订单 * 坩埚销售订单
* author : flexible * author : flexible
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
......
app/src/main/java/com/wd/workoffice/ui/fg/ProductOrderApplyFragment.java
浏览文件 @ ce65f23e
...@@ -20,7 +20,7 @@ import butterknife.BindView; ...@@ -20,7 +20,7 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
/** /**
* 销售 - 供应订单 *组装订单 - 组装申请
* author : flexible * author : flexible
* email : lgd19940421@163.com * email : lgd19940421@163.com
* github: https://github.com/FlexibleXd * github: https://github.com/FlexibleXd
......
app/src/main/res/layout/activity_product_order.xml
浏览文件 @ ce65f23e
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
android:id="@+id/ll_bottom" android:id="@+id/ll_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60mm" android:layout_height="60mm"
android:visibility="gone"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:gravity="center_vertical|right" android:gravity="center_vertical|right"
android:orientation="horizontal"> android:orientation="horizontal"
android:visibility="gone">
</LinearLayout> </LinearLayout>
...@@ -51,31 +51,18 @@ ...@@ -51,31 +51,18 @@
android:id="@+id/ll_sale" android:id="@+id/ll_sale"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white" android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:paddingHorizontal="20mm"> android:paddingHorizontal="20mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5mm"
android:text="邢台德龙钢铁客户"
android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="14mm"
android:background="#FCFCFD" android:background="#FCFCFD"
android:orientation="vertical" android:orientation="vertical"
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">
...@@ -85,12 +72,12 @@ ...@@ -85,12 +72,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="10mm" android:layout_marginLeft="10mm"
android:text="接单部门" android:text="订单编号"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
android:id="@+id/tv_dep" android:id="@+id/tv_order_no"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -111,12 +98,12 @@ ...@@ -111,12 +98,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="10mm" android:layout_marginLeft="10mm"
android:text="下单人" android:text="入库仓库"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
android:id="@+id/tv_place_name" android:id="@+id/tv_stock"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -137,12 +124,12 @@ ...@@ -137,12 +124,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="10mm" android:layout_marginLeft="10mm"
android:text="所属公司" android:text="下单人"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
android:id="@+id/tv_company" android:id="@+id/tv_place_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -152,7 +139,6 @@ ...@@ -152,7 +139,6 @@
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
<!-- 3.订单编号 -->
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -164,12 +150,12 @@ ...@@ -164,12 +150,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="10mm" android:layout_marginLeft="10mm"
android:text="订单编号" android:text="下单部门"
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
android:id="@+id/tv_order_no" android:id="@+id/tv_dep"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
...@@ -178,7 +164,7 @@ ...@@ -178,7 +164,7 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
<!-- 4.下单时间 -->
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -204,32 +190,6 @@ ...@@ -204,32 +190,6 @@
android:textColor="@color/flexible_text_gray" android:textColor="@color/flexible_text_gray"
android:textSize="13sp" /> android:textSize="13sp" />
</RelativeLayout> </RelativeLayout>
<!-- 3.要求发货时间 -->
<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:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
......
app/src/main/res/layout/item_order_product.xml
浏览文件 @ ce65f23e
...@@ -160,6 +160,7 @@ ...@@ -160,6 +160,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/ll_from"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10mm"> android:layout_marginTop="10mm">
...@@ -183,6 +184,7 @@ ...@@ -183,6 +184,7 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/ll_annex"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10mm"> android:layout_marginTop="10mm">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论