Skip to content

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

1.内部下单显示新字段

上级 d3247444
显示空白字符变更
内嵌 并排
正在显示 包含 124 行增加 和 13 行删除
app/src/main/java/com/wd/workoffice/bean/OrderDetail.java
浏览文件 @ 463a07a1
......@@ -96,6 +96,24 @@ public class OrderDetail {
private String usedStoreName;
private String isCrucible;//坩埚销售订单 1 坩埚销售订单
private String saleType;//直接销货("1") 生产领用("2")
private String type;
private String businessFormat;
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getBusinessFormat() {
return businessFormat;
}
public void setBusinessFormat(String businessFormat) {
this.businessFormat = businessFormat;
}
public String getSaleType() {
return saleType;
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ 463a07a1
package com.wd.workoffice.ui.activity.bat.order;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
......@@ -111,6 +112,14 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
View viewSendApply;
@BindView(R.id.fl_send_apply)
FrameLayout flSendApply;
@BindView(R.id.tv_pick_apply)
TextView tvPickApply;
@BindView(R.id.view_pick_apply)
View viewPickApply;
@BindView(R.id.fl_pick_apply)
FrameLayout flPickApply;
@BindView(R.id.tv_order_type)
TextView tvOrderType;
private OrderDetail dataBean;
private List<OrderDetail.OrderFlowsBean> flowList;
private OrderProcessAdapter flowAdapter;
......@@ -269,6 +278,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
tvOrderDesc.setText(dataBean.getAttrName());
tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(), 3));
tvOrderType.setText(WorkUtils.getInsideOrderType(dataBean.getType(),dataBean.getBusinessFormat()));
OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
tvClaim1.setText(expandInfo.getDemond4());
......@@ -579,10 +589,11 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
}
});
}
@Override
protected void onResume() {
super.onResume();
if (null!=dataBean){//刷新红点
if (null != dataBean) {//刷新红点
getProCheckStatus(dataBean.getId());
}
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/PickApplyActivity.java
浏览文件 @ 463a07a1
......@@ -85,16 +85,11 @@ public class PickApplyActivity extends WorkToolBarActivity {
if (WorkUtils.hasPermission(PagePermissionType.FO_PICK_APPLY_LIST.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
} else if (TextUtils.equals(orderType, OrderType.IN.getCode())) {
if (WorkUtils.hasPermission(PagePermissionType.FO_PICK_APPLY_LIST.getPermission())) {
getMenuInflater().inflate(R.menu.menu_add, menu);
}
}
// else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
// if (WorkUtils.hasPermission(PagePermissionType.PO_OUT_SAVE.getPermission())) {
// getMenuInflater().inflate(R.menu.menu_add, menu);
// }
// } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
// if (WorkUtils.hasPermission(PagePermissionType.CO_OUT_SAVE.getPermission())) {
// getMenuInflater().inflate(R.menu.menu_add, menu);
// }
// }
return super.onCreateOptionsMenu(menu);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ 463a07a1
......@@ -180,9 +180,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
}
break;
case 220:
llBottom.setVisibility(View.VISIBLE);
llCheck.setVisibility(View.GONE);
llApply.setVisibility(View.GONE);
llBottom.setVisibility(View.GONE);
break;
case 300:
llBottom.setVisibility(View.VISIBLE);
......
app/src/main/java/com/wd/workoffice/ui/fg/SaleInsideFragment.java
浏览文件 @ 463a07a1
......@@ -134,6 +134,7 @@ public class SaleInsideFragment extends WorkBaseFg implements SaleSaleContract.V
orderList.addAll(dataList);
orderAdapter.notifyDataSetChanged();
orderAdapter.loadMoreComplete();
srlRefresh.finishRefresh();
} else {
orderAdapter.loadMoreComplete();
orderList.addAll(dataList);
......
app/src/main/java/com/wd/workoffice/util/WorkUtils.java
浏览文件 @ 463a07a1
......@@ -302,6 +302,7 @@ public class WorkUtils {
* 退件状态
* 10未审核 11 12 13 14已通过 21 22 23 24不通过(尾号1部门管理员 2业务部 3财务部 4集团，首数字1：通过，2:驳回)
* 15 erp审核通过
*
* @param code
* @return
*/
......@@ -915,4 +916,31 @@ public class WorkUtils {
return;
}
}
//产品生产
// type: product
// businessFormat: PD
//产品转库存
// type: product
// businessFormat: TS
//购买服务
// type: service
public static String getInsideOrderType(String type, String businessFormat) {
String returnContent = "";
switch (type) {
case "service":
returnContent = "购买服务";
break;
case "product":
if (TextUtils.equals(businessFormat,"PD")){
returnContent = "产品生产";
}else {
returnContent = "产品转库存";
}
break;
default:
break;
}
return returnContent;
}
}
app/src/main/res/layout/activity_inside_order.xml
浏览文件 @ 463a07a1
......@@ -147,6 +147,41 @@
</FrameLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="60mm"
android:gravity="center"
android:orientation="horizontal">
<FrameLayout
android:id="@+id/fl_pick_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:tag="order:fo:pick-apply:page:list"
>
<TextView
android:id="@+id/tv_pick_apply"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@drawable/shape_blue_btn"
android:paddingHorizontal="20mm"
android:paddingVertical="5mm"
android:text="申请领料"
android:textColor="@color/white" />
<View
android:id="@+id/view_pick_apply"
android:layout_width="8mm"
android:layout_height="8mm"
android:layout_gravity="right"
android:background="@drawable/shape_red_circle"
android:visibility="gone" />
</FrameLayout>
</LinearLayout>
</LinearLayout>
......@@ -325,6 +360,31 @@
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingHorizontal="10mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10mm"
android:text="订单类别"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
<TextView
android:id="@+id/tv_order_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:text="王紫逸"
android:textColor="@color/flexible_text_gray"
android:textSize="13sp" />
</RelativeLayout>
<!-- 4.下单时间 -->
<RelativeLayout
android:layout_width="match_parent"
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论