Skip to content

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

1.工单筛选 

2.//TODO erp用户是否选择新部门为空，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes，刷新token，编辑任务担当无法修改
上级 d63b822d
隐藏空白字符变更
内嵌 并排
正在显示 包含 341 行增加 和 4 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 26c1eb0a
...@@ -1211,6 +1211,15 @@ ...@@ -1211,6 +1211,15 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.ticket.MesTicketConditionActivity"
android:configChanges="keyboardHidden|orientation"
android:label="筛选"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity <activity
android:name=".ui.activity.mes.ticket.MesTicketDetailFinishActivity" android:name=".ui.activity.mes.ticket.MesTicketDetailFinishActivity"
android:configChanges="keyboardHidden|orientation" android:configChanges="keyboardHidden|orientation"
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketConditionActivity.java 0 → 100644
浏览文件 @ 26c1eb0a
package com.wd.workoffice.ui.activity.mes.ticket;
import android.content.DialogInterface;
import android.content.Intent;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.ui.activity.bat.order.AddCrucibleConfirmActivity;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
import androidx.core.widget.NestedScrollView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.utils.TimeUtils;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesTicketConditionActivity extends WorkToolBarActivity {
@BindView(R.id.et_name)
EditText etName;
@BindView(R.id.et_company)
EditText etCompany;
@BindView(R.id.tv_status)
TextView tvStatus;
@BindView(R.id.rl_status)
RelativeLayout rlStatus;
@BindView(R.id.tv_time)
TextView tvTime;
@BindView(R.id.rl_time)
RelativeLayout rlTime;
@BindView(R.id.srl_refresh)
NestedScrollView srlRefresh;
private QMUIDialog.MenuDialogBuilder statusDialog;
private String[] statusList = new String[]{"草稿", "已提交", "执行中", "已总结", "已评价"};
// 0草稿、1已提交、2执行中、3已总结、4已评价
private Integer[] statusValue = new Integer[]{0, 1, 2, 3, 4};
private Map<String, Object> param;
@Override
protected void initView() {
ButterKnife.bind(this);
param = WorkUtils.simpleParam();
statusDialog = DialogUtils.listDialog(this);
statusDialog.addItems(statusList, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
tvStatus.setText(statusList[which]);
param.put("jobStatus", statusValue[which]);
dialog.dismiss();
}
});
}
@Override
protected void initData() {
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_mes_ticket_cnd;
}
@OnClick({R.id.rl_status, R.id.rl_time})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_status:
statusDialog.show();
break;
case R.id.rl_time:
PickTimeUtils.showPickThree(MesTicketConditionActivity.this, new OnTimeSelectListener() {
@Override
public void onTimeSelect(Date date, View v) {
String time = TimeUtils.date2String(date, new SimpleDateFormat("yyyy-MM-dd"));
param.put("planBeginDate", time);
tvTime.setText(time);
}
}).show();
break;
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_finish, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
if (!TextUtils.isEmpty(etCompany.getText().toString())){
param.put("customerUserName",etCompany.getText().toString());
}
if (!TextUtils.isEmpty(etName.getText().toString())){
param.put("salesCompanyName",etName.getText().toString());
}
Intent intent = new Intent();
intent.putExtra("param", JSON.toJSONString(param));
setResult(10001,intent);
finish();
break;
}
return super.onOptionsItemSelected(item);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java
浏览文件 @ 26c1eb0a
package com.wd.workoffice.ui.activity.mes.ticket; package com.wd.workoffice.ui.activity.mes.ticket;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
...@@ -27,6 +29,7 @@ import java.util.ArrayList; ...@@ -27,6 +29,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
...@@ -159,15 +162,15 @@ public class MesTicketListActivity extends WorkToolBarActivity { ...@@ -159,15 +162,15 @@ public class MesTicketListActivity extends WorkToolBarActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_ticket_add, menu); getMenuInflater().inflate(R.menu.menu_search, menu);
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }
@Override @Override
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.add: case R.id.search:
startActivity(MesTicketAddActivity.class); startActivityForResult(MesTicketConditionActivity.class, 10001);
break; break;
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
...@@ -205,4 +208,17 @@ public class MesTicketListActivity extends WorkToolBarActivity { ...@@ -205,4 +208,17 @@ public class MesTicketListActivity extends WorkToolBarActivity {
break; break;
} }
} }
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
String returnParam = data.getStringExtra("param");
param.put("paramMap", JSON.parseObject(returnParam,Map.class));
page = 1;
param.put("pageNum", page);
getData();
}
}
} }
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListTakeOnActivity.java
浏览文件 @ 26c1eb0a
package com.wd.workoffice.ui.activity.mes.ticket; package com.wd.workoffice.ui.activity.mes.ticket;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
...@@ -25,6 +28,7 @@ import java.util.ArrayList; ...@@ -25,6 +28,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView; import butterknife.BindView;
...@@ -61,6 +65,7 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity { ...@@ -61,6 +65,7 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
tvGo.setText("市场服务\n" + tvGo.setText("市场服务\n" +
"页面"); "页面");
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false)); rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
btnAdd.setVisibility(View.GONE);
} }
...@@ -165,6 +170,23 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity { ...@@ -165,6 +170,23 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
break; break;
} }
} }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
startActivityForResult(MesTicketConditionActivity.class,10001);
break;
}
return super.onOptionsItemSelected(item);
}
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
...@@ -183,5 +205,15 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity { ...@@ -183,5 +205,15 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
param.put("pageNum", page); param.put("pageNum", page);
getData(); getData();
} }
@Override
protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
String returnParam = data.getStringExtra("param");
param.put("paramMap", JSON.parseObject(returnParam,Map.class));
page = 1;
param.put("pageNum", page);
getData();
}
}
} }
app/src/main/res/layout/activity_mes_ticket_cnd.xml 0 → 100644
浏览文件 @ 26c1eb0a
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/srl_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="客户名称"
android:textSize="14sp" />
<EditText
android:id="@+id/et_name"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_marginRight="10mm"
android:background="@null"
android:hint="请输入"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="销售公司"
android:textSize="14sp" />
<EditText
android:id="@+id/et_company"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_marginRight="10mm"
android:background="@null"
android:hint="请输入"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:id="@+id/rl_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="状态"
android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:id="@+id/rl_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="制单日期"
android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论