1.坩埚初版

2.//TODO erp用户激活测试，忘记/重置密码测试，审核规则，领用申请列表/退件列表/参数，坩埚下单页面，组装下单，产品下单还差附件测试，mes，刷新token

app/src/main/AndroidManifest.xml

@@ -1000,6 +1000,22 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.order.ProductOrderDetailActivity"
+            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.CrucibleOrderDetailActivity"
+            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.QualityApplyActivity"
             android:configChanges="keyboardHidden|orientation"

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

@@ -1247,6 +1247,14 @@ public interface ApiService {
     @POST("/procedureStart/so/applyStock/{orderItemId}")
     Observable<BaseBean> addStockApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
 
+    /**
+     * step4_1-发起入库申请
+     *
+     * @return
+     */
+    @POST("/procedureStart/co/applyStock/{orderItemId}")
+    Observable<BaseBean> addStockCoApplyAdd(@Path("orderItemId") String orderItemId, @Body RequestBody requestBody);
+
     /**
      * step4_1-发起入库申请
      *
@@ -1277,6 +1285,15 @@ public interface ApiService {
      */
     @POST("/enterStoreApply/fo/app/page/list")
     Observable<BaseBean> addFoStockApplyList(@QueryMap Map<String, Object> param);
+
+    /**
+     * s入库申请列表
+     *
+     * @return
+     */
+    @POST("/enterStoreApply/co/app/page/list")
+    Observable<BaseBean> addCoStockApplyList(@QueryMap Map<String, Object> param);
+
     /**
      * step4_3-入库申请列表
      *
@@ -1306,6 +1323,14 @@ public interface ApiService {
      */
     @PUT("/enterStoreApply/fo/audit/{id}")
     Observable<BaseBean> addFoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
+    /**
+     * step4_2-入库申请审核
+     *
+     * @return
+     */
+    @PUT("/enterStoreApply/co/audit/{id}")
+    Observable<BaseBean> addCoStockApplyCheck(@Path("id") String id, @Body RequestBody requestBody);
+
     /**
      * 质检申请列表
      *

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

@@ -118,6 +118,8 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
             observable = RtfUtils.getRtf().addPoStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
         } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
             observable = RtfUtils.getRtf().addFoStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
+        }else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
+            observable = RtfUtils.getRtf().addStockCoApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
         } else {
             observable = RtfUtils.getRtf().addStockApplyAdd(getIntent().getStringExtra("id"), WorkUtils.convertMapToBody(param));
         }

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

@@ -180,7 +180,9 @@ public class AddStockApplyDetailActivity extends WorkToolBarActivity {
             observable = RtfUtils.getRtf().addPoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
         } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
             observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
-        }  else {
+        } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+            observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
+        } else {
             observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
         }
         observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {

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

@@ -25,6 +25,7 @@ public class SaleCruibleAdapter extends BaseQuickAdapter<OrderBean, BaseViewHold
         helper.setText(R.id.tv_status, item.getStatusName());
         helper.setText(R.id.tv_dep, item.getReceiveDeptName());
         helper.setText(R.id.tv_place_name, item.getLaunchUserName());
+        helper.setText(R.id.tv_stock, item.getInStockName());
         helper.setText(R.id.tv_company, item.getLaunchDeptName());
         helper.setText(R.id.tv_order_no, item.getId());
         helper.setText(R.id.tv_time, item.getCreatedTime());

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

@@ -108,7 +108,9 @@ public class AddStockApplyFragment extends WorkBaseFg {
             observable = RtfUtils.getRtf().addPoStockApplyList(param);
         } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
             observable = RtfUtils.getRtf().addFoStockApplyList(param);
-        }  else {
+        } else if (TextUtils.equals(orderType, OrderType.CRUCIBLE.getCode())) {
+            observable = RtfUtils.getRtf().addCoStockApplyList(param);
+        }else {
             observable = RtfUtils.getRtf().addStockApplyList(param);
         }
         observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@@ -246,7 +248,9 @@ public class AddStockApplyFragment extends WorkBaseFg {
             observable = RtfUtils.getRtf().addPoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
         } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
             observable = RtfUtils.getRtf().addFoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
-        } else {
+        } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
+            observable = RtfUtils.getRtf().addCoStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
+        }else {
             observable = RtfUtils.getRtf().addStockApplyCheck(id + "", WorkUtils.convertMapToBody(param));
         }
         observable.compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {

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

@@ -14,6 +14,8 @@ import com.wd.workoffice.bean.OrderBean;
 import com.wd.workoffice.bean.event.CheckOrderEvent;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.bat.order.CrucibleOrderDetailActivity;
+import com.wd.workoffice.ui.activity.bat.order.SupplierOrderDetailActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkLogisticsDetailActivity;
 import com.wd.workoffice.ui.adapter.ProCruibleAdapter;
 import com.wd.workoffice.ui.adapter.SaleCruibleAdapter;
@@ -141,8 +143,10 @@ public class CrucibleOrderBuyListFragment extends WorkBaseFg {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(WorkLogisticsDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
-            }
+                startActivity(CrucibleOrderDetailActivity.class,
+                        "identity",identity,
+                        "id", dataList.get(position).getId() + "",
+                        "status", dataList.get(position).getStatus() + ""); }
         });
     }
 

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

@@ -14,6 +14,7 @@ import com.wd.workoffice.bean.OrderBean;
 import com.wd.workoffice.bean.event.CheckOrderEvent;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.activity.bat.order.CrucibleOrderDetailActivity;
 import com.wd.workoffice.ui.activity.bat.work.WorkLogisticsDetailActivity;
 import com.wd.workoffice.ui.adapter.SaleCruibleAdapter;
 import com.wd.workoffice.ui.adapter.SaleProductApplyAdapter;
@@ -140,7 +141,10 @@ public class CrucibleOrderSaleListFragment extends WorkBaseFg {
         dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                startActivity(WorkLogisticsDetailActivity.class, "info", JSON.toJSONString(dataList.get(position)));
+                startActivity(CrucibleOrderDetailActivity.class,
+                        "identity", identity,
+                        "id", dataList.get(position).getId() + "",
+                        "status", dataList.get(position).getStatus() + "");
             }
         });
     }

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

@@ -17,6 +17,7 @@ import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.app.WorkBaseFg;
 import com.wd.workoffice.bean.SendApplyBean;
 import com.wd.workoffice.bean.event.CheckSendEvent;
+import com.wd.workoffice.bean.workEnum.OrderType;
 import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.ui.activity.bat.order.SendApplyDetailActivity;
@@ -37,6 +38,7 @@ 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;
 
 
@@ -57,6 +59,7 @@ public class SendApplyFragment extends WorkBaseFg {
     private SendApplyAdapter dataAdapter;
     private List<SendApplyBean.RecordsBean> dataList;
     private String orderId;
+    private String orderType;
 
     @Override
     protected void initView() {
@@ -86,6 +89,7 @@ public class SendApplyFragment extends WorkBaseFg {
         if (arguments != null) {
             state = arguments.getString("state");
             orderId = arguments.getString("orderId");
+            orderType = arguments.getString("orderType");
         }
     }