Browse Source

条码数量修改,取消0的限制

RaoMeng 4 years ago
parent
commit
3fabe11992

+ 1 - 1
app/src/main/java/com/uas/uaspda/fragment/ModifyBarcodeQuantityFragment.java

@@ -133,7 +133,7 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
                     CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_collect_barcode));
                     CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_collect_barcode));
                 } else if (TextUtils.isEmpty(quantity)) {
                 } else if (TextUtils.isEmpty(quantity)) {
                     CommonUtil.toastNoRepeat(mActivity, "请输入条码数量");
                     CommonUtil.toastNoRepeat(mActivity, "请输入条码数量");
-                } else if (!quantity.matches(Constants.REGEX.IS_FLOAT)) {
+                } else if (!quantity.matches(Constants.REGEX.IS_NUM)) {
                     CommonUtil.toastNoRepeat(mActivity, "请输入正确的条码数量");
                     CommonUtil.toastNoRepeat(mActivity, "请输入正确的条码数量");
                 } else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
                 } else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
                     CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
                     CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));

+ 2 - 0
app/src/main/java/com/uas/uaspda/util/Constants.java

@@ -45,6 +45,8 @@ public interface Constants {
         String NO_CN_SYMBOL = "^[a-zA-Z0-9_\\n\\s\\-\\.\\*\\,\\/\\(\\)\\\\]+$";
         String NO_CN_SYMBOL = "^[a-zA-Z0-9_\\n\\s\\-\\.\\*\\,\\/\\(\\)\\\\]+$";
         //正数
         //正数
         String IS_FLOAT = "^(([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))$";
         String IS_FLOAT = "^(([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))$";
+        //自然数
+        String IS_NUM = "^((0)|([0-9]+\\.[0-9]*[1-9][0-9]*)|([0-9]*[1-9][0-9]*\\.[0-9]+)|([0-9]*[1-9][0-9]*))$";
         //日期
         //日期
         String IS_DATE = "((((19|20)\\d{2})-(0?(1|[3-9])|1[012])-(0?[1-9]|[12]\\d|30))|(((19|20)\\d{2})-(0?[13578]|1[02])-31)|(((19|20)\\d{2})-0?2-(0?[1-9]|1\\d|2[0-8]))|((((19|20)([13579][26]|[2468][048]|0[48]))|(2000))-0?2-29))$";
         String IS_DATE = "((((19|20)\\d{2})-(0?(1|[3-9])|1[012])-(0?[1-9]|[12]\\d|30))|(((19|20)\\d{2})-(0?[13578]|1[02])-31)|(((19|20)\\d{2})-0?2-(0?[1-9]|1\\d|2[0-8]))|((((19|20)([13579][26]|[2468][048]|0[48]))|(2000))-0?2-29))$";
         String IS_DATE2 = "((((19|20)\\d{2})(0?(1|[3-9])|1[012])(0?[1-9]|[12]\\d|30))|(((19|20)\\d{2})(0?[13578]|1[02])31)|(((19|20)\\d{2})(0?2)(0?[1-9]|1\\d|2[0-8]))|((((19|20)([13579][26]|[2468][048]|0[48]))|(2000))(0?2)29))$";
         String IS_DATE2 = "((((19|20)\\d{2})(0?(1|[3-9])|1[012])(0?[1-9]|[12]\\d|30))|(((19|20)\\d{2})(0?[13578]|1[02])31)|(((19|20)\\d{2})(0?2)(0?[1-9]|1\\d|2[0-8]))|((((19|20)([13579][26]|[2468][048]|0[48]))|(2000))(0?2)29))$";