Skip to content

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

1.退货新增 

2.//TODO 设备三个子菜单,坩埚下单，mes其他页面，编辑任务担当无法修改.支数参数
上级 4e32fb4c
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 258 行增加 和 4 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ c46790fe
......@@ -1912,7 +1912,15 @@
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />f
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.bat.order.ReturnAddActivity"
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/retrofit/ApiService.java
浏览文件 @ c46790fe
......@@ -1373,6 +1373,29 @@ public interface ApiService {
@GET("/returnApply/po/page/list")
Observable<BaseBean> returnPoApplyList(@QueryMap Map<String, Object> param);
/**
* step7_6 发送订单退货申请
*
* @return
*/
@POST("/procedureStart/po/applyReturn/{id}")
Observable<BaseBean> returnPoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
* step7_6 发送订单退货申请
*
* @return
*/
@POST("/procedureStart/so/applyReturn/{id}")
Observable<BaseBean> returnSoAdd(@Path("id") String id, @Body RequestBody requestBody);
/**
* 退货新增查询部门
*
* @return
*/
@GET("/stock/find/dept")
Observable<BaseBean> returnDept(@Query("deptId") String id);
/**
* 审核历史
*
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @ c46790fe
......@@ -297,6 +297,7 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_flow:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @ c46790fe
......@@ -256,6 +256,7 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_flow:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @ c46790fe
......@@ -307,6 +307,7 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_flow:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProductOrderDetailActivity.java
浏览文件 @ c46790fe
......@@ -173,6 +173,7 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_flow:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ReturnApplyActivity.java
浏览文件 @ c46790fe
......@@ -206,11 +206,12 @@ public class ReturnApplyActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.add:
startActivity(UseApplyAddActivity.class,
"num", getIntent().getStringExtra("num"),
startActivity(ReturnAddActivity.class,
"returnNum", getIntent().getStringExtra("returnNum"),
"orderType", getIntent().getStringExtra("orderType"),
"productId", getIntent().getStringExtra("productId"),
"simpleCode", getIntent().getStringExtra("simpleCode"),
"orderItemId", getIntent().getStringExtra("orderItemId"),
"enterStockType", getIntent().getStringExtra("enterStockType"),
"id", getIntent().getStringExtra("orderId"));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SaleOrderDetailActivity.java
浏览文件 @ c46790fe
......@@ -284,6 +284,7 @@ public class SaleOrderDetailActivity extends WorkToolBarActivity {
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_flow:
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @ c46790fe
......@@ -273,6 +273,7 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
"product", proList.get(position).getProductName(),
"simpleCode", proList.get(position).getProductSimpleCode(),
"orderId", getIntent().getStringExtra("id"),
"orderItemId", proList.get(position).getId(),
"productId", proList.get(position).getProductId() + "");
break;
case R.id.tv_flow:
......
app/src/main/res/layout/activity_return_add.xml 0 → 100644
浏览文件 @ c46790fe
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/tv_bottom"
android:layout_width="match_parent"
android:layout_height="48mm"
android:layout_alignParentBottom="true"
android:background="#5C768A"
android:gravity="center"
android:orientation="horizontal"
android:text="提交退货申请"
android:textColor="@color/white"
android:textSize="16sp" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/tv_bottom"
android:background="@color/white">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="退货数量"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_max_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5mm"
android:text="*退货最大数量(0)"
android:textColor="@color/red"
android:textSize="10sp" />
</LinearLayout>
<EditText
android:id="@+id/et_num"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginLeft="10mm"
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:hint="输入数量"
android:inputType="numberDecimal"
android:padding="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="退货类别"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_return_type"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:padding="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_choose_stock"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="退货到仓库"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_stock"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:hint="请选择仓库"
android:padding="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_money"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="填写核销金额"
android:textSize="14sp" />
<EditText
android:id="@+id/et_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="10mm"
android:layout_weight="1"
android:background="@null"
android:gravity="right"
android:hint="填写核销金额"
android:inputType="numberDecimal"
android:padding="3mm"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="10mm"
android:text="退货原因"
android:textSize="14sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20mm"
android:background="@drawable/shape_confirm_order"
android:orientation="vertical">
<EditText
android:id="@+id/et_remark"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3mm"
android:background="@null"
android:gravity="top"
android:hint="请输入"
android:minLines="4"
android:padding="5mm"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_remark_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_margin="4mm"
android:text="0/140"
android:textColor="@color/flexible_text_gray" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论