Skip to content

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

1.修改唛头 

2.TODO 单独菜单
上级 f2895e45
隐藏空白字符变更
内嵌 并排
正在显示 包含 184 行增加 和 21 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/ChooseHeadActivity.java
浏览文件 @ 11a57092
......@@ -5,7 +5,9 @@ import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import com.alibaba.fastjson.JSON;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
......@@ -13,20 +15,13 @@ 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.ClientBean;
import com.wd.workoffice.bean.MarkBean;
import com.wd.workoffice.bean.ProductBean;
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.work.DeviceBuyCarActivity;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import butterknife.BindView;
......@@ -70,12 +65,25 @@ public class ChooseHeadActivity extends WorkToolBarActivity {
EditText etAppName;
@BindView(R.id.et_use)
EditText etUse;
@BindView(R.id.ll_company)
LinearLayout llCompany;
@BindView(R.id.ll_machine)
LinearLayout llMachine;
@BindView(R.id.ll_send_company)
LinearLayout llSendCompany;
@BindView(R.id.ll_country_company)
LinearLayout llCountryCompany;
private MarkBean markBean;
private ProductBean.RecordsBean product;
@Override
protected void initView() {
ButterKnife.bind(this);
//新增时不显示
llCompany.setVisibility(View.GONE);
llCountryCompany.setVisibility(View.GONE);
llMachine.setVisibility(View.GONE);
llSendCompany.setVisibility(View.GONE);
}
@Override
......@@ -175,10 +183,10 @@ public class ChooseHeadActivity extends WorkToolBarActivity {
String proName = etProName.getText().toString();
String imgCode = etImgCode.getText().toString();
String spec = etSpec.getText().toString();
if (TextUtils.isEmpty(company)) {
toast("请输入收货单位");
return super.onOptionsItemSelected(item);
}
// if (TextUtils.isEmpty(company)) {
// toast("请输入收货单位");
// return super.onOptionsItemSelected(item);
// }
if (TextUtils.isEmpty(proName)) {
toast("请输入产品名称");
return super.onOptionsItemSelected(item);
......@@ -262,5 +270,4 @@ public class ChooseHeadActivity extends WorkToolBarActivity {
}
});
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleConfirmActivity.java
浏览文件 @ 11a57092
......@@ -5,11 +5,10 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
......@@ -25,11 +24,9 @@ import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.MarkBean;
import com.wd.workoffice.bean.OrderBillBean;
import com.wd.workoffice.bean.ProcessBean;
import com.wd.workoffice.bean.ProductBean;
import com.wd.workoffice.bean.listener.HwUploadListener;
import com.wd.workoffice.bean.workEnum.PermissionType;
import com.wd.workoffice.retrofit.ApiService;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.StoreCarAdapter;
......@@ -58,14 +55,10 @@ import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.RtfHelper;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.Observable;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.MultipartBody;
import okhttp3.RequestBody;
/**
* 商店-销售/供应/外采购/坩埚-产品-确认订单
......@@ -119,6 +112,16 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
TextView tvBill;
@BindView(R.id.rl_bill)
RelativeLayout rlBill;
@BindView(R.id.et_company)
EditText etCompany;
@BindView(R.id.et_machine)
EditText etMachine;
@BindView(R.id.et_send_company)
EditText etSendCompany;
@BindView(R.id.et_country_company)
EditText etCountryCompany;
@BindView(R.id.ll_sale_mark)
LinearLayout llSaleMark;
private List<ProductBean.RecordsBean> proList;
private StoreCarAdapter proAdapter;
private QMUIDialog.MenuDialogBuilder setDialog;
......@@ -158,6 +161,11 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
} else {
rlBill.setVisibility(View.GONE);
}
//隐藏唛头
if (!TextUtils.equals(code, PermissionType.PROCESS_SALE.getCode())){
llSaleMark.setVisibility(View.GONE);
}
}
......@@ -247,6 +255,10 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
}
if (TextUtils.equals(getIntent().getStringExtra("code"),
PermissionType.PROCESS_SALE.getCode())) {
recordsBean.getMarkOrderRel().setReceiveCompany(etCompany.getText().toString());
recordsBean.getMarkOrderRel().setContinuousCastingMachine(etMachine.getText().toString());
recordsBean.getMarkOrderRel().setShipCompany(etSendCompany.getText().toString());
recordsBean.getMarkOrderRel().setDomesticShipCompany(etCountryCompany.getText().toString());
data.put("markOrderRel", recordsBean.getMarkOrderRel());
}
// data.put("tranFromStockId", recordsBean.getCarPrice());
......@@ -331,6 +343,14 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
toast("请选择客户要求交货时间");
return;
}
String company = etCompany.getText().toString();
//验证唛头收货单位
if (TextUtils.equals(code, PermissionType.PROCESS_SALE.getCode())) {
if (TextUtils.isEmpty(company)) {
toast("请输入收货单位");
return;
}
}
expandInfo.put("demond1", etInput2.getText().toString());
expandInfo.put("demond2", etInput3.getText().toString());
expandInfo.put("demond3", etInput4.getText().toString());
......@@ -471,7 +491,7 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
}
});
}
}else if (requestCode == 10003 && resultCode == 10003) {
} else if (requestCode == 10003 && resultCode == 10003) {
String mark = data.getStringExtra("mark");
Integer position = Integer.valueOf(data.getStringExtra("position"));
proList.get(position).setMarkOrderRel(JSON.parseObject(mark, MarkBean.class));
......@@ -506,4 +526,5 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
});
}
}
app/src/main/res/layout/activity_bat_sale_confirm.xml
浏览文件 @ 11a57092
......@@ -249,6 +249,137 @@
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_sale_mark"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content">
<LinearLayout
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:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:id="@+id/et_company"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginLeft="10mm"
android:gravity="right"
android:padding="3mm"
android:layout_weight="1"
android:background="@null"
android:hint="输入收货单位"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
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:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:id="@+id/et_machine"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginLeft="10mm"
android:gravity="right"
android:padding="3mm"
android:layout_weight="1"
android:background="@null"
android:hint="输入连铸机"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
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:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:id="@+id/et_send_company"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginLeft="10mm"
android:gravity="right"
android:padding="3mm"
android:layout_weight="1"
android:background="@null"
android:hint="输入发货单位"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
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:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:id="@+id/et_country_company"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginLeft="10mm"
android:gravity="right"
android:padding="3mm"
android:layout_weight="1"
android:background="@null"
android:hint="输入国内发货单位"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<View style="@style/ViewX" />
<TextView
......
app/src/main/res/layout/activity_choose_head.xml
浏览文件 @ 11a57092
......@@ -14,6 +14,7 @@
<LinearLayout
android:id="@+id/ll_company"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -74,6 +75,7 @@
<View style="@style/dividerX" />
<LinearLayout
android:id="@+id/ll_machine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -194,6 +196,7 @@
<View style="@style/dividerX" />
<LinearLayout
android:id="@+id/ll_send_company"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......@@ -344,6 +347,7 @@
<View style="@style/dividerX" />
<LinearLayout
android:id="@+id/ll_country_company"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论