1.发货申请

2.//TODO erp用户激活测试，忘记/重置密码测试，坩埚下单页面，组装下单，产品下单还差附件测试，mes，消息，刷新token

app/src/main/AndroidManifest.xml

@@ -169,7 +169,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.sale.SaleSaleOrderActivity"
+            android:name=".ui.activity.bat.order.sale.SaleSaleOrderActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="销售订单"
             android:launchMode="singleTop"
@@ -177,7 +177,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.sale.SaleSupplierOrderActivity"
+            android:name=".ui.activity.bat.order.sale.SaleSupplierOrderActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="供应订单"
             android:launchMode="singleTop"
@@ -185,7 +185,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.sale.SaleInsideOrderActivity"
+            android:name=".ui.activity.bat.order.sale.SaleInsideOrderActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="内部订单"
             android:launchMode="singleTop"
@@ -193,7 +193,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.sale.SaleOutOrderActivity"
+            android:name=".ui.activity.bat.order.sale.SaleOutOrderActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="外采购订单"
             android:launchMode="singleTop"
@@ -201,7 +201,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.product.ProductSaleOrderActivity"
+            android:name=".ui.activity.bat.order.product.ProductSaleOrderActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="销售订单"
             android:launchMode="singleTop"
@@ -209,7 +209,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.product.ProductSupplierOrderActivity"
+            android:name=".ui.activity.bat.order.product.ProductSupplierOrderActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="供应订单"
             android:launchMode="singleTop"
@@ -217,7 +217,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.product.ProductInsideOrderActivity"
+            android:name=".ui.activity.bat.order.product.ProductInsideOrderActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="内部订单"
             android:launchMode="singleTop"
@@ -225,7 +225,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.product.ProductOutOrderActivity"
+            android:name=".ui.activity.bat.order.product.ProductOutOrderActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="外采购订单"
             android:launchMode="singleTop"
@@ -233,7 +233,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.InsideOrderSearchActivity"
+            android:name=".ui.activity.bat.order.InsideOrderSearchActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label=" "
             android:launchMode="singleTop"
@@ -241,7 +241,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.OutOrderSearchActivity"
+            android:name=".ui.activity.bat.order.OutOrderSearchActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label=" "
             android:launchMode="singleTop"
@@ -249,7 +249,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.SaleOrderSearchActivity"
+            android:name=".ui.activity.bat.order.SaleOrderSearchActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label=" "
             android:launchMode="singleTop"
@@ -257,7 +257,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.SupplierOrderSearchActivity"
+            android:name=".ui.activity.bat.order.SupplierOrderSearchActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label=" "
             android:launchMode="singleTop"
@@ -817,7 +817,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.sale.SaleProductOrderActivity"
+            android:name=".ui.activity.bat.order.sale.SaleProductOrderActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="组装订单"
             android:launchMode="singleTop"
@@ -825,7 +825,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.sale.SaleCrucibleOrderActivity"
+            android:name=".ui.activity.bat.order.sale.SaleCrucibleOrderActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="坩埚订单"
             android:launchMode="singleTop"
@@ -833,7 +833,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.CrucibleOrderSearchActivity"
+            android:name=".ui.activity.bat.order.CrucibleOrderSearchActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label=" "
             android:launchMode="singleTop"
@@ -841,7 +841,7 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.ProductOrderSearchActivity"
+            android:name=".ui.activity.bat.order.ProductOrderSearchActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label=" "
             android:launchMode="singleTop"
@@ -857,13 +857,22 @@
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".ui.activity.bat.sale.SaleOrderDetailActivity"
+            android:name=".ui.activity.bat.order.sale.SaleOrderDetailActivity"
             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.order.SendApplyActivity"
+            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"

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

+package com.wd.workoffice.bean;
+
+import java.util.List;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class SendApplyBean {
+
+    /**
+     * records : [{"createdBy":null,"createdByName":null,"createdTime":"2020-04-09 16:41:35","updatedBy":null,"updatedByName":null,"updatedTime":null,"commenceFromId":null,"createdType":null,"id":73,"orderId":"SO10761","orderType":"SO","status":"0","applyRemark":"","auditRemark":null,"serialNumber":"SDI20040916413573","deptIdList":null,"ownId":null,"trackingNumber":"3","logisticsId":44,"totalWeight":35,"fareMoney":111,"payer":"2","sendOutStoreApplyItemList":null,"createdUser":"Likai","updatedUser":null,"transitPartName":"圆通物流1","customerName":null,"stockName":null,"receiveDeptName":"铝碳公司"}]
+     * total : 1
+     * size : 10
+     * current : 1
+     * orders : []
+     * searchCount : true
+     * pages : 1
+     */
+
+    private int total;
+    private int size;
+    private int current;
+    private boolean searchCount;
+    private int pages;
+    private List<RecordsBean> records;
+    private List<?> orders;
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public int getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(int current) {
+        this.current = current;
+    }
+
+    public boolean isSearchCount() {
+        return searchCount;
+    }
+
+    public void setSearchCount(boolean searchCount) {
+        this.searchCount = searchCount;
+    }
+
+    public int getPages() {
+        return pages;
+    }
+
+    public void setPages(int pages) {
+        this.pages = pages;
+    }
+
+    public List<RecordsBean> getRecords() {
+        return records;
+    }
+
+    public void setRecords(List<RecordsBean> records) {
+        this.records = records;
+    }
+
+    public List<?> getOrders() {
+        return orders;
+    }
+
+    public void setOrders(List<?> orders) {
+        this.orders = orders;
+    }
+
+    public static class RecordsBean {
+        /**
+         * createdBy : null
+         * createdByName : null
+         * createdTime : 2020-04-09 16:41:35
+         * updatedBy : null
+         * updatedByName : null
+         * updatedTime : null
+         * commenceFromId : null
+         * createdType : null
+         * id : 73
+         * orderId : SO10761
+         * orderType : SO
+         * status : 0
+         * applyRemark :
+         * auditRemark : null
+         * serialNumber : SDI20040916413573
+         * deptIdList : null
+         * ownId : null
+         * trackingNumber : 3
+         * logisticsId : 44
+         * totalWeight : 35.0
+         * fareMoney : 111.0
+         * payer : 2
+         * sendOutStoreApplyItemList : null
+         * createdUser : Likai
+         * updatedUser : null
+         * transitPartName : 圆通物流1
+         * customerName : null
+         * stockName : null
+         * receiveDeptName : 铝碳公司
+         */
+
+        private Object createdBy;
+        private Object createdByName;
+        private String createdTime;
+        private Object updatedBy;
+        private Object updatedByName;
+        private Object updatedTime;
+        private Object commenceFromId;
+        private Object createdType;
+        private int id;
+        private String orderId;
+        private String orderType;
+        private String status;
+        private String applyRemark;
+        private Object auditRemark;
+        private String serialNumber;
+        private Object deptIdList;
+        private Object ownId;
+        private String trackingNumber;
+        private int logisticsId;
+        private double totalWeight;
+        private double fareMoney;
+        private String payer;
+        private Object sendOutStoreApplyItemList;
+        private String createdUser;
+        private Object updatedUser;
+        private String transitPartName;
+        private Object customerName;
+        private Object stockName;
+        private String receiveDeptName;
+
+        public Object getCreatedBy() {
+            return createdBy;
+        }
+
+        public void setCreatedBy(Object createdBy) {
+            this.createdBy = createdBy;
+        }
+
+        public Object getCreatedByName() {
+            return createdByName;
+        }
+
+        public void setCreatedByName(Object createdByName) {
+            this.createdByName = createdByName;
+        }
+
+        public String getCreatedTime() {
+            return createdTime;
+        }
+
+        public void setCreatedTime(String createdTime) {
+            this.createdTime = createdTime;
+        }
+
+        public Object getUpdatedBy() {
+            return updatedBy;
+        }
+
+        public void setUpdatedBy(Object updatedBy) {
+            this.updatedBy = updatedBy;
+        }
+
+        public Object getUpdatedByName() {
+            return updatedByName;
+        }
+
+        public void setUpdatedByName(Object updatedByName) {
+            this.updatedByName = updatedByName;
+        }
+
+        public Object getUpdatedTime() {
+            return updatedTime;
+        }
+
+        public void setUpdatedTime(Object updatedTime) {
+            this.updatedTime = updatedTime;
+        }
+
+        public Object getCommenceFromId() {
+            return commenceFromId;
+        }
+
+        public void setCommenceFromId(Object commenceFromId) {
+            this.commenceFromId = commenceFromId;
+        }
+
+        public Object getCreatedType() {
+            return createdType;
+        }
+
+        public void setCreatedType(Object createdType) {
+            this.createdType = createdType;
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public String getOrderId() {
+            return orderId;
+        }
+
+        public void setOrderId(String orderId) {
+            this.orderId = orderId;
+        }
+
+        public String getOrderType() {
+            return orderType;
+        }
+
+        public void setOrderType(String orderType) {
+            this.orderType = orderType;
+        }
+
+        public String getStatus() {
+            return status;
+        }
+
+        public void setStatus(String status) {
+            this.status = status;
+        }
+
+        public String getApplyRemark() {
+            return applyRemark;
+        }
+
+        public void setApplyRemark(String applyRemark) {
+            this.applyRemark = applyRemark;
+        }
+
+        public Object getAuditRemark() {
+            return auditRemark;
+        }
+
+        public void setAuditRemark(Object auditRemark) {
+            this.auditRemark = auditRemark;
+        }
+
+        public String getSerialNumber() {
+            return serialNumber;
+        }
+
+        public void setSerialNumber(String serialNumber) {
+            this.serialNumber = serialNumber;
+        }
+
+        public Object getDeptIdList() {
+            return deptIdList;
+        }
+
+        public void setDeptIdList(Object deptIdList) {
+            this.deptIdList = deptIdList;
+        }
+
+        public Object getOwnId() {
+            return ownId;
+        }
+
+        public void setOwnId(Object ownId) {
+            this.ownId = ownId;
+        }
+
+        public String getTrackingNumber() {
+            return trackingNumber;
+        }
+
+        public void setTrackingNumber(String trackingNumber) {
+            this.trackingNumber = trackingNumber;
+        }
+
+        public int getLogisticsId() {
+            return logisticsId;
+        }
+
+        public void setLogisticsId(int logisticsId) {
+            this.logisticsId = logisticsId;
+        }
+
+        public double getTotalWeight() {
+            return totalWeight;
+        }
+
+        public void setTotalWeight(double totalWeight) {
+            this.totalWeight = totalWeight;
+        }
+
+        public double getFareMoney() {
+            return fareMoney;
+        }
+
+        public void setFareMoney(double fareMoney) {
+            this.fareMoney = fareMoney;
+        }
+
+        public String getPayer() {
+            return payer;
+        }
+
+        public void setPayer(String payer) {
+            this.payer = payer;
+        }
+
+        public Object getSendOutStoreApplyItemList() {
+            return sendOutStoreApplyItemList;
+        }
+
+        public void setSendOutStoreApplyItemList(Object sendOutStoreApplyItemList) {
+            this.sendOutStoreApplyItemList = sendOutStoreApplyItemList;
+        }
+
+        public String getCreatedUser() {
+            return createdUser;
+        }
+
+        public void setCreatedUser(String createdUser) {
+            this.createdUser = createdUser;
+        }
+
+        public Object getUpdatedUser() {
+            return updatedUser;
+        }
+
+        public void setUpdatedUser(Object updatedUser) {
+            this.updatedUser = updatedUser;
+        }
+
+        public String getTransitPartName() {
+            return transitPartName;
+        }
+
+        public void setTransitPartName(String transitPartName) {
+            this.transitPartName = transitPartName;
+        }
+
+        public Object getCustomerName() {
+            return customerName;
+        }
+
+        public void setCustomerName(Object customerName) {
+            this.customerName = customerName;
+        }
+
+        public Object getStockName() {
+            return stockName;
+        }
+
+        public void setStockName(Object stockName) {
+            this.stockName = stockName;
+        }
+
+        public String getReceiveDeptName() {
+            return receiveDeptName;
+        }
+
+        public void setReceiveDeptName(String receiveDeptName) {
+            this.receiveDeptName = receiveDeptName;
+        }
+    }
+}

app/src/main/java/com/wd/workoffice/retrofit/ApiService.java

@@ -1123,5 +1123,20 @@ public interface ApiService {
      */
     @GET("/saleOrder/oneInfo/{orderId}")
     Observable<BaseBean> saleOrderDetail(@Path("orderId") String orderId, @Query("type") String type);
+    /**
+     * 获取发货申请分页列表
+     *
+     * @return
+     */
+    @GET("/send-out-store-apply/page/list")
+    Observable<BaseBean> sendApplyList(@QueryMap Map<String, Object> param);
+
+    /**
+     * 审批发货申请
+     *
+     * @return
+     */
+    @GET("/send-out-store-apply/status")
+    Observable<BaseBean> sendApplyCheck(@Body RequestBody requestBody);
 
 }

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

-package com.wd.workoffice.ui.activity.bat;
+package com.wd.workoffice.ui.activity.bat.order;
 
 import android.text.TextUtils;
 import android.view.MenuItem;

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

-package com.wd.workoffice.ui.activity.bat;
+package com.wd.workoffice.ui.activity.bat.order;
 
 import android.text.TextUtils;
 import android.view.MenuItem;

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

-package com.wd.workoffice.ui.activity.bat;
+package com.wd.workoffice.ui.activity.bat.order;
 
 import android.text.TextUtils;
 import android.view.MenuItem;

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

-package com.wd.workoffice.ui.activity.bat;
+package com.wd.workoffice.ui.activity.bat.order;
 
 import android.text.TextUtils;
 import android.view.MenuItem;

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

-package com.wd.workoffice.ui.activity.bat;
+package com.wd.workoffice.ui.activity.bat.order;
 
 import android.text.TextUtils;
 import android.view.MenuItem;

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

+package com.wd.workoffice.ui.activity.bat.order;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.google.android.material.tabs.TabLayout;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.ui.adapter.VpDataAdapter;
+import com.wd.workoffice.ui.fg.SaleSupplierFragment;
+import com.wd.workoffice.ui.fg.SendApplyFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * 发货申请列表
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class SendApplyActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.tl_tab)
+    TabLayout tlTab;
+    @BindView(R.id.vp_data)
+    ViewPager vpData;
+    private String tab[] = {
+            "待审核", "已通过", "已驳回"};
+    private String order[] = {
+            "0", "1", "2"};
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        tlTab.setupWithViewPager(vpData);
+        tlTab.setTabMode(TabLayout.MODE_FIXED);
+    }
+
+    @Override
+    protected void initData() {
+        FragmentManager sfm = getSupportFragmentManager();
+        List<Fragment> data = new ArrayList<>();
+        for (int i = 0; i < tab.length; i++) {
+            SendApplyFragment saleFragment = new SendApplyFragment();
+            Bundle bundle = new Bundle();
+            bundle.putString("state", order[i]);
+            bundle.putString("orderId", getIntent().getStringExtra("orderId"));
+            saleFragment.setArguments(bundle);
+            data.add(saleFragment);
+
+        }
+        VpDataAdapter vpFgAdapter = new VpDataAdapter(sfm, data);
+        vpData.setAdapter(vpFgAdapter);
+        for (int i = 0; i < tab.length; i++) {
+            tlTab.getTabAt(i).setText(tab[i]);
+        }
+    }
+
+    @Override
+    protected void initEvent() {
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_order;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_search, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.search:
+                startActivity(SupplierOrderSearchActivity.class, "identity", "1","","");
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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

-package com.wd.workoffice.ui.activity.bat;
+package com.wd.workoffice.ui.activity.bat.order;
 
 import android.text.TextUtils;
 import android.view.MenuItem;

app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductInsideOrderActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/product/ProductInsideOrderActivity.java

-package com.wd.workoffice.ui.activity.bat.product;
+package com.wd.workoffice.ui.activity.bat.order.product;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -7,7 +7,7 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.InsideOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.order.InsideOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.SaleInsideFragment;
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductOutOrderActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/product/ProductOutOrderActivity.java

-package com.wd.workoffice.ui.activity.bat.product;
+package com.wd.workoffice.ui.activity.bat.order.product;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -7,7 +7,7 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.OutOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.order.OutOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.ProOutFragment;
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductSaleOrderActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/product/ProductSaleOrderActivity.java

-package com.wd.workoffice.ui.activity.bat.product;
+package com.wd.workoffice.ui.activity.bat.order.product;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -7,7 +7,7 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.SaleOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.order.SaleOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.ProSaleFragment;
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/product/ProductSupplierOrderActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/product/ProductSupplierOrderActivity.java

-package com.wd.workoffice.ui.activity.bat.product;
+package com.wd.workoffice.ui.activity.bat.order.product;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -7,7 +7,7 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.SupplierOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.order.SupplierOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.ProSupplierFragment;
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleCrucibleOrderActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/sale/SaleCrucibleOrderActivity.java

-package com.wd.workoffice.ui.activity.bat.sale;
+package com.wd.workoffice.ui.activity.bat.order.sale;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -7,13 +7,10 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.CrucibleOrderSearchActivity;
-import com.wd.workoffice.ui.activity.bat.SupplierOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.order.CrucibleOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.CrucibleOrderBuyFragment;
 import com.wd.workoffice.ui.fg.CrucibleOrderSaleFragment;
-import com.wd.workoffice.ui.fg.ProductOrderApplyFragment;
-import com.wd.workoffice.ui.fg.ProductOrderFragment;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleInsideOrderActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/sale/SaleInsideOrderActivity.java

-package com.wd.workoffice.ui.activity.bat.sale;
+package com.wd.workoffice.ui.activity.bat.order.sale;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -7,7 +7,7 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.InsideOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.order.InsideOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.SaleInsideFragment;
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleOrderDetailActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/sale/SaleOrderDetailActivity.java

-package com.wd.workoffice.ui.activity.bat.sale;
+package com.wd.workoffice.ui.activity.bat.order.sale;
 
-import android.media.tv.TvContentRating;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -11,14 +10,12 @@ import com.alibaba.fastjson.JSON;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.bean.AccountBean;
 import com.wd.workoffice.bean.OrderDetail;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.bat.order.SendApplyActivity;
 import com.wd.workoffice.ui.adapter.OrderDetailProductAdapter;
 import com.wd.workoffice.ui.adapter.OrderProcessAdapter;
-import com.wd.workoffice.ui.adapter.SaleSupplierAdapter;
-import com.wd.workoffice.util.MathUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -82,18 +79,63 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
     TextView tvClaim5;
     @BindView(R.id.tv_claim6)
     TextView tvClaim6;
+    @BindView(R.id.tv_finish_apply)
+    TextView tvFinishApply;
+    @BindView(R.id.tv_send_apply)
+    TextView tvSendApply;
+    @BindView(R.id.ll_sale)
+    LinearLayout llSale;
+    @BindView(R.id.ll_check)
+    LinearLayout llCheck;
+    @BindView(R.id.ll_apply)
+    LinearLayout llApply;
     private OrderDetail dataBean;
     private List<OrderDetail.OrderFlowsBean> flowList;
     private OrderProcessAdapter flowAdapter;
     private OrderDetailProductAdapter proAdapter;
     private List<OrderDetail.OrderItemsBean> proList;
+    private Integer status;
 
     @Override
     protected void initView() {
         ButterKnife.bind(this);
         rvPro.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
         rvProcess.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
-
+        status = Integer.valueOf(getIntent().getStringExtra("status"));
+        switch (status) {
+//            private String tab[] = {
+//            "全部", "待审核", "待接单", "待生产", "已入库",
+//            "已交付"};
+//    private String order[] = {
+//            "", "100", "200", "710", "500",
+//            "600"};
+            case 100:
+                llBottom.setVisibility(View.VISIBLE);
+                llApply.setVisibility(View.VISIBLE);
+                break;
+            case 200:
+                break;
+            case 300:
+                llBottom.setVisibility(View.VISIBLE);
+                llApply.setVisibility(View.VISIBLE);
+                break;
+            case 410:
+                llBottom.setVisibility(View.VISIBLE);
+                llApply.setVisibility(View.VISIBLE);
+                break;
+            case 500:
+                llBottom.setVisibility(View.VISIBLE);
+                llApply.setVisibility(View.VISIBLE);
+                break;
+            case 600:
+                llBottom.setVisibility(View.VISIBLE);
+                llApply.setVisibility(View.VISIBLE);
+                break;
+            default:
+                llBottom.setVisibility(View.VISIBLE);
+                llApply.setVisibility(View.VISIBLE);
+                break;
+        }
     }
 
     @Override
@@ -104,7 +146,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
         flowAdapter.bindToRecyclerView(rvProcess);
         flowAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
         proList = new ArrayList<>();
-        proAdapter = new OrderDetailProductAdapter(R.layout.item_order_product, proList);
+        proAdapter = new OrderDetailProductAdapter(R.layout.item_order_product, proList, status);
         proAdapter.bindToRecyclerView(rvPro);
         proAdapter.setEmptyView(R.layout.view_empty_order, rvProcess);
     }
@@ -134,7 +176,6 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
                 flowAdapter.notifyDataSetChanged();
                 proList.addAll(dataBean.getOrderItems());
                 proAdapter.notifyDataSetChanged();
-
                 tvName.setText(dataBean.getCustomerName());
                 tvDep.setText(dataBean.getReceiveDeptName());
                 tvStatus.setText(dataBean.getStatusName());
@@ -170,14 +211,19 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
     }
 
 
-
-    @OnClick({R.id.tv_refuse, R.id.tv_agree})
+    @OnClick({R.id.tv_finish_apply, R.id.tv_send_apply, R.id.tv_refuse, R.id.tv_agree})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.tv_refuse:
                 break;
             case R.id.tv_agree:
                 break;
+            case R.id.tv_finish_apply:
+                break;
+            case R.id.tv_send_apply:
+                startActivity(SendApplyActivity.class, "orderId", getIntent().getStringExtra("id"));
+                break;
         }
     }
+
 }

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleOutOrderActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/sale/SaleOutOrderActivity.java

-package com.wd.workoffice.ui.activity.bat.sale;
+package com.wd.workoffice.ui.activity.bat.order.sale;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -7,7 +7,7 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.OutOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.order.OutOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.SaleOutFragment;
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleProductOrderActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/sale/SaleProductOrderActivity.java

-package com.wd.workoffice.ui.activity.bat.sale;
+package com.wd.workoffice.ui.activity.bat.order.sale;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -7,8 +7,7 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.ProductOrderSearchActivity;
-import com.wd.workoffice.ui.activity.bat.SupplierOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.order.ProductOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.ProductOrderApplyFragment;
 import com.wd.workoffice.ui.fg.ProductOrderFragment;

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleSaleOrderActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/sale/SaleSaleOrderActivity.java

-package com.wd.workoffice.ui.activity.bat.sale;
+package com.wd.workoffice.ui.activity.bat.order.sale;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -7,7 +7,7 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.SaleOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.order.SaleOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.SaleSaleFragment;
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/sale/SaleSupplierOrderActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/bat/order/sale/SaleSupplierOrderActivity.java

-package com.wd.workoffice.ui.activity.bat.sale;
+package com.wd.workoffice.ui.activity.bat.order.sale;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -7,7 +7,7 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.SupplierOrderSearchActivity;
+import com.wd.workoffice.ui.activity.bat.order.SupplierOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.SaleSupplierFragment;
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkLogisticActivity.java

@@ -7,7 +7,6 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.InsideOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 import com.wd.workoffice.ui.fg.WorkLogisticsFragment;
 

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkProActivity.java

@@ -7,9 +7,7 @@ import android.view.MenuItem;
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.OutOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
-import com.wd.workoffice.ui.fg.SaleOutFragment;
 import com.wd.workoffice.ui.fg.WorkProFragment;
 
 import java.util.ArrayList;

app/src/main/java/com/wd/workoffice/ui/adapter/OrderDetailProductAdapter.java

 package com.wd.workoffice.ui.adapter;
 
 
+import android.view.View;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.wd.workoffice.R;
@@ -15,9 +17,11 @@ import java.util.List;
  */
 
 public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.OrderItemsBean, BaseViewHolder> {
+    int status;
 
-    public OrderDetailProductAdapter(int layoutResId, List data) {
+    public OrderDetailProductAdapter(int layoutResId, List data, Integer status) {
         super(layoutResId, data);
+        this.status = status;
     }
 
 
@@ -29,9 +33,30 @@ public class OrderDetailProductAdapter extends BaseQuickAdapter<OrderDetail.Orde
         helper.setText(R.id.tv_spec, item.getProductSpec());
         helper.setText(R.id.tv_price, "￥".concat(String.valueOf(item.getInnerPrice())));
         helper.setText(R.id.tv_all_price, "￥".concat(String.valueOf(item.getInnerPrice())));
-        helper.setText(R.id.tv_unit,item.getProductUnit());
+        helper.setText(R.id.tv_unit, item.getProductUnit());
         helper.setText(R.id.tv_from, WorkUtils.getOrderFrom(item.getType()));
-        helper.setText(R.id.tv_num,String.valueOf(item.getProductCount()));
+        helper.setText(R.id.tv_num, String.valueOf(item.getProductCount()));
+        switch (status) {
+//            private String tab[] = {
+//            "全部", "待审核", "待接单", "待生产", "已入库",
+//            "已交付"};
+//    private String order[] = {
+//            "", "100", "200", "710", "500",
+//            "600"};
+            case 100:
+                break;
+            case 200:
+                break;
+            case 710:
+                helper.setGone(R.id.ll_btn, true);
+                break;
+            case 500:
+                helper.setGone(R.id.ll_btn, true);
+                break;
+            case 600:
+                helper.setGone(R.id.ll_btn, true);
+                break;
+        }
     }
 }
 

app/src/main/java/com/wd/workoffice/ui/adapter/SendApplyAdapter.java

+package com.wd.workoffice.ui.adapter;
+
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.wd.workoffice.R;
+import com.wd.workoffice.bean.FlowBean;
+import com.wd.workoffice.bean.SendApplyBean;
+
+import java.util.List;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class SendApplyAdapter extends BaseQuickAdapter<SendApplyBean.RecordsBean, BaseViewHolder> {
+    int status;
+
+    public SendApplyAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+    public SendApplyAdapter(int layoutResId, @Nullable List<SendApplyBean.RecordsBean> data, int status) {
+        super(layoutResId, data);
+        this.status = status;
+    }
+
+    @Override
+    protected void convert(BaseViewHolder helper, SendApplyBean.RecordsBean item) {
+        helper.setText(R.id.tv_name, item.getTransitPartName());
+        helper.setText(R.id.tv_reason, item.getApplyRemark());
+        helper.setText(R.id.tv_time, item.getCreatedTime());
+        if (status == 0) {
+            helper.setVisible(R.id.ll_btn, true);
+            helper.addOnClickListener(R.id.tv_agree);
+            helper.addOnClickListener(R.id.tv_refuse);
+        }
+
+
+    }
+}
+

app/src/main/java/com/wd/workoffice/ui/fg/MainFragment.java

@@ -11,8 +11,8 @@ import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.vo.BatLayoutVo;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
-import com.wd.workoffice.ui.activity.bat.sale.SaleCrucibleOrderActivity;
-import com.wd.workoffice.ui.activity.bat.sale.SaleProductOrderActivity;
+import com.wd.workoffice.ui.activity.bat.order.sale.SaleCrucibleOrderActivity;
+import com.wd.workoffice.ui.activity.bat.order.sale.SaleProductOrderActivity;
 import com.wd.workoffice.ui.activity.bat.store.StoreFinancialActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkInStockActivity;
 import com.wd.workoffice.ui.activity.bat.store.StoreCrucibleActivity;
@@ -20,14 +20,14 @@ import com.wd.workoffice.ui.activity.bat.store.StoreOutsourcingActivity;
 import com.wd.workoffice.ui.activity.bat.store.StoreSaleActivity;
 import com.wd.workoffice.ui.activity.bat.store.StoreSupplierActivity;
 import com.wd.workoffice.ui.activity.bat.store.StoreTradingActivity;
-import com.wd.workoffice.ui.activity.bat.product.ProductInsideOrderActivity;
-import com.wd.workoffice.ui.activity.bat.product.ProductOutOrderActivity;
-import com.wd.workoffice.ui.activity.bat.product.ProductSaleOrderActivity;
-import com.wd.workoffice.ui.activity.bat.product.ProductSupplierOrderActivity;
-import com.wd.workoffice.ui.activity.bat.sale.SaleInsideOrderActivity;
-import com.wd.workoffice.ui.activity.bat.sale.SaleOutOrderActivity;
-import com.wd.workoffice.ui.activity.bat.sale.SaleSaleOrderActivity;
-import com.wd.workoffice.ui.activity.bat.sale.SaleSupplierOrderActivity;
+import com.wd.workoffice.ui.activity.bat.order.product.ProductInsideOrderActivity;
+import com.wd.workoffice.ui.activity.bat.order.product.ProductOutOrderActivity;
+import com.wd.workoffice.ui.activity.bat.order.product.ProductSaleOrderActivity;
+import com.wd.workoffice.ui.activity.bat.order.product.ProductSupplierOrderActivity;
+import com.wd.workoffice.ui.activity.bat.order.sale.SaleInsideOrderActivity;
+import com.wd.workoffice.ui.activity.bat.order.sale.SaleOutOrderActivity;
+import com.wd.workoffice.ui.activity.bat.order.sale.SaleSaleOrderActivity;
+import com.wd.workoffice.ui.activity.bat.order.sale.SaleSupplierOrderActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkAccountActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkContactsActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkDepActivity;

app/src/main/java/com/wd/workoffice/ui/fg/ProductOrderApplyFragment.java

 package com.wd.workoffice.ui.fg;
 
 import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
 
 import com.google.android.material.tabs.TabLayout;
 import com.wd.workoffice.R;
 import com.wd.workoffice.app.WorkBaseFg;
-import com.wd.workoffice.app.WorkToolBarActivity;
-import com.wd.workoffice.ui.activity.bat.SupplierOrderSearchActivity;
 import com.wd.workoffice.ui.adapter.VpDataAdapter;
 
 import java.util.ArrayList;

app/src/main/java/com/wd/workoffice/ui/fg/SaleSaleFragment.java

@@ -9,7 +9,7 @@ import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.OrderBean;
 import com.wd.workoffice.contract.SaleSaleContract;
 import com.wd.workoffice.presenter.SaleSalePresenter;
-import com.wd.workoffice.ui.activity.bat.sale.SaleOrderDetailActivity;
+import com.wd.workoffice.ui.activity.bat.order.sale.SaleOrderDetailActivity;
 import com.wd.workoffice.ui.adapter.SaleSaleAdapter;
 import com.wd.workoffice.util.WorkUtils;
 
@@ -78,7 +78,7 @@ public class SaleSaleFragment extends WorkBaseFg implements SaleSaleContract.Vie
         orderAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(SaleOrderDetailActivity.class, "id", orderList.get(position).getId());
+                startActivity(SaleOrderDetailActivity.class, "id", orderList.get(position).getId()+"","status",orderList.get(position).getStatus()+"");
             }
         });
     }

app/src/main/java/com/wd/workoffice/ui/fg/SendApplyFragment.java

+package com.wd.workoffice.ui.fg;
+
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+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.app.BaseBean;
+import com.wd.workoffice.app.WorkBaseFg;
+import com.wd.workoffice.bean.SendApplyBean;
+import com.wd.workoffice.bean.event.CheckLogisticEvent;
+import com.wd.workoffice.bean.event.CheckTicketEvent;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.bat.work.WorkLogisticsDetailActivity;
+import com.wd.workoffice.ui.adapter.SendApplyAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.Observable;
+import io.reactivex.disposables.Disposable;
+
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class SendApplyFragment extends WorkBaseFg {
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    private String state;
+    private int page = 1;
+    private Map<String, Object> param;
+    private SendApplyAdapter dataAdapter;
+    private List<SendApplyBean.RecordsBean> dataList;
+    private String orderId;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this, getContentView());
+        rvData.setLayoutManager(new LinearLayoutManager(getActivity(), RecyclerView.VERTICAL, false));
+    }
+
+
+    @Override
+    protected void initData() {
+        param = WorkUtils.pageKey();
+        param.put("status", state);
+        param.put("orderId", orderId);
+        page = 1;
+        param.put("current", page);
+        dataList = new ArrayList<>();
+        dataAdapter = new SendApplyAdapter(R.layout.item_send_apply, dataList, Integer.valueOf(state));
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+        getData();
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Bundle arguments = getArguments();
+        if (arguments != null) {
+            state = arguments.getString("state");
+            orderId = arguments.getString("orderId");
+        }
+    }
+
+    private void getData() {
+        RtfUtils.getRtf().sendApplyList(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<SendApplyBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), SendApplyBean.class).getRecords();
+
+                if (page == 1) {
+                    srlRefresh.finishRefresh();
+                    dataList.clear();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                    dataAdapter.loadMoreComplete();
+                } else {
+                    dataAdapter.loadMoreComplete();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    dataAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(refreshLayout -> {
+            page = 1;
+            param.put("current", page);
+            getData();
+        });
+        dataAdapter.setOnLoadMoreListener(() -> {
+            param.put("current", page);
+            getData();
+        }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(WorkLogisticsDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
+            }
+        });
+        dataAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                switch (view.getId()){
+                    case R.id.tv_refuse:
+                        checkDialog(2,dataList.get(position).getId());
+                        break;
+                    case R.id.tv_agree:
+                        checkDialog(1, dataList.get(position).getId());
+                        break;
+
+                }
+            }
+        });
+    }
+
+
+    private void checkDialog(int status, int id) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        View view = LayoutInflater.from(getActivity()).inflate(R.layout.view_check, null);
+        TextView tvOk = view.findViewById(R.id.tv_ok);
+        TextView tvDesc = view.findViewById(R.id.tv_desc);
+        tvDesc.setText(status == 1 ? "通过" : "拒绝");
+        TextView tvNum = view.findViewById(R.id.tv_num);
+        TextView tvCancel = view.findViewById(R.id.tv_cancel);
+        EditText etRemark = view.findViewById(R.id.et_content);
+        etRemark.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                tvNum.setText(s.length() + "/140");
+            }
+        });
+        builder.setView(view);
+        AlertDialog addCartDialog = builder.create();
+        tvOk.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (TextUtils.isEmpty(etRemark.getText().toString())) {
+                    toast("请填写备注");
+                    return;
+                }
+                check(status, etRemark.getText().toString(),id);
+                addCartDialog.dismiss();
+            }
+        });
+        tvCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                addCartDialog.dismiss();
+            }
+        });
+        addCartDialog.show();
+    }
+
+
+    private void check(int status, String remark, int id) {
+        param.put("status", status);
+        param.put("auditRemark", remark);
+        param.put("id", id);
+        RtfUtils.getRtf().sendApplyCheck(WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                toast("操作成功");
+                page = 1;
+                param.put("current", page);
+                getData();
+            }
+        });
+    }
+    @Override
+    protected int layoutId() {
+        return R.layout.fg_work_contacts;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(CheckLogisticEvent event) {
+        page = 1;
+        param.put("current", page);
+        getData();
+    }
+}

app/src/main/res/drawable/shape_blue_btn.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/blue_bg" />
+    <corners android:radius="2dp" />
+</shape>
\ No newline at end of file

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

@@ -49,10 +49,20 @@
         android:id="@+id/ll_bottom"
         android:layout_width="match_parent"
         android:layout_height="60mm"
+        android:visibility="gone"
         android:layout_alignParentBottom="true"
         android:gravity="center_vertical|right"
         android:orientation="horizontal">
 
+        <LinearLayout
+            android:id="@+id/ll_check"
+            android:layout_width="match_parent"
+            android:layout_height="60mm"
+            android:layout_alignParentBottom="true"
+            android:gravity="center_vertical|right"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
             <TextView
                 android:id="@+id/tv_refuse"
                 android:layout_width="wrap_content"
@@ -77,6 +87,41 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/ll_apply"
+            android:layout_width="match_parent"
+            android:layout_height="60mm"
+            android:layout_alignParentBottom="true"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/tv_finish_apply"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10mm"
+                android:background="@drawable/shape_blue_btn"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="5mm"
+                android:text="提前结束申请"
+                android:textColor="@color/white" />
+
+            <TextView
+                android:id="@+id/tv_send_apply"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10mm"
+                android:background="@drawable/shape_blue_btn"
+                android:paddingHorizontal="20mm"
+                android:paddingVertical="5mm"
+                android:text="发货申请"
+                android:textColor="@color/white" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -94,8 +139,8 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rv_process"
                 android:layout_width="match_parent"
-                android:paddingVertical="10mm"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:paddingVertical="10mm" />
 
             <View style="@style/ViewX" />
 
@@ -367,8 +412,6 @@
                     android:textSize="15sp" />
             </LinearLayout>
 
-            <View style="@style/ViewX" />
-
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

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

@@ -136,6 +136,7 @@
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="12sp" />
         </RelativeLayout>
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -157,6 +158,7 @@
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="12sp" />
         </RelativeLayout>
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -179,6 +181,7 @@
                 android:textColor="@color/flexible_text_gray"
                 android:textSize="12sp" />
         </RelativeLayout>
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -222,4 +225,55 @@
             android:text="0"
             android:textColor="@color/flexible_text_gray" />
     </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:layout_marginTop="10mm">
+
+        <TextView
+            android:id="@+id/tv_get"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10mm"
+            android:background="@drawable/shape_blue_btn"
+            android:paddingHorizontal="10mm"
+            android:paddingVertical="5mm"
+            android:text="领用"
+            android:textColor="@color/white" />
+
+        <TextView
+            android:id="@+id/tv_return"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10mm"
+            android:background="@drawable/shape_blue_btn"
+            android:paddingHorizontal="10mm"
+            android:paddingVertical="5mm"
+            android:text="退货"
+            android:textColor="@color/white" />
+
+        <TextView
+            android:id="@+id/tv_add"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10mm"
+            android:background="@drawable/shape_blue_btn"
+            android:paddingHorizontal="10mm"
+            android:paddingVertical="5mm"
+            android:text="入库"
+            android:textColor="@color/white" />
+
+        <TextView
+            android:id="@+id/tv_flow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_blue_btn"
+            android:paddingHorizontal="10mm"
+            android:paddingVertical="5mm"
+            android:text="流水"
+            android:textColor="@color/white" />
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_centerHorizontal="true"
+    android:layout_marginTop="10mm"
+    android:background="@color/white"
+    android:orientation="vertical"
+    android:paddingHorizontal="20mm"
+    android:paddingTop="10mm"
+    android:paddingBottom="20mm">
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5mm">
+
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="邢台德龙钢铁客户"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/tv_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:textColor="#0841F0"
+            android:textSize="14sp" />
+    </RelativeLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10mm">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="申请原因:"
+            android:textSize="16sp" />
+
+
+        <TextView
+            android:id="@+id/tv_reason"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10mm">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="申请时间:"
+            android:textSize="16sp" />
+
+
+        <TextView
+            android:id="@+id/tv_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:layout_marginTop="10mm">
+
+        <TextView
+            android:id="@+id/tv_agree"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/selector_product_choose"
+            android:gravity="center"
+            android:paddingHorizontal="10mm"
+            android:paddingVertical="5mm"
+            android:text="通过"
+            android:textSize="13sp" />
+
+        <TextView
+            android:id="@+id/tv_refuse"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10mm"
+            android:background="@drawable/selector_product_choose"
+            android:gravity="center"
+            android:paddingHorizontal="10mm"
+            android:paddingVertical="5mm"
+            android:text="拒绝"
+            android:textSize="13sp" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file