Skip to content

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

1.新增总结展示页面 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token
上级 5de9c736
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 145 行增加 和 59 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/SummaryBean.java
浏览文件 @ 42886796
......@@ -49,31 +49,31 @@ public class SummaryBean {
private long updateDateTime;
private String jobNo;
private int jobTypeId;
private Object productDrawingConfirmation;
private Object siteInvestigation;
private Object feasibilityReport;
private String productDrawingConfirmation;
private String siteInvestigation;
private String feasibilityReport;
private String productsCode;
private String productsName;
private Object experimentProcess;
private Object experimentResult;
private Object improveProposal;
private String experimentProcess;
private String experimentResult;
private String improveProposal;
private String feedbackQualityIssues;
private String siteUseSituation;
private String causeAnalysis;
private String solution;
private Object communicativePurposes;
private Object communicativeSituation;
private Object reachOpinion;
private Object productDevise;
private Object productQuotedPrice;
private String communicativePurposes;
private String communicativeSituation;
private String reachOpinion;
private String productDevise;
private String productQuotedPrice;
private String completionSituation;
private int dataCollectionStatus;
private Object attachmentId;
private String attachmentId;
private String createUserId;
private String createUserName;
private String updateUserId;
private Object updateUserName;
private Object remark;
private String updateUserName;
private String remark;
private boolean delete;
private List<AttachmentsBean> attachments;
......@@ -117,27 +117,27 @@ public class SummaryBean {
this.jobTypeId = jobTypeId;
}
public Object getProductDrawingConfirmation() {
public String getProductDrawingConfirmation() {
return productDrawingConfirmation;
}
public void setProductDrawingConfirmation(Object productDrawingConfirmation) {
public void setProductDrawingConfirmation(String productDrawingConfirmation) {
this.productDrawingConfirmation = productDrawingConfirmation;
}
public Object getSiteInvestigation() {
public String getSiteInvestigation() {
return siteInvestigation;
}
public void setSiteInvestigation(Object siteInvestigation) {
public void setSiteInvestigation(String siteInvestigation) {
this.siteInvestigation = siteInvestigation;
}
public Object getFeasibilityReport() {
public String getFeasibilityReport() {
return feasibilityReport;
}
public void setFeasibilityReport(Object feasibilityReport) {
public void setFeasibilityReport(String feasibilityReport) {
this.feasibilityReport = feasibilityReport;
}
......@@ -157,27 +157,27 @@ public class SummaryBean {
this.productsName = productsName;
}
public Object getExperimentProcess() {
public String getExperimentProcess() {
return experimentProcess;
}
public void setExperimentProcess(Object experimentProcess) {
public void setExperimentProcess(String experimentProcess) {
this.experimentProcess = experimentProcess;
}
public Object getExperimentResult() {
public String getExperimentResult() {
return experimentResult;
}
public void setExperimentResult(Object experimentResult) {
public void setExperimentResult(String experimentResult) {
this.experimentResult = experimentResult;
}
public Object getImproveProposal() {
public String getImproveProposal() {
return improveProposal;
}
public void setImproveProposal(Object improveProposal) {
public void setImproveProposal(String improveProposal) {
this.improveProposal = improveProposal;
}
......@@ -213,43 +213,43 @@ public class SummaryBean {
this.solution = solution;
}
public Object getCommunicativePurposes() {
public String getCommunicativePurposes() {
return communicativePurposes;
}
public void setCommunicativePurposes(Object communicativePurposes) {
public void setCommunicativePurposes(String communicativePurposes) {
this.communicativePurposes = communicativePurposes;
}
public Object getCommunicativeSituation() {
public String getCommunicativeSituation() {
return communicativeSituation;
}
public void setCommunicativeSituation(Object communicativeSituation) {
public void setCommunicativeSituation(String communicativeSituation) {
this.communicativeSituation = communicativeSituation;
}
public Object getReachOpinion() {
public String getReachOpinion() {
return reachOpinion;
}
public void setReachOpinion(Object reachOpinion) {
public void setReachOpinion(String reachOpinion) {
this.reachOpinion = reachOpinion;
}
public Object getProductDevise() {
public String getProductDevise() {
return productDevise;
}
public void setProductDevise(Object productDevise) {
public void setProductDevise(String productDevise) {
this.productDevise = productDevise;
}
public Object getProductQuotedPrice() {
public String getProductQuotedPrice() {
return productQuotedPrice;
}
public void setProductQuotedPrice(Object productQuotedPrice) {
public void setProductQuotedPrice(String productQuotedPrice) {
this.productQuotedPrice = productQuotedPrice;
}
......@@ -269,11 +269,11 @@ public class SummaryBean {
this.dataCollectionStatus = dataCollectionStatus;
}
public Object getAttachmentId() {
public String getAttachmentId() {
return attachmentId;
}
public void setAttachmentId(Object attachmentId) {
public void setAttachmentId(String attachmentId) {
this.attachmentId = attachmentId;
}
......@@ -301,19 +301,19 @@ public class SummaryBean {
this.updateUserId = updateUserId;
}
public Object getUpdateUserName() {
public String getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(Object updateUserName) {
public void setUpdateUserName(String updateUserName) {
this.updateUserName = updateUserName;
}
public Object getRemark() {
public String getRemark() {
return remark;
}
public void setRemark(Object remark) {
public void setRemark(String remark) {
this.remark = remark;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketAddSummaryActivity.java
浏览文件 @ 42886796
package com.wd.workoffice.ui.activity.mes.ticket;
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 android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.AccountBean;
import com.wd.workoffice.bean.mesBean.TicketBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.util.WorkUtils;
import java.util.Map;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
......@@ -29,16 +34,79 @@ import io.reactivex.disposables.Disposable;
* github: https://github.com/FlexibleXd
**/
public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
@BindView(R.id.tv_design_confirm)
TextView tvDesignConfirm;
@BindView(R.id.et_design1)
EditText etDesign1;
@BindView(R.id.et_design2)
EditText etDesign2;
@BindView(R.id.ll_design)
LinearLayout llDesign;
@BindView(R.id.tv_try_pro)
TextView tvTryPro;
@BindView(R.id.rl_try_pro)
RelativeLayout rlTryPro;
@BindView(R.id.et_try1)
EditText etTry1;
@BindView(R.id.et_try2)
EditText etTry2;
@BindView(R.id.et_try3)
EditText etTry3;
@BindView(R.id.ll_try)
LinearLayout llTry;
@BindView(R.id.tv_quality_pro)
TextView tvQualityPro;
@BindView(R.id.rl_quality_pro)
RelativeLayout rlQualityPro;
@BindView(R.id.et_quality1)
EditText etQuality1;
@BindView(R.id.et_quality2)
EditText etQuality2;
@BindView(R.id.et_quality3)
EditText etQuality3;
@BindView(R.id.et_quality4)
EditText etQuality4;
@BindView(R.id.ll_quality)
LinearLayout llQuality;
@BindView(R.id.tv_tech_pro)
TextView tvTechPro;
@BindView(R.id.rl_tech_pro)
RelativeLayout rlTechPro;
@BindView(R.id.et_tech1)
EditText etTech1;
@BindView(R.id.et_tech2)
EditText etTech2;
@BindView(R.id.et_tech3)
EditText etTech3;
@BindView(R.id.ll_tech)
LinearLayout llTech;
@BindView(R.id.et_tender1)
EditText etTender1;
@BindView(R.id.et_tender2)
EditText etTender2;
@BindView(R.id.ll_tender)
LinearLayout llTender;
@BindView(R.id.et_client)
EditText etClient;
@BindView(R.id.rv_photo)
RecyclerView rvPhoto;
@BindView(R.id.rv_annx)
RecyclerView rvAnnx;
private Map<String, Object> param;
private TicketBean.ListBean data;
@Override
protected void initView() {
ButterKnife.bind(this);
data = JSON.parseObject(getIntent().getStringExtra("data"), TicketBean.ListBean.class);
changVisibility(data.getJobTypeId());
}
@Override
protected void initData() {
param = WorkUtils.simpleParam();
param.put("jobNo", getIntent().getStringExtra("id"));
param.put("jobNo", data.getJobNo());
}
private void submit() {
......@@ -90,4 +158,18 @@ public class MesTicketAddSummaryActivity extends WorkToolBarActivity {
}
return super.onOptionsItemSelected(item);
}
private void changVisibility(String jobTypeId) {
if (TextUtils.equals(jobTypeId, "01")) {
llDesign.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(jobTypeId, "02")) {
llTry.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(jobTypeId, "03")) {
llQuality.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(jobTypeId, "04")) {
llTech.setVisibility(View.VISIBLE);
} else if (TextUtils.equals(jobTypeId, "05")) {
llTender.setVisibility(View.VISIBLE);
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketDetailActivity.java
浏览文件 @ 42886796
......@@ -100,7 +100,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
btnReceive.setVisibility(View.VISIBLE);
}
if (data.getJobStatus() == 2) {
btnReceive.setVisibility(View.VISIBLE);
btnSubmit.setVisibility(View.VISIBLE);
rlLog.setVisibility(View.GONE);
rlAddLog.setVisibility(View.VISIBLE);
}
......@@ -108,6 +108,8 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
rlAddLog.setVisibility(View.GONE);
}
rlAddLog.setVisibility(View.VISIBLE);
llBottom.setVisibility(View.VISIBLE);
btnSubmit.setVisibility(View.VISIBLE);
tvCode.setText(data.getJobNo());
tvClient.setText(data.getCustomerUserName());
tvCompany.setText(data.getSalesCompanyName());
......@@ -211,7 +213,7 @@ public class MesTicketDetailActivity extends WorkToolBarActivity {
receive();
break;
case R.id.btn_submit:
startActivity(MesTicketAddSummaryActivity.class, "id", data.getJobNo());
startActivity(MesTicketAddSummaryActivity.class, "data", JSON.toJSONString(data));
break;
case R.id.rl_log:
startActivity(MesTicketLogActivity.class, "id", data.getJobNo());
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListTakeOnActivity.java
浏览文件 @ 42886796
......@@ -178,10 +178,10 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
startActivity(MesTicketDetailActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
break;
case 3:
startActivity(MesTicketDetailReviewActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
startActivity(MesTicketDetailFinishActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
break;
case 4:
startActivity(MesTicketDetailReviewActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
startActivity(MesTicketDetailFinishActivity.class, "from", "1", "data", JSON.toJSONString(dataList.get(position)));
break;
}
}
......
app/src/main/res/layout/activity_mes_ticket_detail.xml
浏览文件 @ 42886796
......@@ -19,22 +19,21 @@
android:id="@+id/btn_receive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="20mm"
android:background="@drawable/shape_blue_circle"
android:paddingHorizontal="40mm"
android:text="接收"
android:visibility="gone"
android:textColor="@color/white" />
android:textColor="@color/white"
android:visibility="gone" />
<Button
android:id="@+id/btn_submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:background="@drawable/shape_blue_circle"
android:paddingHorizontal="40mm"
android:text="提交工单总结"
android:textColor="@color/white" />
android:textColor="@color/white"
android:visibility="gone" />
</LinearLayout>
<androidx.core.widget.NestedScrollView
......@@ -47,7 +46,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
......@@ -56,6 +55,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="任务单号"
android:textSize="14sp" />
......@@ -63,9 +63,10 @@
android:id="@+id/tv_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" />
......@@ -168,9 +169,10 @@
android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="right"
android:orientation="vertical">
<TextView
......@@ -183,7 +185,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_clazz"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:layout_marginRight="3mm" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论