1.内部下单修改名字为部门下单

2.内部下单添加前置选择界面
3.外采购退货审核修改为和销售一致

app/src/main/AndroidManifest.xml

@@ -219,7 +219,7 @@
         <activity
             android:name=".ui.activity.bat.order.sale.SaleInsideOrderActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label="内部订单"
+            android:label="部门订单"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
@@ -251,7 +251,7 @@
         <activity
             android:name=".ui.activity.bat.order.product.ProductInsideOrderActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label="内部订单"
+            android:label="部门订单"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
@@ -1998,6 +1998,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.store.ChooseInsideActivity"
+            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.mes.user.MesSpeedAddActivity"
             android:configChanges="keyboardHidden|orientation"

app/src/main/java/com/wd/workoffice/bean/workEnum/PagePermissionType.java

@@ -96,7 +96,13 @@ public enum PagePermissionType {
     PO_ADVANCE_LIST("order:po:advance-finish-apply:page:list", "-提前结束申请列表"),
     PO_ADVANCE_AUDIT("order:po:advance-finish-apply:audit", "提前结束申请审核"),
     PO_RETURN_APPLY_LIST("order:po:return-apply:page:list", "退货申请列表"),
-    PO_RETURN_EDIT("order:po:return-apply:edit", "退货审核(集团审核)"),
+
+
+    PO_RETURN_EDIT_DEPT_ADMIN("order:purchase:return-apply:edit:dept-admin", "退货审核(部门管理员)"),
+    PO_RETURN_EDIT_BUSINESS_DEPARTMENT("order:purchase:return-apply:edit:business-department", "退货审核(业务部)"),
+    PO_RETURN_EDIT_FINANCE_DEPT("order:purchase:return-apply:edit:finance-dept", "退货审核(财务部)"),
+    PO_RETURN_EDIT_GROUP("order:purchase:return-apply:edit:group", "退货审核(集团审核)"),
+
     PO_USE_APPLY_LIST("order:po:use-apply:page:list", "领用申请列表"),
     PO_USE_APPLY_SAVE("order:po:use-apply:apply:save", "发起领用申请"),
     PO_USE_APPLY_AUDIT("order:po:use-apply:audit", "领用申请审核"),

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

 package com.wd.workoffice.retrofit;
 
 
-
 import com.alibaba.fastjson.JSONObject;
 import com.wd.workoffice.app.BaseBean;
 import com.wd.workoffice.bean.ProDetail;
 import com.wd.workoffice.util.WorkUtils;
+
 import java.util.Map;
+
 import io.reactivex.Observable;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
@@ -1806,6 +1807,31 @@ public interface ApiService {
     @PUT("/returnApply/so/audit/group/{applyId}")
     Observable<BaseBean> soGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
 
+
+    /**
+     * 部门管理员审核
+     *
+     * @return
+     */
+    @PUT("/returnApply/po/audit/{applyId}")
+    Observable<BaseBean> poReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
+
+    /**
+     * 业务部审核
+     *
+     * @return
+     */
+    @PUT("/returnApply/po/audit/business/{applyId}")
+    Observable<BaseBean> poBusinessReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
+
+    /**
+     * 业务部审核
+     *
+     * @return
+     */
+    @PUT("/returnApply/po/audit/finance/{applyId}")
+    Observable<BaseBean> poFinanceReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
+
     /**
      * 集团审核
      *
@@ -1814,6 +1840,15 @@ public interface ApiService {
     @PUT("/returnApply/po/audit/group/{applyId}")
     Observable<BaseBean> poGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
 
+
+//    /**
+//     * 集团审核
+//     *
+//     * @return
+//     */
+//    @PUT("/returnApply/po/audit/group/{applyId}")
+//    Observable<BaseBean> poGroupReturnApply(@Path("applyId") String id, @Body RequestBody requestBody);
+
     /**
      * 退货审核
      *

app/src/main/java/com/wd/workoffice/ui/activity/WorkOrderActivity.java

@@ -43,9 +43,9 @@ public class WorkOrderActivity extends WorkToolBarActivity {
     List<BatLayoutVo> saleList = new ArrayList<>();
     List<BatLayoutVo> productList = new ArrayList<>();
     int[] productImg = new int[]{R.mipmap.order_sale1, R.mipmap.order_sale2, R.mipmap.order_sale3, R.mipmap.order_sale4, R.mipmap.order_sale5, R.mipmap.order_sale6};
-    String[] saleName = new String[]{"销售订单", "外采购订单", "供应订单", "内部订单", "组装订单", "坩埚订单"};
+    String[] saleName = new String[]{"销售订单", "外采购订单", "供应订单", "部门订单", "组装订单", "坩埚订单"};
     int[] saleImg = new int[]{R.mipmap.order_product1, R.mipmap.order_product2, R.mipmap.order_product3, R.mipmap.order_product4, R.mipmap.order_product5, R.mipmap.order_product6};
-    String[] productName = new String[]{"销售订单", "外采购订单", "供应订单", "内部订单", "组装订单", "坩埚订单"};
+    String[] productName = new String[]{"销售订单", "外采购订单", "供应订单", "部门订单", "组装订单", "坩埚订单"};
 
     @Override
     protected void initView() {

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

@@ -183,15 +183,23 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
                 llCheck.setVisibility(View.GONE);
             }
         } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
-            if (status.startsWith("1") && !status.endsWith("4")) {
+            if (status.startsWith("1") && (!status.endsWith("4")&&!status.endsWith("5"))) {
                 llBottom.setVisibility(View.VISIBLE);
                 llCheck.setVisibility(View.VISIBLE);
             } else {
                 llBottom.setVisibility(View.GONE);
                 llCheck.setVisibility(View.GONE);
             }
-            rlHistory.setVisibility(View.GONE);
-            llProcess.setVisibility(View.GONE);
+//
+//            if (status.startsWith("1") && !status.endsWith("4")) {
+//                llBottom.setVisibility(View.VISIBLE);
+//                llCheck.setVisibility(View.VISIBLE);
+//            } else {
+//                llBottom.setVisibility(View.GONE);
+//                llCheck.setVisibility(View.GONE);
+//            }
+//            rlHistory.setVisibility(View.GONE);
+//            llProcess.setVisibility(View.GONE);
         } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
             if (status.startsWith("1") && !status.endsWith("4")) {
                 llBottom.setVisibility(View.VISIBLE);
@@ -346,7 +354,16 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
                 }
             }
         } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
-            hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RETURN_EDIT.getPermission());
+//            hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RETURN_EDIT_GROUP.getPermission());
+            if (status.endsWith("0")) {
+                hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RETURN_EDIT_DEPT_ADMIN.getPermission());
+            } else if (status.endsWith("1")) {
+                hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RETURN_EDIT_BUSINESS_DEPARTMENT.getPermission());
+            } else if (status.endsWith("2")) {
+                hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RETURN_EDIT_FINANCE_DEPT.getPermission());
+            } else if (status.endsWith("3")) {
+                hasPermission = WorkUtils.hasPermission(PagePermissionType.PO_RETURN_EDIT_GROUP.getPermission());
+            }
         } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
             hasPermission = WorkUtils.hasPermission(PagePermissionType.FO_RETURN_AUDIT.getPermission());
         }
@@ -394,9 +411,10 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
     private void check(int status, String remark, int id) {
         Map<String, Object> param = WorkUtils.simpleParam();
         if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
-            param.put("status", status == 1 ? Integer.valueOf(info.getStatus()) + 1 : Integer.valueOf(info.getStatus()) + 11);
+            param.put("status", status == 1 ? Integer.parseInt(info.getStatus()) + 1 : Integer.parseInt(info.getStatus()) + 11);
         } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
-            param.put("status", status);
+//            param.put("status", status);
+            param.put("status", status == 1 ? Integer.parseInt(info.getStatus()) + 1 : Integer.parseInt(info.getStatus()) + 11);
             param.put("productAmount", info.getProductAmount());
         } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
             param.put("status", status);
@@ -419,7 +437,18 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
                 observable = RtfUtils.getRtf().soReturnApply(id + "", WorkUtils.convertMapToBody(param));
             }
         } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
-            observable = RtfUtils.getRtf().poGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
+//            observable = RtfUtils.getRtf().poGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
+            if (info.getStatus().endsWith("0")) {
+                observable = RtfUtils.getRtf().poReturnApply(id + "", WorkUtils.convertMapToBody(param));
+            } else if (info.getStatus().endsWith("1")) {
+                observable = RtfUtils.getRtf().poBusinessReturnApply(id + "", WorkUtils.convertMapToBody(param));
+            } else if (info.getStatus().endsWith("2")) {
+                observable = RtfUtils.getRtf().poFinanceReturnApply(id + "", WorkUtils.convertMapToBody(param));
+            } else if (info.getStatus().endsWith("3")) {
+                observable = RtfUtils.getRtf().poGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
+            } else {
+                observable = RtfUtils.getRtf().poReturnApply(id + "", WorkUtils.convertMapToBody(param));
+            }
         } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
             observable = RtfUtils.getRtf().foGroupReturnApply(id + "", WorkUtils.convertMapToBody(param));
         } else {
@@ -445,11 +474,14 @@ public class ReturnDetailActivity extends WorkToolBarActivity {
                 }
                 toast("操作成功");
                 if (TextUtils.equals(orderType, OrderType.SALE.getCode())) {
-                    int changeStatus = status == 1 ? Integer.valueOf(info.getStatus()) + 1 : Integer.valueOf(info.getStatus()) + 11;
+                    int changeStatus = status == 1 ? Integer.parseInt(info.getStatus()) + 1 : Integer.parseInt(info.getStatus()) + 11;
                     info.setStatus(changeStatus + "");
                     changeView();
                 } else if (TextUtils.equals(orderType, OrderType.OUT_BUY.getCode())) {
-                    llBottom.setVisibility(View.GONE);
+//                    llBottom.setVisibility(View.GONE);
+                    int changeStatus = status == 1 ? Integer.parseInt(info.getStatus()) + 1 : Integer.parseInt(info.getStatus()) + 11;
+                    info.setStatus(changeStatus + "");
+                    changeView();
                 } else if (TextUtils.equals(orderType, OrderType.SUPPLIER.getCode())) {
                     llBottom.setVisibility(View.GONE);
                 }

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

+package com.wd.workoffice.ui.activity.bat.store;
+
+import android.view.View;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.ProPriceBean;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.ChooseInsideAdapter;
+import com.wd.workoffice.ui.adapter.WorkProPriceAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import androidx.annotation.NonNull;
+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.disposables.Disposable;
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class ChooseInsideActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+
+    private List<String> dataList = Arrays.asList("产品生产", "产品转库存", "购买服务");//产品生产、产品转库存、购买服务
+    private List<String> typeList = Arrays.asList("product", "product", "service");//产品生产、产品转库存、购买服务
+    private List<String> formatList = Arrays.asList("PD", "TS", "");//产品生产、产品转库存、购买服务
+
+    private ChooseInsideAdapter dataAdapter;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+    }
+
+
+    @Override
+    protected void initData() {
+        dataAdapter = new ChooseInsideAdapter(R.layout.item_choose_inside, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+    }
+
+
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(new OnRefreshListener() {
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                srlRefresh.finishRefresh();
+            }
+        });
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                if (position!=0){
+                    toast("还未开启哦");
+                    return;
+                }
+                startActivity(ChooseInfoActivity.class, "code", getIntent().getStringExtra("code"),
+                        "type", getIntent().getStringExtra("type"), "deptId", getIntent().getStringExtra("deptId"));
+                finish();
+            }
+        });
+    }
+
+    @Override
+    protected int layoutId() {
+        return R.layout.activity_pro_price;
+    }
+
+
+}

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

@@ -63,7 +63,7 @@ import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
 /**
- * 商店-销售-产品-确认订单
+ * 商店-内部-产品-确认订单
  * author : flexible
  * email : lgd19940421@163.com
  * github: https://github.com/FlexibleXd
@@ -292,7 +292,8 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
      */
     private void submitOrder() {
         param.put("expandInfo", expandInfo);
-        param.put("orderItems", orderItems);
+        param.put("type", "product");
+        param.put("businessFormat", "PD");
         showLoading();
         Observable<BaseBean> observable;
         String code = getIntent().getStringExtra("code");

app/src/main/java/com/wd/workoffice/ui/adapter/ChooseInsideAdapter.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.ProPriceBean;
+import com.wd.workoffice.util.MathUtils;
+
+import java.util.List;
+
+/**
+ * Created by flexible on 2018/8/13.
+ */
+
+public class ChooseInsideAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
+
+    public ChooseInsideAdapter(int layoutResId, List data) {
+        super(layoutResId, data);
+    }
+
+
+    @Override
+    protected void convert(BaseViewHolder helper, String item) {
+        helper.setText(R.id.tv_content, item);
+        if (helper.getAdapterPosition() != 0) {
+            helper.setGone(R.id.iv_arrow, false);
+        }else {
+            helper.setGone(R.id.iv_arrow, true);
+        }
+    }
+}
+

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

@@ -89,10 +89,10 @@ public class MainFragment extends WorkBaseFg {
     List<BatLayoutVo> workList = new ArrayList<>();
     List<BatLayoutVo> productList = new ArrayList<>();
     int[] saleImg = new int[]{R.mipmap.bat_sale1, R.mipmap.bat_sale2, R.mipmap.bat_sale3, R.mipmap.bat_sale4, R.mipmap.bat_sale5, R.mipmap.bat_sale6};
-    String[] saleName = new String[]{"销售订单", "外采购订单", "供应订单", "内部订单", "组装订单", "坩埚订单"};
+    String[] saleName = new String[]{"销售订单", "外采购订单", "供应订单", "部门订单", "组装订单", "坩埚订单"};
     int[] storeImg = new int[]{R.mipmap.bat_store1, R.mipmap.bat_store2, R.mipmap.bat_store3, R.mipmap.bat_store4
             , R.mipmap.bat_store5, R.mipmap.bat_store6, R.mipmap.bat_store7};
-    String[] storeName = new String[]{"销售", "外采购", "供应", "维修", "财税", "钳锅", "内部交易"};
+    String[] storeName = new String[]{"销售", "外采购", "供应", "维修", "财税", "钳锅", "部门交易"};
     int[] approvalImg = new int[]{R.mipmap.bat_approval1, R.mipmap.bat_approval2};
     String[] approvalName = new String[]{"我审批的", "我发起的"};
     int[] workImg = new int[]{R.mipmap.bat_work1, R.mipmap.bat_work2, R.mipmap.bat_work3,
@@ -109,7 +109,7 @@ public class MainFragment extends WorkBaseFg {
     @BindView(R.id.vp_data)
     ViewPager vpData;
     private String tab[] = {
-            "销售商店", "外采购商店", "供应商店", "财税商店",  "仓单交易"};
+            "销售商店", "外采购商店", "供应商店", "财税商店",  "部门交易"};
     private String status[] = {
             "1", "2", "3", "4", "6"};
     private FragmentManager sfm;

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

@@ -20,6 +20,7 @@ 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.store.ChooseInfoActivity;
+import com.wd.workoffice.ui.activity.bat.store.ChooseInsideActivity;
 import com.wd.workoffice.ui.activity.bat.store.StoreFinancialAddActivity;
 import com.wd.workoffice.ui.adapter.DepAdapter;
 import com.wd.workoffice.ui.adapter.SaleCruibleAdapter;
@@ -186,6 +187,11 @@ public class MainListFragment extends WorkBaseFg {
                     startActivity(StoreFinancialAddActivity.class);
                     return;
                 }
+                if (TextUtils.equals("6", type)) {
+                    startActivity(ChooseInsideActivity.class, "code", permission,
+                            "type", type, "deptId", dataList.get(position).getId() + "");
+                    return;
+                }
                 startActivity(ChooseInfoActivity.class, "code", permission,
                         "type", type, "deptId", dataList.get(position).getId() + "");
             }

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

@@ -94,10 +94,10 @@ public class WorkFragment extends WorkBaseFg {
     List<BatLayoutVo> productList = new ArrayList<>();
     int[] productImg = new int[]{R.mipmap.order_sale1, R.mipmap.order_sale2, R.mipmap.order_sale3, R.mipmap.order_sale4, R.mipmap.order_sale5
     };
-    String[] saleName = new String[]{"销售订单", "外采购订单", "供应订单", "内部订单", "组装订单"};
+    String[] saleName = new String[]{"销售订单", "外采购订单", "供应订单", "部门订单", "组装订单"};
     int[] saleImg = new int[]{R.mipmap.order_product1, R.mipmap.order_product2, R.mipmap.order_product3,
             R.mipmap.order_product4, R.mipmap.order_product5};
-    String[] productName = new String[]{"销售订单", "外采购订单", "供应订单", "内部订单", "组装订单"};
+    String[] productName = new String[]{"销售订单", "外采购订单", "供应订单", "部门订单", "组装订单"};
     @BindView(R.id.rv_sale)
     RecyclerView rvSale;
     @BindView(R.id.rv_product)

app/src/main/java/com/wd/workoffice/util/WorkUtils.java

@@ -301,15 +301,19 @@ public class WorkUtils {
     /**
      * 退件状态
      * 10未审核 11 12 13 14已通过 21 22 23 24不通过(尾号1部门管理员 2业务部 3财务部 4集团，首数字1：通过，2:驳回)
-     *
+     * 15 erp审核通过
      * @param code
      * @return
      */
     public static String getReturnStatus(Integer code) {
         String name = "";
-        if (code >= 10 && code < 14) {
+        if (code >= 10 && code < 15) {
             name = "待审核";
-        } else if (code == 14) {
+        }
+//        else if (code == 14) {
+//            name = "已通过";
+//        }
+        else if (code == 15) {
             name = "已通过";
         } else if (code.toString().startsWith("2")) {
             name = "已驳回";

app/src/main/res/layout/item_choose_inside.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:gravity="center_horizontal"
+    android:background="@color/white"
+    android:padding="10mm">
+
+
+    <TextView
+        android:id="@+id/tv_content"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="5mm"
+        android:text="zzzz"
+        android:textColor="@color/flexible_text_sup" />
+
+    <ImageView
+        android:id="@+id/iv_arrow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:src="@mipmap/arrow_right_gray"
+        />
+</LinearLayout>
\ No newline at end of file