Skip to content

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

1.领用修改 

2.//TODO 设备三个子菜单，退件详情（审核历史（缺接口））,领用申请列表（数据不对），坩埚下单，mes其他页面，编辑任务担当无法修改.支数参数
上级 8c63faeb
隐藏空白字符变更
内嵌 并排
正在显示 包含 43 行增加 和 14 行删除
app/src/main/java/com/wd/workoffice/retrofit/ApiService.java
浏览文件 @ fa268c5f
......@@ -1335,6 +1335,13 @@ public interface ApiService {
*/
@GET("/useApply/ao/page/list")
Observable<BaseBean> useAoApply(@QueryMap Map<String, Object> param);
/**
* step8_1-领用申请分页查询
*
* @return
*/
@GET("/useApply/po/page/list")
Observable<BaseBean> usePoApply(@QueryMap Map<String, Object> param);
/**
* step8_3-领用申请审核
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ fa268c5f
......@@ -268,10 +268,12 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_get:
startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "",
"num", proList.get(position).getCanOutStoreProductSum() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ fa268c5f
......@@ -225,10 +225,12 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_get:
startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "",
"num", proList.get(position).getCanOutStoreProductSum() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ fa268c5f
......@@ -276,10 +276,12 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_get:
startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "",
"num", proList.get(position).getCanOutStoreProductSum() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProductOrderDetailActivity.java
浏览文件 @ fa268c5f
......@@ -149,6 +149,7 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ fa268c5f
......@@ -254,10 +254,12 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_get:
startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "",
"num", proList.get(position).getCanOutStoreProductSum() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ fa268c5f
......@@ -242,10 +242,12 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
case R.id.tv_get:
startActivity(UseApplyActivity.class,
"status", dataBean.getStatus() + "",
"num", proList.get(position).getCanOutStoreProductSum() + "",
"orderType", dataBean.getExpandInfo().getOrderType(),
"num", proList.get(position).getCanUseProductSum() + "",
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_add:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/UseApplyActivity.java
浏览文件 @ fa268c5f
......@@ -60,6 +60,7 @@ public class UseApplyActivity extends WorkToolBarActivity {
bundle.putString("orderType", getIntent().getStringExtra("orderType"));
bundle.putString("simpleCode", getIntent().getStringExtra("simpleCode"));
bundle.putString("product", getIntent().getStringExtra("product"));
bundle.putString("orderItemId", getIntent().getStringExtra("orderItemId"));
saleFragment.setArguments(bundle);
data.add(saleFragment);
......@@ -83,15 +84,21 @@ public class UseApplyActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
String orderType = getIntent().getStringExtra("orderType");
String num = getIntent().getStringExtra("num");
if (Double.valueOf(num) == 0d) {
return super.onCreateOptionsMenu(menu);
}
if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
if (!WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_SAVE.getPermission())) {
if (WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
if (TextUtils.equals(getIntent().getStringExtra("status"), "600")) {
if (!WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
if (WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.PO_USE_APPLY_SAVE.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
}
return super.onCreateOptionsMenu(menu);
......
app/src/main/java/com/wd/workoffice/ui/fg/UseApplyFragment.java
浏览文件 @ fa268c5f
......@@ -59,7 +59,7 @@ public class UseApplyFragment extends WorkBaseFg {
private Map<String, Object> param;
private UseApplyAdapter dataAdapter;
private List<UseApplyBean.RecordsBean> dataList;
private String simpleCode;
private String orderItemId;
private String product;
private String orderType;
private String productId;
......@@ -75,8 +75,8 @@ public class UseApplyFragment extends WorkBaseFg {
protected void initData() {
param = WorkUtils.pageKey();
param.put("status", state);
param.put("simpleCode", simpleCode);
param.put("product", product);
param.put("orderItemId", orderItemId);
param.put("productId", productId);
page = 1;
param.put("current", page);
dataList = new ArrayList<>();
......@@ -93,7 +93,7 @@ public class UseApplyFragment extends WorkBaseFg {
Bundle arguments = getArguments();
if (arguments != null) {
state = arguments.getString("state");
simpleCode = arguments.getString("simpleCode");
orderItemId = arguments.getString("orderItemId");
product = arguments.getString("product");
orderType = arguments.getString("orderType");
productId = arguments.getString("productId");
......@@ -106,6 +106,8 @@ public class UseApplyFragment extends WorkBaseFg {
hasPermission =WorkUtils.hasPermission(PagePermissionType.SO_USE_APPLY_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.AO_USE_APPLY_AUDIT.getPermission());
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
hasPermission =WorkUtils.hasPermission(PagePermissionType.PO_USE_APPLY_AUDIT.getPermission());
}
dataAdapter.setHasPermission(hasPermission);
dataAdapter.notifyDataSetChanged();
......@@ -117,6 +119,8 @@ public class UseApplyFragment extends WorkBaseFg {
observable = RtfUtils.getRtf().useApply(param);
} else if (TextUtils.equals(orderType, OrderType.BUILD.getCode())) {
observable = RtfUtils.getRtf().useAoApply(param);
} else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
observable = RtfUtils.getRtf().usePoApply(param);
} else {
observable = RtfUtils.getRtf().useApply(param);
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论