Skip to content

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

1.修改流程为订单 

2.修改我的-部门流水跳转，展示字段
上级 e816ffff
隐藏空白字符变更
内嵌 并排
正在显示 包含 42 行增加 和 44 行删除
app/src/main/java/com/wd/workoffice/app/Config.java
浏览文件 @ 5eb57e94
......@@ -9,9 +9,9 @@ public interface Config {
String REGEX_USERNAME = "^[\\w]{4,16}(?<!_)$";
String REGEX_PASSWORD = "^[\\w]{6,16}(?<!_)$";
int SIZE = 10;
List<String> warehouseStatusList = Arrays.asList("全部类型", "销售订单", "外采购流程",
List<String> WAREHOUSE_STATUS_LIST = Arrays.asList("全部类型", "销售订单", "外采购订单",
"供应订单", "坩埚订单", "内部交易订单", "组装订单");
List<String> warehouseCodeList = Arrays.asList("", "SO", "PO",
List<String> WAREHOUSE_CODE_LIST = Arrays.asList("", "SO", "PO",
"FO", "CO", "IO", "AO");
List<String> STOCK_FLOW_TYPE = Arrays.asList("全部类型", "出库", "入库",
"冻结", "解冻", "解冻出库");
......
app/src/main/java/com/wd/workoffice/bean/workEnum/PermissionType.java
浏览文件 @ 5eb57e94
......@@ -6,18 +6,6 @@ package com.wd.workoffice.bean.workEnum;
* github: https://github.com/FlexibleXd
**/
public enum PermissionType {
// 供应流程 PROCESS_SUPPLY 接单：SUPPLY_SELL 下单：SUPPLY_BUY
//* 内部交易流程 PROCESS_INSIDE 接单：INSIDE_SELL 下单：INSIDE_BUY
//
//* 坩埚流程 PROCESS_CRUCIBLE 接单：CRUCIBLE_SELL 下单：CRUCIBLE_BUY
//
//* 销售流程 PROCESS_SALE 接单：ES_SELL 下单：ES_BUY 查看：ES_GET
//
//* 外采购流程 PROCESS_PURCHASE 接单：PURCHASE_SELL 下单：PURCHASE_BUY
//
//* 维修流程 PROCESS_REPAIR 接单：REPAIR_SELL 下单：REPAIR_BUY
//* 财税流程 PROCESS_FISCAL_TAX 接单：FISCAL_TAX_SELL 下单：FISCAL_TAX_BUY
PROCESS_SUPPLY("PROCESS_SUPPLY", "供应流程"), SUPPLY_SELL("SUPPLY_SELL", "接单"), SUPPLY_BUY("SUPPLY_BUY", "下单"),
PROCESS_INSIDE("PROCESS_INSIDE", "内部交易流程"), INSIDE_SELL("INSIDE_SELL", "接单"), INSIDE_BUY("INSIDE_BUY", "下单"),
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialLogisticAddActivity.java
浏览文件 @ 5eb57e94
......@@ -15,6 +15,7 @@ import com.wd.workoffice.bean.event.CheckLogisticEvent;
import com.wd.workoffice.bean.event.CheckTicketEvent;
import com.wd.workoffice.ui.activity.bat.store.StoreSaleClientActivity;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
......@@ -51,13 +52,14 @@ public class WorkFinancialLogisticAddActivity extends WorkToolBarActivity {
private Map<String, Object> param;
private Integer clientId;
private QMUIDialog.MenuDialogBuilder typeDialog;
String[] typeList = new String[]{"销售流程", "外采购流程"};
String[] typeList = new String[]{"销售订单", "外采购订单"};
private String chooseType;
private Integer depId;
@Override
protected void initView() {
ButterKnife.bind(this);
tvDep.setText(UserKeeper.getInstance().getUserDepName());
param = WorkUtils.simpleParam();
typeDialog = DialogUtils.listDialog(this);
typeDialog.addItems(typeList, new DialogInterface.OnClickListener() {
......@@ -129,20 +131,20 @@ public class WorkFinancialLogisticAddActivity extends WorkToolBarActivity {
typeDialog.show();
break;
case R.id.tv_next:
if (depId == null) {
toast("请先选择部门");
return;
}
// if (depId == null) {
// toast("请先选择部门");
// return;
// }
if (clientId == null) {
toast("请先选择运输商");
return;
}
if (TextUtils.isEmpty(chooseType)) {
toast("请选择流程");
toast("请选择订单类型");
return;
}
startActivity(WorkFinancialLogisticsProActivity.class,
"logisticsId", clientId + "", "orderType", tvProcess.getText().toString(), "depId", depId + "");
"logisticsId", clientId + "", "orderType", tvProcess.getText().toString(), "depId", UserKeeper.getInstance().getUserDepId());
break;
}
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkFinancialLogisticsProActivity.java
浏览文件 @ 5eb57e94
......@@ -72,7 +72,7 @@ public class WorkFinancialLogisticsProActivity extends WorkToolBarActivity {
param.put("status", 0);
param.put("receiveDeptId", getIntent().getStringExtra("depId"));
param.put("logisticsId", getIntent().getStringExtra("logisticsId"));
if (TextUtils.equals("销售流程", getIntent().getStringExtra("orderType"))) {
if (TextUtils.equals("销售订单", getIntent().getStringExtra("orderType"))) {
param.put("processCode", "SO");
} else {
param.put("processCode", "PO");
......@@ -155,7 +155,7 @@ public class WorkFinancialLogisticsProActivity extends WorkToolBarActivity {
startActivity(WorkFinancialLogisticsSubmitActivity.class, "info", JSON.toJSONString(info),
"receiveDeptId", getIntent().getStringExtra("depId"),
"logisticsId", getIntent().getStringExtra("logisticsId"),
"processCode", TextUtils.equals("销售流程", getIntent().getStringExtra("orderType")) ? "SO" : "PO");
"processCode", TextUtils.equals("销售订单", getIntent().getStringExtra("orderType")) ? "SO" : "PO");
}
@Override
public void onStart() {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseOrderSearchActivity.java
浏览文件 @ 5eb57e94
......@@ -8,7 +8,6 @@ import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.qmuiteam.qmui.util.QMUIDisplayHelper;
import com.qmuiteam.qmui.widget.popup.QMUIPopup;
......@@ -93,7 +92,7 @@ public class WorkWarehouseOrderSearchActivity extends WorkBaseActivity implement
workProductAdapter = new WorkWarehouseOrderAdapter(R.layout.item_work_warehouse_order, dataList);
workProductAdapter.bindToRecyclerView(rvData);
workProductAdapter.setEmptyView(R.layout.view_empty_content, rvData);
filterBaseAdapter = new FilterBaseAdapter(Config.warehouseStatusList);
filterBaseAdapter = new FilterBaseAdapter(Config.WAREHOUSE_STATUS_LIST);
popup = topPopInit(this);
}
......@@ -178,11 +177,11 @@ public class WorkWarehouseOrderSearchActivity extends WorkBaseActivity implement
(parent, view, position, id) -> {
filterBaseAdapter.setChoosePos(position);
filterBaseAdapter.notifyDataSetChanged();
tvType.setText(Config.warehouseStatusList.get(position));
tvType.setText(Config.WAREHOUSE_STATUS_LIST.get(position));
popup.dismiss();
page = 1;
param.put("current", page);
param.put("orderType", Config.warehouseCodeList.get(position));
param.put("orderType", Config.WAREHOUSE_CODE_LIST.get(position));
workProPresenter.getOrder(param);
})
.animStyle(QMUIPopup.ANIM_GROW_FROM_CENTER)
......
app/src/main/java/com/wd/workoffice/ui/activity/user/UserMoneyDetailActivity.java
浏览文件 @ 5eb57e94
......@@ -6,6 +6,7 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
......@@ -13,6 +14,7 @@ import com.wd.workoffice.bean.FlowBean;
import com.wd.workoffice.bean.UserMoneyBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.bat.work.WorkAccountFlowDetailActivity;
import com.wd.workoffice.ui.adapter.WorkFlowAdapter;
import com.wd.workoffice.util.MathUtils;
import com.wd.workoffice.util.PickTimeUtils;
......@@ -186,8 +188,15 @@ public class UserMoneyDetailActivity extends WorkToolBarActivity {
@Override
protected void initEvent() {
clientAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkAccountFlowDetailActivity.class,"detail",JSON.toJSONString(clientList.get(position)));
}
});
}
@Override
protected int layoutId() {
return R.layout.activity_user_money_detail;
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkFlowAdapter.java
浏览文件 @ 5eb57e94
......@@ -29,7 +29,7 @@ public class WorkFlowAdapter extends BaseQuickAdapter<FlowBean.RecordsBean, Base
helper.setText(R.id.tv_price, MathUtils.converData(item.getMoney(),3));
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_desc, item.getDisplayTypeName());
helper.setText(R.id.tv_dep, item.getDeptName());
helper.setText(R.id.tv_dep, item.getCustomerName());
}
}
app/src/main/java/com/wd/workoffice/util/ddmfilter/ProFilterData.java
浏览文件 @ 5eb57e94
......@@ -144,7 +144,7 @@ public class ProFilterData {
return;
}
JSONObject all = new JSONObject();
all.put("name", "全部流程");
all.put("name", "全部");
all.put("subKey", "");
processDataList.add(all);
processDataList.addAll(JSON.parseArray(data.getData().toString(), JSONObject.class));
......
app/src/main/java/com/wd/workoffice/util/ddmfilter/StockDetailFilterData.java
浏览文件 @ 5eb57e94
......@@ -9,7 +9,6 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkApp;
import com.wd.workoffice.bean.listener.OneMenuClickListener;
import com.wd.workoffice.bean.listener.ThreeMenuClickListener;
import com.wd.workoffice.ui.adapter.FilterAdapter;
import com.wd.workoffice.widget.DropDownMenu;
......@@ -49,7 +48,7 @@ public class StockDetailFilterData {
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(Config.warehouseStatusList, 1);
addTabView(Config.WAREHOUSE_STATUS_LIST, 1);
menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
}
......@@ -63,7 +62,7 @@ public class StockDetailFilterData {
filterAdapter.setOnItemClickListener((adapter, v, position) -> {
filterAdapter.setChoosePos(position);
menu.setTabText(dataList.get(position));
listener.click(Config.warehouseCodeList.get(position));
listener.click(Config.WAREHOUSE_CODE_LIST.get(position));
menu.closeMenu();
filterAdapter.notifyDataSetChanged();
});
......
app/src/main/java/com/wd/workoffice/util/ddmfilter/WarehouseOrderFilterData.java
浏览文件 @ 5eb57e94
......@@ -8,7 +8,6 @@ import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.app.Config;
import com.wd.workoffice.app.WorkApp;
import com.wd.workoffice.bean.listener.WarehouseFilterClickListener;
import com.wd.workoffice.bean.listener.WarehouseOrderFilterClickListener;
import com.wd.workoffice.ui.adapter.FilterAdapter;
import com.wd.workoffice.widget.DropDownMenu;
......@@ -50,7 +49,7 @@ public class WarehouseOrderFilterData {
srlRefresh = mainView.findViewById(R.id.srl_refresh);
rvData.setLayoutManager(new LinearLayoutManager(context, RecyclerView.VERTICAL, false));
viewList = new ArrayList<>();
addTabView(Config.warehouseStatusList, 1);
addTabView(Config.WAREHOUSE_STATUS_LIST, 1);
menu.setDropDownMenu(Arrays.asList(TABLIST), viewList, mainView);
}
......@@ -65,7 +64,7 @@ public class WarehouseOrderFilterData {
filterAdapter.setChoosePos(position);
menu.setTabText(dataList.get(position));
if (listener != null) {
listener.clickType(Config.warehouseCodeList.get(position));
listener.clickType(Config.WAREHOUSE_CODE_LIST.get(position));
}
menu.closeMenu();
filterAdapter.notifyDataSetChanged();
......
app/src/main/res/layout/activity_contacts_get_money.xml
浏览文件 @ 5eb57e94
......@@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="所属流程"
android:text="所属订单"
android:textColor="@color/flexible_text_gray"
android:textSize="11sp" />
......
app/src/main/res/layout/activity_logistics_add.xml
浏览文件 @ 5eb57e94
......@@ -160,7 +160,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="选择流程"
android:text="所属订单"
android:textSize="16sp" />
</LinearLayout>
......@@ -177,7 +177,7 @@
android:layout_height="wrap_content"
android:gravity="right"
android:singleLine="true"
android:text="选择流程"
android:text="选择订单类型"
android:textSize="15sp"
android:textStyle="bold" />
......
app/src/main/res/layout/activity_work_contacts_info.xml
浏览文件 @ 5eb57e94
......@@ -165,7 +165,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="所属流程"
android:text="所属订单"
android:textSize="16sp" />
<TextView
......
app/src/main/res/layout/activity_work_financial_out_detail.xml
浏览文件 @ 5eb57e94
......@@ -189,7 +189,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="所属流程"
android:text="所属订单"
android:textSize="14sp" />
<TextView
......
app/src/main/res/layout/activity_work_logistics_detail.xml
浏览文件 @ 5eb57e94
......@@ -132,7 +132,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="所属流程"
android:text="所属订单"
android:textSize="15sp" />
<TextView
......
app/src/main/res/layout/activity_work_pro_details.xml
浏览文件 @ 5eb57e94
......@@ -331,7 +331,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20mm"
android:text="所属流程"
android:text="所属订单"
android:textSize="16sp" />
<TextView
......
app/src/main/res/layout/item_contacts_get_money.xml
浏览文件 @ 5eb57e94
......@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="所属流程"
android:text="所属订单"
android:textColor="@color/flexible_text_gray"
android:textSize="11sp" />
......
app/src/main/res/layout/item_financial_out.xml
浏览文件 @ 5eb57e94
......@@ -104,7 +104,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="所属流程"
android:text="所属订单"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
......
app/src/main/res/layout/item_work_flow.xml
浏览文件 @ 5eb57e94
......@@ -45,6 +45,8 @@
android:id="@+id/tv_dep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/tv_time"
android:gravity="right"
android:layout_alignParentRight="true"
android:textColor="@color/flexible_text_sup"
android:textSize="12sp" />
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论