更改打印高度，去除条码限定格式判断，增加栈板选择

app/src/main/java/com/uas/pda_smart_com_lg/bean/VersionUpgradeBean.java

@@ -0,0 +1,52 @@
+package com.uas.pda_smart_com_lg.bean;
+
+/**
+ * Created by cjh-sail on 2023-06-25
+ */
+public class VersionUpgradeBean {
+    public String PP_PDACODE;
+    public String PP_VERSIONNUM;
+    public String PP_ATTACH;
+    public String PP_REMARK;
+    public String PP_VERSIONNAME;
+
+    public String getPP_PDACODE() {
+        return PP_PDACODE;
+    }
+
+    public void setPP_PDACODE(String PP_PDACODE) {
+        this.PP_PDACODE = PP_PDACODE;
+    }
+
+    public String getPP_VERSIONNUM() {
+        return PP_VERSIONNUM;
+    }
+
+    public void setPP_VERSIONNUM(String PP_VERSIONNUM) {
+        this.PP_VERSIONNUM = PP_VERSIONNUM;
+    }
+
+    public String getPP_ATTACH() {
+        return PP_ATTACH;
+    }
+
+    public void setPP_ATTACH(String PP_ATTACH) {
+        this.PP_ATTACH = PP_ATTACH;
+    }
+
+    public String getPP_REMARK() {
+        return PP_REMARK;
+    }
+
+    public void setPP_REMARK(String PP_REMARK) {
+        this.PP_REMARK = PP_REMARK;
+    }
+
+    public String getPP_VERSIONNAME() {
+        return PP_VERSIONNAME;
+    }
+
+    public void setPP_VERSIONNAME(String PP_VERSIONNAME) {
+        this.PP_VERSIONNAME = PP_VERSIONNAME;
+    }
+}

app/src/main/java/com/uas/pda_smart_com_lg/fragment/BarcodeInfoCollectFragment.java

@@ -21,7 +21,6 @@ import com.uas.pda_smart_com_lg.global.GloableParams;
 import com.uas.pda_smart_com_lg.listener.MyEditorActionListener;
 import com.uas.pda_smart_com_lg.util.CameraUtil;
 import com.uas.pda_smart_com_lg.util.CommonUtil;
-import com.uas.pda_smart_com_lg.util.Constants;
 import com.uas.pda_smart_com_lg.util.FastjsonUtil;
 import com.uas.pda_smart_com_lg.util.HttpCallback;
 import com.uas.pda_smart_com_lg.util.HttpParams;
@@ -142,10 +141,10 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
         if (TextUtils.isEmpty(barcode)) {
             return;
         }
-        if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-            CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-            return;
-        }
+//        if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//            CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//            return;
+//        }
         mIgnoreFocusChange = true;
         progressDialog.show();
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()

app/src/main/java/com/uas/pda_smart_com_lg/fragment/FinishedGoodsCollectFragment.java

@@ -428,9 +428,11 @@ public class FinishedGoodsCollectFragment extends BaseFragment implements View.O
         String collectStr = mCollectMsgCet.getText().toString().trim();
         if (TextUtils.isEmpty(collectStr)) {
             CommonUtil.toastNoRepeat(getActivity(), "请输入采集号码");
-        } else if (!collectStr.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-        } else {
+        }
+//        else if (!collectStr.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//        }
+        else {
             if (mCollectModel == 0) {
                 saveToDatabase(collectStr);
             } else if (mCollectModel == 1) {

app/src/main/java/com/uas/pda_smart_com_lg/fragment/FinishedGoodsOutCollectFragment.java

@@ -426,9 +426,11 @@ public class FinishedGoodsOutCollectFragment extends BaseFragment implements Vie
         String collectStr = mCollectMsgCet.getText().toString().trim();
         if (TextUtils.isEmpty(collectStr)) {
             CommonUtil.toastNoRepeat(getActivity(), "请输入采集号码");
-        } else if (!collectStr.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-        } else {
+        }
+//        else if (!collectStr.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//        }
+        else {
             if (mCollectModel == 0) {
                 saveToDatabase(collectStr);
             } else if (mCollectModel == 1) {

app/src/main/java/com/uas/pda_smart_com_lg/fragment/IOCOutMakeMaterialOper.java

@@ -2206,9 +2206,11 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         currentBarcode = etBarCode.getText().toString().trim();
         if (TextUtils.isEmpty(currentBarcode)) {
             CommonUtil.toastNoRepeat(getActivity(), "请输入号码");
-        } else if (!currentBarcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-        } else {
+        }
+//        else if (!currentBarcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//        }
+        else {
             if (mCollectModel == 1) {
                 if (CommonUtil.isNetWorkConnected(getActivity())) {
                     barcodeEnterEvent(false, true);

app/src/main/java/com/uas/pda_smart_com_lg/fragment/MaterialCollectionFragment.java

@@ -354,9 +354,10 @@ public class MaterialCollectionFragment extends BaseFragment {
 //                else if (!materialNum.matches(Constants.REGEX.NO_SYMBOL)) {
 //                    CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.prodcode_cannot_contain_special));
 //                }
-        else if (!barCode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-        } else {
+//        else if (!barCode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//        }
+        else {
             String materialNumber = mMaterialNumberEt.getText().toString();
             try {
                 List<TableLPRODIONEEDGET> allMaterialList = null;

app/src/main/java/com/uas/pda_smart_com_lg/fragment/MaterialInCollectFragment.java

@@ -464,21 +464,21 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             }, 100);
             return;
         }
-        if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-            if (mCollectType.equals("barcode")) {
-                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-            } else if (mCollectType.equals("package")) {
-                CommonUtil.toastNoRepeat(mActivity, getString(R.string.box_number_cannot_contain_special));
-            }
-            new Handler().postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    mBarcodeEditText.setEnabled(true);
-                    mBarcodeEditText.setText(null);
-                    mBarcodeEditText.requestFocus();
-                }
-            }, 100);
-        } else {
+//        if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//            if (mCollectType.equals("barcode")) {
+//                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//            } else if (mCollectType.equals("package")) {
+//                CommonUtil.toastNoRepeat(mActivity, getString(R.string.box_number_cannot_contain_special));
+//            }
+//            new Handler().postDelayed(new Runnable() {
+//                @Override
+//                public void run() {
+//                    mBarcodeEditText.setEnabled(true);
+//                    mBarcodeEditText.setText(null);
+//                    mBarcodeEditText.requestFocus();
+//                }
+//            }, 100);
+//        } else {
             mIgnoreFocusChange = true;
             String url = null;
             try {
@@ -558,7 +558,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             mStringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
             mStringRequest.setTag(TAG + "codedata");
             PdaApplication.mRequestQueue.add(mStringRequest);
-        }
+//        }
 
     }
 
@@ -797,13 +797,14 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_input_storage_location));
         } else if (mDcCheck && TextUtils.isEmpty(dc)) {
             CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_input_storage_dc));
-        } else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL) || (mOldCheck && !old.matches(Constants.REGEX.NO_CN_SYMBOL))) {
-            if (mCollectType.equals("barcode"))
-                CommonUtil.toastNoRepeat(mActivity, getResources().getString(R.string.barcode_cannot_contain_special));
-            else if (mCollectType.equals("package")) {
-                CommonUtil.toastNoRepeat(mActivity, getResources().getString(R.string.box_number_cannot_contain_special));
-            }
         }
+//        else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL) || (mOldCheck && !old.matches(Constants.REGEX.NO_CN_SYMBOL))) {
+//            if (mCollectType.equals("barcode"))
+//                CommonUtil.toastNoRepeat(mActivity, getResources().getString(R.string.barcode_cannot_contain_special));
+//            else if (mCollectType.equals("package")) {
+//                CommonUtil.toastNoRepeat(mActivity, getResources().getString(R.string.box_number_cannot_contain_special));
+//            }
+//        }
 //        else if (mDateCodeCheck && !datecode.matches(Constants.REGEX.IS_DATE) && !datecode.matches(Constants.REGEX.IS_DATE2)) {
 //            CommonUtil.toastNoRepeat(mActivity, getString(R.string.date_format_error));
 //        }

app/src/main/java/com/uas/pda_smart_com_lg/fragment/MaterialOutRevocationStockFragment.java

@@ -181,9 +181,11 @@ public class MaterialOutRevocationStockFragment extends BaseFragment {
         String currentText = mBarcodeEditText.getText().toString().trim();
         if (TextUtils.isEmpty(currentText)) {
             CommonUtil.toastNoRepeat(getActivity(), "请输入号码");
-        } else if (!currentText.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-        } else {
+        }
+//        else if (!currentText.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//        }
+        else {
             if (CommonUtil.isNetWorkConnected(getActivity())) {
                 revokeStock();
             } else {

app/src/main/java/com/uas/pda_smart_com_lg/fragment/ModifyBarcodeQuantityFragment.java

@@ -135,9 +135,11 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
                     CommonUtil.toastNoRepeat(mActivity, "请输入条码数量");
                 } else if (!quantity.matches(Constants.REGEX.IS_FLOAT)) {
                     CommonUtil.toastNoRepeat(mActivity, "请输入正确的条码数量");
-                } else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-                } else {
+                }
+//                else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//                }
+                else {
                     progressDialog.show();
                     PdaApplication.mRequestQueue.cancelAll(TAG + "update");
 
@@ -239,13 +241,13 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
     private void getBarcodeData() {
         String barcode = mBarcodeEditText.getText().toString().trim();
         if (!TextUtils.isEmpty(barcode)) {
-            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-                mResultTextView.setVisibility(View.VISIBLE);
-                mResultTextView.setText(getString(R.string.barcode_cannot_contain_special));
-                mBarcodeEditText.setText(null);
-                mBarcodeEditText.requestFocus();
-            } else {
+//            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//                mResultTextView.setVisibility(View.VISIBLE);
+//                mResultTextView.setText(getString(R.string.barcode_cannot_contain_special));
+//                mBarcodeEditText.setText(null);
+//                mBarcodeEditText.requestFocus();
+//            } else {
                 mIgnoreFocusChange = true;
                 progressDialog.show();
                 String url = null;
@@ -305,7 +307,7 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
                 mStringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
                 mStringRequest.setTag(TAG + "barcodedata");
                 PdaApplication.mRequestQueue.add(mStringRequest);
-            }
+//            }
         }
     }
 

app/src/main/java/com/uas/pda_smart_com_lg/fragment/ModifyQuantityOutFragment.java

@@ -166,9 +166,11 @@ public class ModifyQuantityOutFragment extends BaseFragment {
             CommonUtil.toastNoRepeat(mActivity, "请输入条码数量");
         } else if (!quantity.matches(Constants.REGEX.IS_FLOAT)) {
             CommonUtil.toastNoRepeat(mActivity, "请输入正确的条码数量");
-        } else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-            CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-        } else {
+        }
+//        else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//            CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//        }
+        else {
             progressDialog.show();
             PdaApplication.mRequestQueue.cancelAll(TAG + "update");
 
@@ -243,13 +245,13 @@ public class ModifyQuantityOutFragment extends BaseFragment {
     private void getBarcodeData() {
         String barcode = mBarcodeEditText.getText().toString().trim();
         if (!TextUtils.isEmpty(barcode)) {
-            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-                mResultTextView.setVisibility(View.VISIBLE);
-                mResultTextView.setText(getString(R.string.barcode_cannot_contain_special));
-                mBarcodeEditText.setText(null);
-                mBarcodeEditText.requestFocus();
-            } else {
+//            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//                mResultTextView.setVisibility(View.VISIBLE);
+//                mResultTextView.setText(getString(R.string.barcode_cannot_contain_special));
+//                mBarcodeEditText.setText(null);
+//                mBarcodeEditText.requestFocus();
+//            } else {
                 mIgnoreFocusChange = true;
                 progressDialog.show();
                 String url = null;
@@ -304,7 +306,7 @@ public class ModifyQuantityOutFragment extends BaseFragment {
                 mStringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
                 mStringRequest.setTag(TAG + "barcodedata");
                 PdaApplication.mRequestQueue.add(mStringRequest);
-            }
+//            }
         }
     }
 

app/src/main/java/com/uas/pda_smart_com_lg/fragment/NewBePutInStorageOrderDetailFragment.java

@@ -56,6 +56,7 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
     private TextView tv_hint;
     private TextView tv_qty;
     private RadioGroup radiogroup1;
+    private RadioButton radiobutton0;
     private RadioButton radiobutton1;
     private RadioButton radiobutton2;
 
@@ -77,8 +78,9 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
 
         radiogroup1 = root.findViewById(R.id.radiogroup1);
         radiobutton1 = root.findViewById(R.id.radiobutton1);
+        radiobutton0 = root.findViewById(R.id.radiobutton0);
         radiobutton2 = root.findViewById(R.id.radiobutton2);
-        radiobutton1.setChecked(true);
+        radiobutton0.setChecked(true);
 
         mTypeColumn = new Column<String>("类型", "PIM_TYPE");
         mcontentColumn = new Column<String>("内容", "CONTENT");
@@ -220,6 +222,8 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
             text_radiobutton="BOX";
         }else if (radiobutton2.isChecked()==true){
             text_radiobutton="SN";
+        }else if (radiobutton0.isChecked()==true){
+            text_radiobutton="PALLTE";
         }else {
             text_radiobutton="";
         }

app/src/main/java/com/uas/pda_smart_com_lg/fragment/NewOutboundDeliveryorderDetailFragment.java

@@ -56,6 +56,7 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
     private TextView tv_productdetails;
     private TextView tv_hint;
     private RadioGroup radiogroup1;
+    private RadioButton radiobutton0;
     private RadioButton radiobutton1;
     private RadioButton radiobutton2;
     private TextView tv_qty;
@@ -75,10 +76,11 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
         tv_productdetails = root.findViewById(R.id.tv_productdetails);
         tv_hint = root.findViewById(R.id.tv_hint);
         radiogroup1 = root.findViewById(R.id.radiogroup1);
+        radiobutton0 = root.findViewById(R.id.radiobutton0);
         radiobutton1 = root.findViewById(R.id.radiobutton1);
         radiobutton2 = root.findViewById(R.id.radiobutton2);
         tv_qty = root.findViewById(R.id.tv_qty);
-        radiobutton1.setChecked(true);
+        radiobutton0.setChecked(true);
 
 
         mTypeColumn = new Column<String>("类型", "PIM_TYPE");
@@ -221,6 +223,8 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
             text_radiobutton="BOX";
         }else if (radiobutton2.isChecked()==true){
             text_radiobutton="SN";
+        }else if (radiobutton0.isChecked()==true){
+            text_radiobutton="PALLTE";
         }else {
             text_radiobutton="";
         }

app/src/main/java/com/uas/pda_smart_com_lg/fragment/SpecialMaterialOutFragment.java

@@ -335,9 +335,9 @@ public class SpecialMaterialOutFragment extends BaseFragment {
     private void specialOut() {
         final String barcode = mBarcodeEditText.getText().toString().trim();
         if (!TextUtils.isEmpty(barcode)) {
-            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-            } else {
+//            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//            } else {
                 progressDialog.show();
 
                 PdaApplication.mRequestQueue.cancelAll(TAG + "specialout");
@@ -451,7 +451,7 @@ public class SpecialMaterialOutFragment extends BaseFragment {
                 mStringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
                 mStringRequest.setTag(TAG + "specialout");
                 PdaApplication.mRequestQueue.add(mStringRequest);
-            }
+//            }
         } else {
             CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_collect_barcode));
         }
@@ -818,9 +818,9 @@ public class SpecialMaterialOutFragment extends BaseFragment {
     private void getBarcodeData() {
         String barcode = mBarcodeEditText.getText().toString().trim();
         if (!TextUtils.isEmpty(barcode)) {
-            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
-            } else {
+//            if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                CommonUtil.toastNoRepeat(mActivity, getString(R.string.barcode_cannot_contain_special));
+//            } else {
                 progressDialog.show();
                 String url = "";
                 try {
@@ -872,7 +872,7 @@ public class SpecialMaterialOutFragment extends BaseFragment {
                 mStringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
                 mStringRequest.setTag(TAG + "barcodedata");
                 PdaApplication.mRequestQueue.add(mStringRequest);
-            }
+//            }
         }
     }
 

app/src/main/java/com/uas/pda_smart_com_lg/fragment/VersionUpgradeFragment.java

@@ -13,9 +13,11 @@ import android.widget.Button;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.uas.pda_smart_com_lg.R;
+import com.uas.pda_smart_com_lg.bean.VersionUpgradeBean;
 import com.uas.pda_smart_com_lg.global.GloableParams;
 import com.uas.pda_smart_com_lg.util.AndroidUtil;
 import com.uas.pda_smart_com_lg.util.CommonUtil;
@@ -31,6 +33,8 @@ import com.uas.pda_smart_com_lg.view.business.CommonProgressPop;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.uas.pda_smart_com_lg.util.Constants.CONSTANT.APK_FILE_NAME;
 import static com.uas.pda_smart_com_lg.util.Constants.CONSTANT.APK_FILE_PATH;
@@ -113,16 +117,42 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
                 progressDialog.dismiss();
                 String result = o.toString();
                 JSONObject resultObject = JSON.parseObject(result);
-                JSONObject dataObject = resultObject.getJSONObject("data");
-                if (dataObject != null) {
-                    mNewVersionTv.setText(FastjsonUtil.getText(dataObject, "PP_VERSIONNAME"));
-                    mMsgTextView.setText(FastjsonUtil.getText(dataObject, "PP_REMARK"));
-
-                    mAttachId = FastjsonUtil.getText(dataObject, "PP_ATTACH");
-                    if (!TextUtils.isEmpty(mAttachId)) {
-                        mUpgradeButton.setVisibility(View.VISIBLE);
-                    } else {
-                        mUpgradeButton.setVisibility(View.GONE);
+                JSONArray dataArray = resultObject.getJSONArray("data");
+                List<VersionUpgradeBean> list=new ArrayList<>();
+                list.clear();
+                if (dataArray != null && dataArray.size() > 0) {
+                    for (int i = 0; i < dataArray.size(); i++) {
+                        JSONObject dataObject = dataArray.getJSONObject(i);
+                        if (dataObject != null) {
+                            VersionUpgradeBean jltStorageInBean = new VersionUpgradeBean();
+                            if (FastjsonUtil.getText(dataObject, "PP_PDACODE").equals("UAS仓储管理")){
+                                jltStorageInBean.setPP_PDACODE(FastjsonUtil.getText(dataObject, "PP_PDACODE"));
+                                jltStorageInBean.setPP_VERSIONNUM(FastjsonUtil.getText(dataObject, "PP_VERSIONNUM"));
+                                jltStorageInBean.setPP_ATTACH(FastjsonUtil.getText(dataObject, "PP_ATTACH"));
+                                jltStorageInBean.setPP_REMARK(FastjsonUtil.getText(dataObject, "PP_REMARK"));
+                                jltStorageInBean.setPP_VERSIONNAME(FastjsonUtil.getText(dataObject, "PP_VERSIONNAME"));
+                                list.add(jltStorageInBean);
+                                mUpgradeButton.setVisibility(View.VISIBLE);
+                            }else {
+                                mUpgradeButton.setVisibility(View.GONE);
+                            }
+
+                        }
+                    }
+                }
+                if (list == null || list.size() == 0){
+                    mUpgradeButton.setVisibility(View.GONE);
+                }else {
+                    for (int i=0;i<list.size();i++){
+                        VersionUpgradeBean versionUpgradeBean = list.get(0);
+                        mNewVersionTv.setText(versionUpgradeBean.getPP_VERSIONNAME());
+                        mMsgTextView.setText(versionUpgradeBean.getPP_REMARK());
+                        mAttachId = versionUpgradeBean.getPP_ATTACH();
+                        if (!TextUtils.isEmpty(mAttachId)) {
+                            mUpgradeButton.setVisibility(View.VISIBLE);
+                        } else {
+                            mUpgradeButton.setVisibility(View.VISIBLE);
+                        }
                     }
                 }
             }

app/src/main/java/com/uas/pda_smart_com_lg/fragment/WHBatchBreakPackageFragment.java

@@ -282,11 +282,11 @@ public class WHBatchBreakPackageFragment extends BaseFragment implements VolleyU
             etInnerCode.setWarnIconVisible();
             return;
         }
-
-        if (!strInnerCode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-            return;
-        }
+//
+//        if (!strInnerCode.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//            return;
+//        }
 
         for (int i = 0; i < gridData.size(); i++) {
             OutBox.DetailBean gdbp = gridData.get(i);

app/src/main/java/com/uas/pda_smart_com_lg/fragment/WHBreakingBatchFragment.java

@@ -266,17 +266,17 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
                         return true;
                     }
 
-                    if (!str.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-                        etOrBarcode.setText("");
-                        etOrBarcode.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                etOrBarcode.requestFocus();
-                            }
-                        }, 100);
-                        return true;
-                    }
+//                    if (!str.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//                        etOrBarcode.setText("");
+//                        etOrBarcode.postDelayed(new Runnable() {
+//                            @Override
+//                            public void run() {
+//                                etOrBarcode.requestFocus();
+//                            }
+//                        }, 100);
+//                        return true;
+//                    }
 
                     CommonUtil.closeKeybord(etOrBarcode, mActivity);
                     //请求详细数据
@@ -476,10 +476,10 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
                     Toast.makeText(getActivity().getApplicationContext(), "还有必填项值为空", Toast.LENGTH_SHORT).show();
                     return;
                 }
-                if (!etOrBarcode.getText().toString().trim().matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                    CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-                    return;
-                }
+//                if (!etOrBarcode.getText().toString().trim().matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                    CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//                    return;
+//                }
 //                if (!str.matches(Constants.REGEX.NO_CN_SYMBOL)) {
 //                    CommonUtil.toastNoRepeat(getActivity(), "请输入正确的拆分数量");
 //                    return;
@@ -589,17 +589,17 @@ public class WHBreakingBatchFragment extends BaseFragment implements View.OnClic
                         return;
                     }
 
-                    if (!str.matches(Constants.REGEX.NO_CN_SYMBOL)) {
-                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-                        etOrBarcode.setText("");
-                        etOrBarcode.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                etOrBarcode.requestFocus();
-                            }
-                        }, 100);
-                        return;
-                    }
+//                    if (!str.matches(Constants.REGEX.NO_CN_SYMBOL)) {
+//                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//                        etOrBarcode.setText("");
+//                        etOrBarcode.postDelayed(new Runnable() {
+//                            @Override
+//                            public void run() {
+//                                etOrBarcode.requestFocus();
+//                            }
+//                        }, 100);
+//                        return;
+//                    }
 
                     CommonUtil.closeKeybord(etOrBarcode, mActivity);
                     //请求详细数据

app/src/main/java/com/uas/pda_smart_com_lg/util/PrintUtils.java

@@ -24,7 +24,7 @@ public class PrintUtils {
             int offset = 6,
                     h = 400,
                     v = 800,
-                    height = 600,
+                    height = 400,
                     qty = 1;
 //                    h = 200,
 //                    v = 200,
@@ -70,7 +70,7 @@ public class PrintUtils {
                                     if (StringUtil.isEmpty(String.valueOf(fontSize))){
                                         fontSize=1;
                                     }
-                                    printHelper = printHelper.printText(printText)
+                                    printHelper = printHelper.printText("")
                                             .setTextAutLine(printX+"",printY + (int) ((0.6 * dpi) / 25.4)+"",lp_width,fontSize,false,false,printText)
 //                                            .setX(printX)
 //                                            .setY(printY + (int) ((0.6 * dpi) / 25.4))

app/src/main/res/layout/newbeputinstorageorderdetail_fragment.xml

@@ -69,16 +69,21 @@
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="horizontal">
-
+            <RadioButton
+                android:id="@+id/radiobutton0"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="栈板" />
             <RadioButton
                 android:id="@+id/radiobutton1"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
+                android:layout_marginLeft="10dp"
                 android:text="箱号" />
 
             <RadioButton
                 android:id="@+id/radiobutton2"
-                android:layout_marginLeft="@dimen/textsize_20"
+                android:layout_marginLeft="@dimen/dp_10"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:text="单台序列号" />

app/src/main/res/layout/newoutbounddeliveryorderdetail_fragment.xml

@@ -70,16 +70,21 @@
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:orientation="horizontal">
-
+            <RadioButton
+                android:id="@+id/radiobutton0"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:text="栈板" />
             <RadioButton
                 android:id="@+id/radiobutton1"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
                 android:text="箱号" />
 
             <RadioButton
                 android:id="@+id/radiobutton2"
-                android:layout_marginLeft="@dimen/textsize_20"
+                android:layout_marginLeft="@dimen/dp_10"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:text="单台序列号" />