denghuan/good-luck-cargo
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

安联，交通厅大类匹配，卸货地址税号优化

Browse Source
This commit is contained in:
lijia 2024-08-19 10:56:00 +08:00
parent fb640b7f4c
commit 16f3172092
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -124,7 +124,7 @@ android {
appName = '货主端正式_' appName = '货主端正式_'
} }
variant.outputs.all { variant.outputs.all {
outputFileName = appName+"_${variant.productFlavors[0].name}_v${variant.productFlavors[0].versionName}.apk" outputFileName = appName+"_${variant.productFlavors[0].name}_v${versionName}.apk"
} }
} }
} }

13
app/src/main/java/com/oneclouds/cargo/ui/home/ChoiceAddressActivity.java
View File

@ -284,23 +284,22 @@ public class ChoiceAddressActivity extends BaseActivity implements View.OnClickL
private void submint() { private void submint() {
String name = etName.getText().toString(); String name = etName.getText().toString();
String phone = etPhone.getText().toString(); String phone = etPhone.getText().toString();
String num = tvNum.getText().toString(); // String num = tvNum.getText().toString();
String address = tvAddress.getText().toString(); String address = tvAddress.getText().toString();
String addressDetail = etAddressDetail.getText().toString(); String addressDetail = etAddressDetail.getText().toString();
String tvNum2 = tvNum.getText().toString(); String tvNum2 = tvNum.getText().toString();
String comName2 = etName2.getText().toString(); String comName2 = etName2.getText().toString();
if (TextUtils.isEmpty(name) || TextUtils.isEmpty(phone) || if (TextUtils.isEmpty(name) || TextUtils.isEmpty(phone) || TextUtils.isEmpty(address) ||
TextUtils.isEmpty(num) || TextUtils.isEmpty(address) ||
TextUtils.isEmpty(addressDetail)||TextUtils.isEmpty(comName2)) { TextUtils.isEmpty(addressDetail)||TextUtils.isEmpty(comName2)) {
ToastUtil.show(con, "请完善信息"); ToastUtil.show(con, "请完善信息");
return; return;
} }
if (type!=300001&&(num.length()!=15&&num.length()!=18&&num.length()!=20)){ // if (type!=300001&&(num.length()!=15&&num.length()!=18&&num.length()!=20)){
ToastUtil.show(con, "税号/身份证号长度不正确"); // ToastUtil.show(con, "税号/身份证号长度不正确");
return; // return;
} // }
if (phone.startsWith("1") && phone.length() == 11) { if (phone.startsWith("1") && phone.length() == 11) {
aib.setAddressDetail(addressDetail); aib.setAddressDetail(addressDetail);

14
app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java
View File

@ -405,6 +405,20 @@ public class HomeFragment extends BaseFragment {
OptionBaseBean obb = (OptionBaseBean) item; OptionBaseBean obb = (OptionBaseBean) item;
tvHwdlJt.setText(obb.getName()); tvHwdlJt.setText(obb.getName());
oib.getFormData().setGoodsBigCate(obb.getId()); oib.getFormData().setGoodsBigCate(obb.getId());
//匹配安联货物大类
oib.getFormData().setAlctGoodsType(ctb.getData().get(position).getAlctGoodsTypeId());
// int alctGoodsTypeId = ctb.getData().get(position).getAlctGoodsTypeId();
// AlGoodsTypeListBean al = TypeParts.getAlType(con);
// for (AlGoodsTypeListBean.DataDTO datum : al.getData()) {
// if (alctGoodsTypeId==datum.getId()){
// tvHwdlAl.setText(obb.getName());
// oib.getFormData().setAlctGoodsType(obb.getId());
// break;
// }
// }
}); });
picker.setData(data); picker.setData(data);
picker.setDefaultPosition(2); picker.setDefaultPosition(2);

4
app/src/main/java/com/oneclouds/cargo/ui/waybill/activity/AnotherOrderActivity.kt
View File

@ -483,6 +483,10 @@ class AnotherOrderActivity : BaseActivity() {
val obb = item as OptionBaseBean val obb = item as OptionBaseBean
tvHwdlJt.text = obb.name tvHwdlJt.text = obb.name
oib.formData.goodsBigCate = obb.id oib.formData.goodsBigCate = obb.id
//匹配安联货物大类
//匹配安联货物大类
oib.formData.alctGoodsType = ctb.data[position].alctGoodsTypeId
} }
picker.setData(data) picker.setData(data)
picker.setDefaultPosition(2) picker.setDefaultPosition(2)