Skip to content

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

1.仓库 校队 

2.//TODO erp用户激活，忘记密码测试，产品下单还差附件，bat，mes，消息，我的，刷新token
上级 d2302201
隐藏空白字符变更
内嵌 并排
正在显示 包含 330 行增加 和 98 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 5e2028ff
......@@ -512,6 +512,22 @@
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkWarehouseStockDetailSearchActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.work.WorkWarehouseStockNumActivity"
android:configChanges="keyboardHidden|orientation"
android:label="库存数量详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider"
......@@ -525,5 +541,4 @@
android:name="design_width_in_dp"
android:value="375" />
</application>
</manifest>
\ No newline at end of file
app/src/main/java/com/wd/workoffice/app/Config.java
浏览文件 @ 5e2028ff
......@@ -13,6 +13,10 @@ public interface Config {
"供应订单", "坩埚订单", "内部交易订单", "组装订单");
List<String> warehouseCodeList = Arrays.asList("", "SO", "PO",
"FO", "CO", "IO", "AO");
List<String> STOCK_FLOW_TYPE = Arrays.asList("全部类型", "出库", "入库",
"冻结", "解冻", "解冻出库");
List<String> STOCK_FLOW_TYPE_CODE = Arrays.asList("", "20", "10",
"21", "11", "22");
int MAIN_NOTICE_TURNING = 4 * 1000;
int SPLASH_TIME = 4 * 1000;
......
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ 5e2028ff
......@@ -470,4 +470,12 @@ public interface ApiService {
@GET("/stockQuantityFlow/page/list")
Observable<BaseBean> stockFlow(@QueryMap Map<String, Object> param);
/**
* 库存数量明细流水
*
* @return
*/
@GET("/stockQuantityDetailFlow/page/list")
Observable<BaseBean> stockDetailFlow(@QueryMap Map<String, Object> param);
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseOrderSearchActivity.java
浏览文件 @ 5e2028ff
......@@ -93,7 +93,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();
filterBaseAdapter = new FilterBaseAdapter(Config.warehouseStatusList);
popup = topPopInit(this);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockActivity.java
浏览文件 @ 5e2028ff
package com.wd.workoffice.ui.activity.bat.work;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
......@@ -131,19 +130,19 @@ public class WorkWarehouseStockActivity extends WorkToolBarActivity {
getData();
}
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch (view.getId()){
case R.id.tv_num:
startActivity(WorkWarehouseStockNumActivity.class,"detail",
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
switch (view.getId()) {
case R.id.ll_num:
startActivity(WorkWarehouseStockNumActivity.class, "detail",
JSON.toJSONString(dataList.get(position)));
break;
case R.id.tv_detail:
startActivity(WorkWarehouseStockDetailActivity.class,"id",dataList.get(position).getId()+"");
startActivity(WorkWarehouseStockDetailActivity.class, "id", dataList.get(position).getId() + "");
break;
case R.id.tv_flow:
startActivity(WorkWarehouseStockFlowActivity.class,"id",dataList.get(position).getId()+"");
startActivity(WorkWarehouseStockFlowActivity.class, "id", dataList.get(position).getId() + "");
break;
}
}
......@@ -165,7 +164,8 @@ public class WorkWarehouseStockActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.search:
startActivity(WorkWarehouseStockSearchActivity.class,"id",getIntent().getStringExtra("id"));
startActivity(WorkWarehouseStockSearchActivity.class,
"id", getIntent().getStringExtra("id"));
break;
}
return super.onOptionsItemSelected(item);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockDetailActivity.java
浏览文件 @ 5e2028ff
......@@ -127,10 +127,10 @@ public class WorkWarehouseStockDetailActivity extends WorkToolBarActivity {
param.put("current", page);
getData();
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkWarehouseStockDetailFlowActivity.class, "id", dataList.get(position).getId()+"");
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkWarehouseStockDetailFlowActivity.class, "id", dataList.get(position).getId() + "");
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockDetailFlowActivity.java
浏览文件 @ 5e2028ff
......@@ -69,13 +69,13 @@ public class WorkWarehouseStockDetailFlowActivity extends WorkToolBarActivity {
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
param.put("sqId", getIntent().getStringExtra("id"));
param.put("sqdId", getIntent().getStringExtra("id"));
param.put("current", page);
getData();
}
private void getData() {
RtfUtils.getRtf().stockFlow(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
RtfUtils.getRtf().stockDetailFlow(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockDetailFlowDetailActivity.java
浏览文件 @ 5e2028ff
......@@ -44,8 +44,8 @@ public class WorkWarehouseStockDetailFlowDetailActivity extends WorkToolBarActiv
dataBean = JSON.parseObject(getIntent().getStringExtra("detail"), StockFlowBean.RecordsBean.class);
tvNo.setText(dataBean.getLinkSerialNumber());
tvFlowType.setText(dataBean.getTypeName());
tvMoveNum.setText(MathUtils.converData(dataBean.getQuantity(), 2));
tvBalance.setText(MathUtils.converData(dataBean.getAfterOver(), 2));
tvMoveNum.setText(MathUtils.converData(dataBean.getQuantity(), 3));
tvBalance.setText(MathUtils.converData(dataBean.getAfterOver(), 3));
tvRemark.setText(dataBean.getOptComment());
tvOperating.setText(dataBean.getOptUserName());
tvTime.setText(dataBean.getCreatedTime());
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockDetailSearchActivity.java
浏览文件 @ 5e2028ff
......@@ -12,6 +12,7 @@ import com.wd.workoffice.WarehouseStockBean;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.InStockBean;
import com.wd.workoffice.bean.StockDetailBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkInStockAdapter;
......@@ -51,7 +52,7 @@ public class WorkWarehouseStockDetailSearchActivity extends WorkBaseActivity {
SmartRefreshLayout srlRefresh;
private int page = 1;
private Map<String, Object> param;
private List<WarehouseStockBean.RecordsBean> dataList;
private List<StockDetailBean.RecordsBean> dataList;
private WorkStockDetailAdapter dataAdapter;
@Override
......@@ -66,7 +67,7 @@ public class WorkWarehouseStockDetailSearchActivity extends WorkBaseActivity {
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new WorkStockDetailAdapter(R.layout.item_work_in_stock, dataList);
dataAdapter = new WorkStockDetailAdapter(R.layout.item_stock_detail, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
......@@ -94,7 +95,7 @@ public class WorkWarehouseStockDetailSearchActivity extends WorkBaseActivity {
toast(data.getMessage());
return;
}
List<WarehouseStockBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), WarehouseStockBean.class).getRecords();
List<StockDetailBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), StockDetailBean.class).getRecords();
if (page == 1) {
srlRefresh.finishRefresh();
......@@ -127,9 +128,10 @@ public class WorkWarehouseStockDetailSearchActivity extends WorkBaseActivity {
param.put("current", page);
getData();
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(WorkWarehouseStockDetailFlowActivity.class, "id", dataList.get(position).getId() + "");
}
});
}
......@@ -145,7 +147,7 @@ public class WorkWarehouseStockDetailSearchActivity extends WorkBaseActivity {
public void onViewClicked() {
page = 1;
param.put("current", page);
param.put("searchValue", etKey.getText().toString());
param.put("orderId", etKey.getText().toString());
getData();
}
}
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockFlowActivity.java
浏览文件 @ 5e2028ff
......@@ -79,7 +79,7 @@ public class WorkWarehouseStockFlowActivity extends WorkToolBarActivity {
dataAdapter = new WorkStockFlowAdapter(R.layout.item_stock_flow, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
filterBaseAdapter = new FilterBaseAdapter();
filterBaseAdapter = new FilterBaseAdapter(Config.STOCK_FLOW_TYPE);
popup = topPopInit(this);
param = WorkUtils.pageKey();
param.put("sqId", getIntent().getStringExtra("id"));
......@@ -167,11 +167,11 @@ public class WorkWarehouseStockFlowActivity extends WorkToolBarActivity {
(parent, view, position, id) -> {
filterBaseAdapter.setChoosePos(position);
filterBaseAdapter.notifyDataSetChanged();
tvType.setText(Config.warehouseStatusList.get(position));
tvType.setText(Config.STOCK_FLOW_TYPE.get(position));
popup.dismiss();
page = 1;
param.put("current", page);
param.put("orderType", Config.warehouseCodeList.get(position));
param.put("type", Config.STOCK_FLOW_TYPE_CODE.get(position));
getData();
})
.animStyle(QMUIPopup.ANIM_GROW_FROM_CENTER)
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockFlowDetailActivity.java
浏览文件 @ 5e2028ff
......@@ -12,7 +12,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
/**
* 工作台 - 部门
* 工作台 - 部门 -流水详情
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
......@@ -58,8 +58,8 @@ public class WorkWarehouseStockFlowDetailActivity extends WorkToolBarActivity {
tvProName.setText(dataBean.getProductName());
tvFromStock.setText(dataBean.getOriginStockName());
tvTargetStock.setText(dataBean.getTargetStockName());
tvMoveNum.setText(MathUtils.converData(dataBean.getQuantity(), 2));
tvBalance.setText(MathUtils.converData(dataBean.getAfterOver(), 2));
tvMoveNum.setText(MathUtils.converData(dataBean.getQuantity(), 3));
tvBalance.setText(MathUtils.converData(dataBean.getAfterOver(), 3));
tvRemark.setText(dataBean.getOptComment());
tvOperating.setText(dataBean.getOptUserName());
tvTime.setText(dataBean.getCreatedTime());
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkWarehouseStockSearchActivity.java
浏览文件 @ 5e2028ff
......@@ -8,12 +8,14 @@ import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
import com.wd.workoffice.R;
import com.wd.workoffice.WarehouseStockBean;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.InStockBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.WorkInStockAdapter;
import com.wd.workoffice.ui.adapter.WorkWarhosutStockAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
......@@ -49,8 +51,8 @@ public class WorkWarehouseStockSearchActivity extends WorkBaseActivity {
SmartRefreshLayout srlRefresh;
private int page = 1;
private Map<String, Object> param;
private List<InStockBean.RecordsBean> dataList;
private WorkInStockAdapter dataAdapter;
private List<WarehouseStockBean.RecordsBean> dataList;
private WorkWarhosutStockAdapter dataAdapter;
@Override
protected void initView() {
......@@ -64,7 +66,7 @@ public class WorkWarehouseStockSearchActivity extends WorkBaseActivity {
@Override
protected void initData() {
dataList = new ArrayList<>();
dataAdapter = new WorkInStockAdapter(R.layout.item_work_in_stock, dataList);
dataAdapter = new WorkWarhosutStockAdapter(R.layout.item_work_warehoust_stock, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
param = WorkUtils.pageKey();
......@@ -92,8 +94,7 @@ public class WorkWarehouseStockSearchActivity extends WorkBaseActivity {
toast(data.getMessage());
return;
}
List<InStockBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), InStockBean.class).getRecords();
List<WarehouseStockBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), WarehouseStockBean.class).getRecords();
if (page == 1) {
srlRefresh.finishRefresh();
dataList.clear();
......@@ -125,9 +126,21 @@ public class WorkWarehouseStockSearchActivity extends WorkBaseActivity {
param.put("current", page);
getData();
}, rvData);
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
switch (view.getId()) {
case R.id.ll_num:
startActivity(WorkWarehouseStockNumActivity.class, "detail",
JSON.toJSONString(dataList.get(position)));
break;
case R.id.tv_detail:
startActivity(WorkWarehouseStockDetailActivity.class, "id", dataList.get(position).getId() + "");
break;
case R.id.tv_flow:
startActivity(WorkWarehouseStockFlowActivity.class, "id", dataList.get(position).getId() + "");
break;
}
}
});
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/FilterBaseAdapter.java
浏览文件 @ 5e2028ff
......@@ -22,14 +22,20 @@ import java.util.List;
public class FilterBaseAdapter extends BaseAdapter {
int choosePos = 0;
List<String> dataList;
public FilterBaseAdapter(List<String> dataList) {
this.dataList = dataList;
}
@Override
public int getCount() {
return Config.warehouseStatusList.size();
return dataList.size();
}
@Override
public Object getItem(int position) {
return Config.warehouseStatusList.get(position);
return dataList.get(position);
}
@Override
......@@ -53,7 +59,7 @@ public class FilterBaseAdapter extends BaseAdapter {
getColor(R.color.flexible_text_color));
result.setBackgroundColor(Color.WHITE);
}
result.setText(Config.warehouseStatusList.get(position));
result.setText(dataList.get(position));
return convertView;
}
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkStockDetailFlowAdapter.java
浏览文件 @ 5e2028ff
......@@ -21,9 +21,9 @@ public class WorkStockDetailFlowAdapter extends BaseQuickAdapter<StockFlowBean.R
@Override
protected void convert(BaseViewHolder helper, StockFlowBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getOrderId());
helper.setText(R.id.tv_move, MathUtils.converData(item.getAfterOver(),2));
helper.setText(R.id.tv_balance, MathUtils.converData(item.getQuantity(),2));
helper.setText(R.id.tv_name, item.getLinkSerialNumber());
helper.setText(R.id.tv_move, MathUtils.converData(item.getQuantity(),3));
helper.setText(R.id.tv_balance, MathUtils.converData(item.getAfterOver(),3));
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_flow_type, item.getTypeName());
helper.addOnClickListener(R.id.tv_flow);
......
app/src/main/java/com/wd/workoffice/ui/adapter/WorkStockFlowAdapter.java
浏览文件 @ 5e2028ff
......@@ -20,8 +20,8 @@ public class WorkStockFlowAdapter extends BaseQuickAdapter<StockFlowBean.Records
@Override
protected void convert(BaseViewHolder helper, StockFlowBean.RecordsBean item) {
helper.setText(R.id.tv_name, item.getOrderId());
helper.setText(R.id.tv_order_no, item.getLinkSerialNumber());
helper.setText(R.id.tv_name, item.getLinkSerialNumber());
helper.setText(R.id.tv_order_no, item.getOrderId());
helper.setText(R.id.tv_time, item.getCreatedTime());
helper.setText(R.id.tv_flow_type, item.getTypeName());
helper.addOnClickListener(R.id.tv_flow);
......
app/src/main/java/com/wd/workoffice/util/MathUtils.java
浏览文件 @ 5e2028ff
......@@ -4,6 +4,7 @@ import android.text.TextUtils;
import android.util.Log;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Arrays;
import freemarker.template.utility.CollectionUtils;
......@@ -79,7 +80,7 @@ public class MathUtils {
value = "0";
}
BigDecimal bg = new BigDecimal(value);
return bg.setScale(scale).toString();
return bg.setScale(scale,RoundingMode.HALF_UP).toString();
}
public static String converData(double value, Integer scale) {
......@@ -90,7 +91,7 @@ public class MathUtils {
strValue = String.valueOf(value);
}
BigDecimal bg = new BigDecimal(strValue);
return bg.setScale(scale).toString();
return bg.setScale(scale,RoundingMode.HALF_UP).toString();
}
......
app/src/main/java/com/wd/workoffice/util/ddmfilter/StockDetailFilterData.java
浏览文件 @ 5e2028ff
......@@ -32,7 +32,7 @@ public class StockDetailFilterData {
private SmartRefreshLayout srlRefresh;
OneMenuClickListener listener;
String[] TABLIST = new String[]{"订单类型", "区分", "状态"};
String[] TABLIST = new String[]{"订单类型"};
public StockDetailFilterData(DropDownMenu menu, OneMenuClickListener listener) {
this.menu = menu;
......
app/src/main/res/layout/activity_warehouse_stock_detail_search.xml
浏览文件 @ 5e2028ff
......@@ -37,7 +37,7 @@
android:textSize="14sp" />
<TextView
android:id="@+id/iv_search"
android:id="@+id/tv_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
......
app/src/main/res/layout/activity_warehouse_stock_search.xml
浏览文件 @ 5e2028ff
......@@ -37,7 +37,7 @@
android:textSize="14sp" />
<TextView
android:id="@+id/iv_search"
android:id="@+id/tv_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
......
app/src/main/res/layout/activity_work_detail_stock_flow.xml
浏览文件 @ 5e2028ff
......@@ -6,52 +6,37 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:paddingVertical="5mm">
android:layout_height="wrap_content"
android:background="@android:color/white"
android:gravity="center">
<TextView
android:id="@+id/tv_type"
android:layout_width="100mm"
android:id="@+id/tv_start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@mipmap/arrow_down"
android:gravity="center_vertical"
android:text="全部类型"
android:textColor="@color/flexible_text_gray"
android:paddingVertical="13mm"
android:text="开始时间"
android:textSize="13sp" />
<LinearLayout
android:layout_width="0dp"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
<TextView
android:id="@+id/tv_start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@mipmap/arrow_down"
android:gravity="center_vertical"
android:paddingVertical="13mm"
android:text="开始时间"
android:textSize="13sp" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="~" />
android:layout_marginHorizontal="40mm"
android:gravity="center_vertical"
android:text="~" />
<TextView
android:id="@+id/tv_end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@mipmap/arrow_down"
android:gravity="center_vertical"
android:paddingVertical="13mm"
android:text="结束时间"
android:textSize="13sp" />
</LinearLayout>
<TextView
android:id="@+id/tv_end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@mipmap/arrow_down"
android:gravity="center_vertical"
android:paddingVertical="13mm"
android:text="结束时间"
android:textSize="13sp" />
</LinearLayout>
<com.scwang.smartrefresh.layout.SmartRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
......
app/src/main/res/layout/activity_work_stock_flow.xml
浏览文件 @ 5e2028ff
......@@ -6,16 +6,17 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:paddingVertical="5mm">
android:layout_height="wrap_content"
android:background="@android:color/white"
android:gravity="center">
<TextView
android:id="@+id/tv_type"
android:layout_width="100mm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableRight="@mipmap/arrow_down"
android:gravity="center_vertical"
android:paddingHorizontal="15mm"
android:text="全部类型"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
......@@ -23,6 +24,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:layout_weight="1">
<TextView
......
app/src/main/res/layout/activity_work_warehouse_order_detail.xml 0 → 100644
浏览文件 @ 5e2028ff
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:orientation="vertical"
android:paddingBottom="20mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10mm">
<View
android:layout_width="8mm"
android:layout_height="18mm"
android:background="@color/red_btn_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:text="基本信息"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="单位名称"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_company_name"
android:layout_width="0dp"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:gravity="right"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</LinearLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="联系人"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_link_man"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="联系电话"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_link_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:gravity="center"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="地址"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_address"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:textColor="@color/flexible_text_gray"
android:textSize="16sp"
/>
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="15mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="所属流程"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_process"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="销售二公司"
android:layout_marginTop="5mm"
android:textColor="@color/flexible_text_gray"
/>
</LinearLayout>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
app/src/main/res/layout/item_stock_detail.xml
浏览文件 @ 5e2028ff
......@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical">
......@@ -87,6 +88,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="查看流水>"
android:textSize="12sp"
android:textColor="@color/flexible_text_gray" />
</LinearLayout>
......
app/src/main/res/layout/item_stock_detail_flow.xml
浏览文件 @ 5e2028ff
......@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical">
......@@ -64,8 +65,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="期末结余："
android:layout_marginLeft="10mm"
android:text="期末结余："
android:textColor="@color/flexible_text_gray"
android:textSize="12sp" />
......
app/src/main/res/layout/item_stock_flow.xml
浏览文件 @ 5e2028ff
......@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@color/white"
android:orientation="vertical">
......
app/src/main/res/layout/item_work_warehoust_stock.xml
浏览文件 @ 5e2028ff
......@@ -49,13 +49,14 @@
</LinearLayout>
<LinearLayout
android:id="@+id/ll_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<LinearLayout
android:id="@+id/ll_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
......@@ -72,16 +73,16 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5mm"
android:layout_marginTop="3mm"
android:text="库存数量"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8mm"
android:layout_width="15mm"
android:layout_height="15mm"
android:layout_marginLeft="3mm"
android:src="@mipmap/arrow_right_my" />
</LinearLayout>
</RelativeLayout>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论