Skip to content

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

1.订单唛头修改

上级 f0a9bd0c
显示空白字符变更
内嵌 并排
正在显示 包含 221 行增加 和 16 行删除
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ e6ce88cd
...@@ -2261,4 +2261,15 @@ public interface ApiService { ...@@ -2261,4 +2261,15 @@ public interface ApiService {
*/ */
@GET("/mark-order-rel/one") @GET("/mark-order-rel/one")
Observable<BaseBean> getOrderMark(@QueryMap Map<String, Object> param); Observable<BaseBean> getOrderMark(@QueryMap Map<String, Object> param);
/**
* 获取订单产品设置的唛头
*
* @return
*/
@PUT("/mark-order-rel")
Observable<BaseBean> changeOrderMark(@Body RequestBody requestBody);
} }
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OrderMarkActivity.java
浏览文件 @ e6ce88cd
...@@ -7,13 +7,16 @@ import android.view.MenuItem; ...@@ -7,13 +7,16 @@ import android.view.MenuItem;
import android.widget.EditText; import android.widget.EditText;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.wd.workoffice.R; 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.MarkBean; import com.wd.workoffice.bean.MarkBean;
import com.wd.workoffice.bean.ProductBean;
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.activity.bat.store.ChooseHeadActivity;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import java.util.Map; import java.util.Map;
...@@ -60,25 +63,60 @@ public class OrderMarkActivity extends WorkToolBarActivity { ...@@ -60,25 +63,60 @@ public class OrderMarkActivity extends WorkToolBarActivity {
@BindView(R.id.et_use) @BindView(R.id.et_use)
EditText etUse; EditText etUse;
private MarkBean markBean; private MarkBean markBean;
private ProductBean.RecordsBean product; private int type;// 0 编辑 1 完成
@Override @Override
protected void initView() { protected void initView() {
ButterKnife.bind(this); ButterKnife.bind(this);
etCompany.setEnabled(false); changeCanInput(false);
etFactory.setEnabled(false); }
etMachine.setEnabled(false);
etProName.setEnabled(false); private void changeCanInput(boolean canInput) {
etImgCode.setEnabled(false); if (!canInput){
etSpec.setEnabled(false); etCompany.setHint("");
etSendCompany.setEnabled(false); etFactory.setHint("");
etCode.setEnabled(false); etMachine.setHint("");
etBox.setEnabled(false); etProName.setHint("");
etSuppliesCode.setEnabled(false); etImgCode.setHint("");
etContract.setEnabled(false); etSpec.setHint("");
etCountryCompany.setEnabled(false); etSendCompany.setHint("");
etAppName.setEnabled(false); etCode.setHint("");
etUse.setEnabled(false); etBox.setHint("");
etSuppliesCode.setHint("");
etContract.setHint("");
etCountryCompany.setHint("");
etAppName.setHint("");
etUse.setHint("");
}else {
etCompany.setHint("请输入");
etFactory.setHint("请输入");
etMachine.setHint("请输入");
etProName.setHint("请输入");
etImgCode.setHint("请输入");
etSpec.setHint("请输入");
etSendCompany.setHint("请输入");
etCode.setHint("请输入");
etBox.setHint("请输入");
etSuppliesCode.setHint("请输入");
etContract.setHint("请输入");
etCountryCompany.setHint("请输入");
etAppName.setHint("请输入");
etUse.setHint("请输入");
}
etCompany.setEnabled(canInput);
etFactory.setEnabled(canInput);
etMachine.setEnabled(canInput);
etProName.setEnabled(canInput);
etImgCode.setEnabled(canInput);
etSpec.setEnabled(canInput);
etSendCompany.setEnabled(canInput);
etCode.setEnabled(canInput);
etBox.setEnabled(canInput);
etSuppliesCode.setEnabled(canInput);
etContract.setEnabled(canInput);
etCountryCompany.setEnabled(canInput);
etAppName.setEnabled(canInput);
etUse.setEnabled(canInput);
} }
@Override @Override
...@@ -147,4 +185,147 @@ public class OrderMarkActivity extends WorkToolBarActivity { ...@@ -147,4 +185,147 @@ public class OrderMarkActivity extends WorkToolBarActivity {
protected int layoutId() { protected int layoutId() {
return R.layout.activity_choose_head; return R.layout.activity_choose_head;
} }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_modify_finish, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
// 动态设置ToolBar状态
switch (type) {
case 0:
menu.findItem(R.id.modify).setVisible(true);
menu.findItem(R.id.finish).setVisible(false);
break;
case 1:
menu.findItem(R.id.modify).setVisible(false);
menu.findItem(R.id.finish).setVisible(true);
break;
}
return super.onPrepareOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
// 收货单位 产品的名称，图号规格是必须填写项
String company = etCompany.getText().toString();
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(proName)) {
toast("请输入产品名称");
return super.onOptionsItemSelected(item);
}
if (TextUtils.isEmpty(imgCode)) {
toast("请输入图号");
return super.onOptionsItemSelected(item);
}
if (TextUtils.isEmpty(spec)) {
toast("请输入产品规格");
return super.onOptionsItemSelected(item);
}
addMarkData();
QMUIDialog.MessageDialogBuilder dialog = DialogUtils.okAndCancelDialog(OrderMarkActivity.this);
dialog.setMessage("是否将唛头同步到模板").addAction("否", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
updateOrderMark();
}
}).addAction("是", new QMUIDialogAction.ActionListener() {
@Override
public void onClick(QMUIDialog dialog, int index) {
dialog.dismiss();
showLoading();
updateTemplate();
}
}).show();
break;
case R.id.modify:
type =1;
changeCanInput(true);
invalidateOptionsMenu();
break;
}
return super.onOptionsItemSelected(item);
}
private void updateTemplate() {
Map param = JSON.parseObject(JSON.toJSONString(markBean), Map.class);
RtfUtils.getRtf().setTemplate(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
updateOrderMark();
}
});
}
private void updateOrderMark() {
Map param = JSON.parseObject(JSON.toJSONString(markBean), Map.class);
RtfUtils.getRtf().changeOrderMark(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
toast("更新成功");
finish();
}
});
}
private void addMarkData() {
markBean.setReceiveCompany(etCompany.getText().toString());
markBean.setCustomerBranchFactory(etFactory.getText().toString());
markBean.setContinuousCastingMachine(etMachine.getText().toString());
markBean.setProductName(etProName.getText().toString());
markBean.setProductSimpleCode(etImgCode.getText().toString());
markBean.setProductSpec(etSpec.getText().toString());
markBean.setShipCompany(etSendCompany.getText().toString());
markBean.setMaterialCode(etCode.getText().toString());
markBean.setBoxCode(etBox.getText().toString());
markBean.setMaterialCodeOther(etSuppliesCode.getText().toString());
markBean.setForeignTradeContractNumber(etContract.getText().toString());
markBean.setDomesticShipCompany(etCountryCompany.getText().toString());
markBean.setProjectName(etAppName.getText().toString());
markBean.setUseLocation(etUse.getText().toString());
}
} }
app/src/main/res/menu/menu_modify_finish.xml 0 → 100644
浏览文件 @ e6ce88cd
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/modify"
android:title="编辑"
app:showAsAction="always" />
<item
android:id="@+id/finish"
android:title="完成"
app:showAsAction="always" />
</menu>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论