Skip to content

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

1.退货，领料退回，发货新增 

2.TODO 单独菜单
上级 a5da043f
隐藏空白字符变更
内嵌 并排
正在显示 包含 334 行增加 和 163 行删除
app/build.gradle
浏览文件 @ f3290d3c
......@@ -6,8 +6,8 @@ android {
applicationId "com.wd.workoffice"
minSdkVersion 21
targetSdkVersion 28
versionCode 4
versionName "1.0.4"
versionCode 5
versionName "1.0.5"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders = [
JPUSH_PKGNAME: applicationId,
......
app/src/main/java/com/wd/workoffice/bean/OrderDetail.java
浏览文件 @ f3290d3c
......@@ -951,9 +951,18 @@ public class OrderDetail {
private List<StockQuantityDetailMapsBean> stockQuantityDetailMaps;
private String chooseNum;
private double productBeyondCount;
private String canPickReturnProductSum;
private String canPickReturnProductSum;
List<AddStockChooseBean.RecordsBean> backList;
String count;// backList的数量
String lot;// 产品批号
public String getLot() {
return lot;
}
public void setLot(String lot) {
this.lot = lot;
}
public String getCount() {
return count;
......
app/src/main/java/com/wd/workoffice/bean/ReturnApplyBean.java
浏览文件 @ f3290d3c
......@@ -145,6 +145,15 @@ public class ReturnApplyBean {
private Object writeOff;
private Object boxCode;
private String backStockName;
private String lot;
public String getLot() {
return lot;
}
public void setLot(String lot) {
this.lot = lot;
}
public int getCreatedBy() {
return createdBy;
......
app/src/main/java/com/wd/workoffice/bean/SendApplyDetailBean.java
浏览文件 @ f3290d3c
......@@ -9,137 +9,146 @@ import java.util.List;
**/
public class SendApplyDetailBean {
/**
* createdBy : null
* createdByName : null
* createdTime : null
* updatedBy : null
* updatedByName : null
* updatedTime : null
* id : 106
* applyId : null
* productId : null
* productAmount : 1.0
* productName : 整体塞棒
* soleCode : 70GTB214001
* simpleCode : B214
*/
private Object createdBy;
private Object createdByName;
private Object createdTime;
private Object updatedBy;
private Object updatedByName;
private Object updatedTime;
private int id;
private Object applyId;
private Object productId;
private double productAmount;
private String productName;
private String soleCode;
private String simpleCode;
public Object getCreatedBy() {
return createdBy;
}
public void setCreatedBy(Object createdBy) {
this.createdBy = createdBy;
}
public Object getCreatedByName() {
return createdByName;
}
public void setCreatedByName(Object createdByName) {
this.createdByName = createdByName;
}
public Object getCreatedTime() {
return createdTime;
}
public void setCreatedTime(Object createdTime) {
this.createdTime = createdTime;
}
public Object getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(Object updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public Object getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(Object updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public Object getApplyId() {
return applyId;
}
public void setApplyId(Object applyId) {
this.applyId = applyId;
}
public Object getProductId() {
return productId;
}
public void setProductId(Object productId) {
this.productId = productId;
}
public double getProductAmount() {
return productAmount;
}
public void setProductAmount(double productAmount) {
this.productAmount = productAmount;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getSoleCode() {
return soleCode;
}
public void setSoleCode(String soleCode) {
this.soleCode = soleCode;
}
public String getSimpleCode() {
return simpleCode;
}
/**
* createdBy : null
* createdByName : null
* createdTime : null
* updatedBy : null
* updatedByName : null
* updatedTime : null
* id : 106
* applyId : null
* productId : null
* productAmount : 1.0
* productName : 整体塞棒
* soleCode : 70GTB214001
* simpleCode : B214
*/
private Object createdBy;
private Object createdByName;
private Object createdTime;
private Object updatedBy;
private Object updatedByName;
private Object updatedTime;
private int id;
private Object applyId;
private Object productId;
private double productAmount;
private String productName;
private String soleCode;
private String simpleCode;
private String lot;
public String getLot() {
return lot;
}
public void setLot(String lot) {
this.lot = lot;
}
public Object getCreatedBy() {
return createdBy;
}
public void setCreatedBy(Object createdBy) {
this.createdBy = createdBy;
}
public Object getCreatedByName() {
return createdByName;
}
public void setCreatedByName(Object createdByName) {
this.createdByName = createdByName;
}
public Object getCreatedTime() {
return createdTime;
}
public void setCreatedTime(Object createdTime) {
this.createdTime = createdTime;
}
public Object getUpdatedBy() {
return updatedBy;
}
public void setUpdatedBy(Object updatedBy) {
this.updatedBy = updatedBy;
}
public Object getUpdatedByName() {
return updatedByName;
}
public void setUpdatedByName(Object updatedByName) {
this.updatedByName = updatedByName;
}
public Object getUpdatedTime() {
return updatedTime;
}
public void setUpdatedTime(Object updatedTime) {
this.updatedTime = updatedTime;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public Object getApplyId() {
return applyId;
}
public void setApplyId(Object applyId) {
this.applyId = applyId;
}
public Object getProductId() {
return productId;
}
public void setProductId(Object productId) {
this.productId = productId;
}
public double getProductAmount() {
return productAmount;
}
public void setProductAmount(double productAmount) {
this.productAmount = productAmount;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getSoleCode() {
return soleCode;
}
public void setSimpleCode(String simpleCode) {
this.simpleCode = simpleCode;
}
public void setSoleCode(String soleCode) {
this.soleCode = soleCode;
}
public String getSimpleCode() {
return simpleCode;
}
public void setSimpleCode(String simpleCode) {
this.simpleCode = simpleCode;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/BackAddActivity.java
浏览文件 @ f3290d3c
......@@ -73,6 +73,10 @@ public class BackAddActivity extends WorkToolBarActivity {
LinearLayout llType;
@BindView(R.id.iv_choose_type)
ImageView ivChooseType;
@BindView(R.id.et_lot)
EditText etLot;
@BindView(R.id.ll_lot)
LinearLayout llLot;
private Map<String, Object> param;
private String orderType;
private List<String> typeList = new ArrayList<>();
......@@ -278,6 +282,7 @@ public class BackAddActivity extends WorkToolBarActivity {
String num = etNum.getText().toString();
String price = etPrice.getText().toString();
String remark = etRemark.getText().toString();
String lot = etLot.getText().toString();
if (TextUtils.isEmpty(num)) {
toast("请输入退货数量");
return;
......@@ -293,6 +298,10 @@ public class BackAddActivity extends WorkToolBarActivity {
}
}
}
if (TextUtils.isEmpty(lot)) {
toast("请输入产品批号");
return;
}
if (TextUtils.isEmpty(price) && chooseType == 3) {
toast("请输入核销金额");
return;
......@@ -300,6 +309,7 @@ public class BackAddActivity extends WorkToolBarActivity {
param.put("productAmount", num);
param.put("writeOff", price);
param.put("applyRemark", remark);
param.put("lot", lot);
if (chooseType == 1) {
if (chooseDep == null) {
toast("请选择退货仓库");
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/BackDetailActivity.java
浏览文件 @ f3290d3c
package com.wd.workoffice.ui.activity.bat.order;
import android.graphics.Color;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
......@@ -120,6 +121,8 @@ public class BackDetailActivity extends WorkToolBarActivity {
TextView tvDep5;
@BindView(R.id.ll_process)
LinearLayout llProcess;
@BindView(R.id.tv_lot)
TextView tvLot;
private ReturnApplyBean.RecordsBean info;
private String orderType;
......@@ -149,6 +152,7 @@ public class BackDetailActivity extends WorkToolBarActivity {
tvStock.setText(info.getBackStockName());
tvPerson.setText(String.valueOf(info.getCreatedByName()));
tvTime.setText(info.getCreatedTime());
tvLot.setText(info.getLot());
tvRemark.setText(String.valueOf(info.getApplyRemark()));
tvStatus.setText(WorkUtils.getReturnStatus(Integer.valueOf(info.getStatus())));
changeProcess(info.getStatus());
......@@ -180,8 +184,7 @@ public class BackDetailActivity extends WorkToolBarActivity {
}
rlHistory.setVisibility(View.GONE);
llProcess.setVisibility(View.GONE);
}
else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
if (status.startsWith("1") && !status.endsWith("4")) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
......@@ -312,7 +315,7 @@ public class BackDetailActivity extends WorkToolBarActivity {
// }
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
// hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RETURN_EDIT.getPermission());
}else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_PICK_RETURN_EDIT.getPermission());
}
......@@ -332,13 +335,13 @@ public class BackDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (status!=1 && TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
toast("请填写备注");
return;
}
......@@ -363,7 +366,7 @@ public class BackDetailActivity extends WorkToolBarActivity {
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
param.put("status", status);
param.put("productAmount", info.getProductAmount());
}else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
param.put("status", status);
param.put("productAmount", info.getProductAmount());
}
......@@ -385,7 +388,7 @@ public class BackDetailActivity 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())) {
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().foGroupPickReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().foGroupPickReturnApply(id + "", WorkUtils.convertMapToBody(param));
......@@ -433,7 +436,7 @@ public class BackDetailActivity extends WorkToolBarActivity {
checkDialog(1, info.getId());
break;
case R.id.rl_history:
startActivity(ReturnApplyHistoryActivity.class,"id",info.getId()+"");
startActivity(ReturnApplyHistoryActivity.class, "id", info.getId() + "");
break;
case R.id.rl_order:
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
......@@ -446,7 +449,7 @@ public class BackDetailActivity extends WorkToolBarActivity {
"id", getIntent().getStringExtra("id"),
"status", getIntent().getStringExtra("status"));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())){
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
......@@ -454,8 +457,8 @@ public class BackDetailActivity 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())){
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
......@@ -467,4 +470,5 @@ public class BackDetailActivity extends WorkToolBarActivity {
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnAddActivity.java
浏览文件 @ f3290d3c
......@@ -73,6 +73,10 @@ public class ReturnAddActivity extends WorkToolBarActivity {
LinearLayout llType;
@BindView(R.id.iv_choose_type)
ImageView ivChooseType;
@BindView(R.id.et_lot)
EditText etLot;
@BindView(R.id.ll_lot)
LinearLayout llLot;
private Map<String, Object> param;
private String orderType;
private List<String> typeList = new ArrayList<>();
......@@ -280,6 +284,7 @@ public class ReturnAddActivity extends WorkToolBarActivity {
private void submit() {
String num = etNum.getText().toString();
String lot = etLot.getText().toString();
String price = etPrice.getText().toString();
String remark = etRemark.getText().toString();
if (TextUtils.isEmpty(num)) {
......@@ -315,6 +320,10 @@ public class ReturnAddActivity extends WorkToolBarActivity {
}
}
}
if (TextUtils.isEmpty(lot)) {
toast("请输入产品批号");
return;
}
if (TextUtils.isEmpty(price) && chooseType == 3) {
toast("请输入核销金额");
return;
......@@ -322,6 +331,7 @@ public class ReturnAddActivity extends WorkToolBarActivity {
param.put("productAmount", num);
param.put("writeOff", price);
param.put("applyRemark", remark);
param.put("lot", lot);
if (chooseType == 1) {
if (chooseDep == null) {
toast("请选择退货仓库");
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnDetailActivity.java
浏览文件 @ f3290d3c
......@@ -2,9 +2,7 @@ package com.wd.workoffice.ui.activity.bat.order;
import android.graphics.Color;
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;
......@@ -17,7 +15,6 @@ 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.CheckAddStockEvent;
import com.wd.workoffice.bean.event.CheckReturnEvent;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
......@@ -124,6 +121,8 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
TextView tvDep5;
@BindView(R.id.ll_process)
LinearLayout llProcess;
@BindView(R.id.tv_lot)
TextView tvLot;
private ReturnApplyBean.RecordsBean info;
private String orderType;
......@@ -153,6 +152,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
tvStock.setText(info.getBackStockName());
tvPerson.setText(String.valueOf(info.getCreatedByName()));
tvTime.setText(info.getCreatedTime());
tvLot.setText(info.getLot());
tvRemark.setText(String.valueOf(info.getApplyRemark()));
tvStatus.setText(WorkUtils.getReturnStatus(Integer.valueOf(info.getStatus())));
changeProcess(info.getStatus());
......@@ -184,8 +184,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
}
rlHistory.setVisibility(View.GONE);
llProcess.setVisibility(View.GONE);
}
else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
if (status.startsWith("1") && !status.endsWith("4")) {
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.VISIBLE);
......@@ -316,7 +315,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RETURN_EDIT.getPermission());
}else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_RETURN_AUDIT.getPermission());
}
......@@ -336,13 +335,13 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
TextView tvNum = view.findViewById(R.id.tv_num);
TextView tvCancel = view.findViewById(R.id.tv_cancel);
EditText etRemark = view.findViewById(R.id.et_content);
WorkUtils.addNumListener(etRemark,tvNum);
WorkUtils.addNumListener(etRemark, tvNum);
builder.setView(view);
AlertDialog addCartDialog = builder.create();
tvOk.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (status!=1 && TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
if (status != 1 && TextUtils.isEmpty(etRemark.getText().toString()) && status == 2) {
toast("请填写备注");
return;
}
......@@ -367,7 +366,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
param.put("status", status);
param.put("productAmount", info.getProductAmount());
}else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
param.put("status", status);
param.put("productAmount", info.getProductAmount());
}
......@@ -389,7 +388,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())) {
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
observable = RtfUtils.getRtf().foGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
} else {
observable = RtfUtils.getRtf().soReturnApply(id + "", WorkUtils.convertMapToBody(param));
......@@ -419,7 +418,7 @@ 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())) {
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
llBottom.setVisibility(View.GONE);
}
EventBus.getDefault().post(new CheckReturnEvent());
......@@ -437,7 +436,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
checkDialog(1, info.getId());
break;
case R.id.rl_history:
startActivity(ReturnApplyHistoryActivity.class,"id",info.getId()+"");
startActivity(ReturnApplyHistoryActivity.class, "id", info.getId() + "");
break;
case R.id.rl_order:
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
......@@ -450,7 +449,7 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
"id", getIntent().getStringExtra("id"),
"status", getIntent().getStringExtra("status"));
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())){
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
......@@ -458,8 +457,8 @@ 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())){
} else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_DETAILS.getPermission())) {
toast(R.string.permission);
return;
}
......@@ -471,4 +470,5 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SendApplyAddCrucibleActivity.java
浏览文件 @ f3290d3c
......@@ -196,6 +196,7 @@ public class SendApplyAddCrucibleActivity extends WorkToolBarActivity {
String.valueOf(recordsBean.getProductWeight()), 3), 3);
returnData.put("productId", recordsBean.getProductId());
returnData.put("productAmount", recordsBean.getCount());
// returnData.put("lot", recordsBean.getLot());
for (AddStockChooseBean.RecordsBean bean : recordsBean.getBackList()) {
bean.setActionQuantity(Double.valueOf(bean.getChooseNum()));
bean.setOrderId(getIntent().getStringExtra("id"));
......
app/src/main/java/com/wd/workoffice/ui/adapter/SendApplyAddCrucibleAdapter.java
浏览文件 @ f3290d3c
package com.wd.workoffice.ui.adapter;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
......@@ -46,10 +50,28 @@ public class SendApplyAddCrucibleAdapter extends BaseQuickAdapter<OrderDetail.Or
helper.setText(R.id.tv_price, "￥".concat(MathUtils.converData(item.getInnerPrice(), 3)));
// helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
helper.setText(R.id.tv_unit, item.getProductUnit());
helper.setText(R.id.et_lot, item.getLot());
// 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_apply_send_num, MathUtils.converData(item.getCanOutStoreProductSum(), 3));
helper.setText(R.id.tv_send_num, MathUtils.converData(item.getShipSum(), 3));
EditText etLot = helper.getView(R.id.et_lot);
etLot.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) {
item.setLot(s.toString());
}
});
CheckBox cbChoose = helper.getView(R.id.cb_check);
cbChoose.setChecked(isChoose.get(helper.getAdapterPosition()) == null ? false : isChoose.get(helper.getAdapterPosition()));
cbChoose.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
......
app/src/main/java/com/wd/workoffice/ui/adapter/SendApplyDetailCrucibleAdapter.java
浏览文件 @ f3290d3c
......@@ -25,6 +25,7 @@ public class SendApplyDetailCrucibleAdapter extends BaseQuickAdapter<SendApplyDe
helper.setText(R.id.tv_name, item.getSimpleCode());
helper.setText(R.id.tv_card, item.getSoleCode());
helper.setText(R.id.tv_card_name, item.getProductName());
// helper.setText(R.id.tv_lot, item.getLot());
helper.setText(R.id.tv_all_num, MathUtils.converData(item.getProductAmount(),3));
helper.addOnClickListener(R.id.tv_from);
}
......
app/src/main/res/layout/activity_bat_retrun_detail.xml
浏览文件 @ f3290d3c
......@@ -296,10 +296,29 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="产品批号" />
<TextView
android:id="@+id/tv_lot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -319,7 +338,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray" />
</RelativeLayout>
......
app/src/main/res/layout/activity_return_add.xml
浏览文件 @ f3290d3c
......@@ -76,6 +76,37 @@
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_lot"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="产品批号"
android:textSize="14sp" />
<EditText
android:id="@+id/et_lot"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:hint="填写产品批号"
android:inputType="numberDecimal"
android:padding="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_type"
android:layout_width="match_parent"
......
app/src/main/res/layout/item_send_apply_add_crucible.xml
浏览文件 @ f3290d3c
......@@ -216,6 +216,31 @@
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="产品批号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<EditText
android:id="@+id/et_lot"
android:layout_width="0dp"
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:paddingVertical="3mm"
android:layout_height="wrap_content"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
<RelativeLayout
......
app/src/main/res/layout/item_send_apply_detail_crucible.xml
浏览文件 @ f3290d3c
......@@ -68,6 +68,28 @@
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginTop="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="产品批号"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_lot"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
</RelativeLayout>
</LinearLayout>
<RelativeLayout
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论