1.外采购详情添加销售方式

app/src/main/java/com/wd/workoffice/bean/OrderDetail.java

@@ -95,6 +95,15 @@ public class OrderDetail {
     private String usedStore;
     private String usedStoreName;
     private String isCrucible;//坩埚销售订单 1 坩埚销售订单
+    private String saleType;//直接销货("1") 生产领用("2")
+
+    public String getSaleType() {
+        return saleType;
+    }
+
+    public void setSaleType(String saleType) {
+        this.saleType = saleType;
+    }
 
     public String getIsCrucible() {
         return isCrucible;

app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java

 package com.wd.workoffice.ui.activity.bat.order;
 
+import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -132,6 +133,10 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
     View viewSendApply;
     @BindView(R.id.fl_send_apply)
     FrameLayout flSendApply;
+    @BindView(R.id.tv_sale_type)
+    TextView tvSaleType;
+    @BindView(R.id.ll_sale_type)
+    LinearLayout llSaleType;
     private OrderDetail dataBean;
     private List<OrderDetail.OrderFlowsBean> flowList;
     private OrderProcessAdapter flowAdapter;
@@ -242,6 +247,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
                 tvTime.setText(dataBean.getCreatedTime());
                 tvSendTime.setText(dataBean.getRequireTime());
                 tvOrderDesc.setText(dataBean.getAttrName());
+                tvSaleType.setText(TextUtils.equals(dataBean.getSaleType(),"1")?"直接销货":"生产领用");
                 tvPrice.setText(MathUtils.converData(dataBean.getLaunchOrderAmount(), 3));
                 tvSupplier.setText(dataBean.getSupplierName());
                 OrderDetail.ExpandInfoBean expandInfo = dataBean.getExpandInfo();
@@ -252,6 +258,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
                 tvClaim5.setText(expandInfo.getDemond3());
                 tvClaim6.setText(expandInfo.getComments());
 
+
                 tvDesc.setText(dataBean.getAttrName());
                 tvStatus.setText(dataBean.getStatusName());
                 getProCheckStatus(dataBean.getId());
@@ -696,13 +703,15 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
             }
         });
     }
+
     @Override
     protected void onResume() {
         super.onResume();
-        if (null!=dataBean){//刷新红点
+        if (null != dataBean) {//刷新红点
             getProCheckStatus(dataBean.getId());
         }
     }
+
     @Override
     public void onStart() {
         super.onStart();

app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleConfirmActivity.java

@@ -574,11 +574,4 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
                 });
     }
 
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
-    }
 }

app/src/main/res/layout/activity_out_order.xml

@@ -549,6 +549,28 @@
                     android:text="订单要求"
                     android:textSize="15sp" />
             </LinearLayout>
+            <LinearLayout
+                android:id="@+id/ll_sale_type"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="18mm"
+                    android:paddingVertical="10mm"
+                    android:text="处理方式:"
+                    android:textSize="16sp" />
+
+                <TextView
+                    android:id="@+id/tv_sale_type"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="20mm"
+                    android:background="@drawable/shape_confirm_order"
+                    android:paddingVertical="5mm" />
+            </LinearLayout>
 
             <TextView
                 android:layout_width="wrap_content"