1.添加退件判断

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改

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

@@ -18,6 +18,7 @@ import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,6 +53,7 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
     EditText etBoxNum;
     private Map<String, Object> param;
     private String orderType;
+    private OrderDetail dataBean;
 
     @Override
     protected void initView() {
@@ -108,7 +110,7 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
-                OrderDetail dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
+                dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
                 List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
                 for (OrderDetail.OrderItemsBean orderItem : orderItems) {
                  if (TextUtils.equals(orderItem.getId(),getIntent().getStringExtra("orderItemId"))) {
@@ -144,6 +146,18 @@ public class AddStockApplyAddActivity extends WorkToolBarActivity {
             toast("请输入库数量");
             return;
         }
+        if (dataBean!=null) {
+            List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
+            for (OrderDetail.OrderItemsBean orderItem : orderItems) {
+                if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
+                    if (new BigDecimal(num).compareTo(new BigDecimal(orderItem.getCanUseProductSum())) ==1){
+                        toast(String.format("可申请入库数量最大为%s",MathUtils.converData(orderItem.getCanInStoreProductSum(), 3)));
+                        return;
+                    }
+                }
+
+            }
+        }
         param.put("productAmount", num);
         param.put("boxCode", boxCode);
         param.put("orderItemId", getIntent().getStringExtra("orderItemId"));

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

@@ -30,6 +30,7 @@ import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -83,6 +84,7 @@ public class ReturnAddActivity extends WorkToolBarActivity {
     private JSONArray deptList;
     private List<String> deptNameList;
     private Integer chooseDep;
+    private OrderDetail dataBean;
 
     @Override
     protected void initView() {
@@ -197,13 +199,13 @@ public class ReturnAddActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
-                OrderDetail dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
+                dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
                 List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
                 for (OrderDetail.OrderItemsBean orderItem : orderItems) {
                     if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
-                        if (TextUtils.isEmpty(enterStockType)){
+                        if (TextUtils.isEmpty(enterStockType)) {
                             tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
-                        }else {
+                        } else {
                             String returnNum = TextUtils.equals(enterStockType, "1") ?
                                     orderItem.getCanOutReturnSum() : orderItem.getCanUsedReturnSum();
                             tvMaxNum.setText(String.format("*退货最大数量(%s)", MathUtils.converData(returnNum, 3)));
@@ -272,6 +274,28 @@ public class ReturnAddActivity extends WorkToolBarActivity {
             toast("请输入退货数量");
             return;
         }
+        if (dataBean != null) {
+            List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
+            for (OrderDetail.OrderItemsBean orderItem : orderItems) {
+                if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
+                    if (TextUtils.isEmpty(enterStockType)) {
+                        if (new BigDecimal(num).compareTo(new BigDecimal(orderItem.getCanUseProductSum())) == 1) {
+                            toast(String.format("可申请退货数量最大为%s", MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
+                            return;
+                        }
+                    } else {
+                        String returnNum = TextUtils.equals(enterStockType, "1") ?
+                                orderItem.getCanOutReturnSum() : orderItem.getCanUsedReturnSum();
+                        if (new BigDecimal(num).compareTo(new BigDecimal(returnNum)) == 1) {
+                            toast(String.format("可申请退货数量最大为%s", MathUtils.converData(returnNum, 3)));
+                            return;
+                        }
+
+                    }
+
+                }
+            }
+        }
         if (TextUtils.isEmpty(price) && chooseType == 3) {
             toast("请输入核销金额");
             return;

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

@@ -20,6 +20,7 @@ import com.wd.workoffice.util.WorkUtils;
 
 import org.greenrobot.eventbus.EventBus;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,6 +53,7 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
     TextView tvRemarkNum;
     private Map<String, Object> param;
     private String orderType;
+    private OrderDetail dataBean;
 
     @Override
     protected void initView() {
@@ -114,7 +116,7 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
-                OrderDetail dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
+                dataBean = JSON.parseObject(data.getData().toString(), OrderDetail.class);
                 List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
                 for (OrderDetail.OrderItemsBean orderItem : orderItems) {
                     if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
@@ -145,6 +147,18 @@ public class UseApplyAddActivity extends WorkToolBarActivity {
             toast("请输入领用数量");
             return;
         }
+        if (dataBean!=null) {
+            List<OrderDetail.OrderItemsBean> orderItems = dataBean.getOrderItems();
+            for (OrderDetail.OrderItemsBean orderItem : orderItems) {
+                if (TextUtils.equals(orderItem.getId(), getIntent().getStringExtra("orderItemId"))) {
+                    if (new BigDecimal(num).compareTo(new BigDecimal(orderItem.getCanUseProductSum())) ==1){
+                        toast(String.format("可申请领用数量最大为%s",MathUtils.converData(orderItem.getCanUseProductSum(), 3)));
+                        return;
+                    }
+                }
+
+            }
+        }
         param.put("productAmount", num);
         param.put("orderId", getIntent().getStringExtra("id"));
         param.put("applyRemark", remark);