修改入库采集发料工单输入类型,岗位打卡修改列表名称, 岗位弹窗增加调用接口,调整岗位打卡工单流水弹窗接口参数, 页面列表增加名称工单号,增加关键物料核对页接口异常与错误时清除物料条码

,关键物料核对物料条码增加Enter与清除,增加关键物料核对功能.收料页面增加总数统计,收料通知单页增加总数,增加SN过站功能,修改工单流水选项限制,增加标签补打功能, 增加备注选项, 蓝牙打印文字模版修改.增加工单切换功能,极测车间程序, 修改扫描蓝牙过滤条件,收料页与收料通知单页增加序号与删除功能,设备管理修改扫一功能功能,岗位打卡页增加卡号关联列表人员卡号. 取消签退与勾选明细的限制,增加岗位打卡记录查询列表功能, 修复打卡显示良品和工单流水参数问题.

app/src/main/java/com/uas/jc_workstation/activity/FunctionActivity.java

@@ -27,6 +27,8 @@ import com.uas.jc_workstation.fragment.HePiFragment;
 import com.uas.jc_workstation.fragment.IndexSettingFragment;
 import com.uas.jc_workstation.fragment.IndexWareHouseContentFragment;
 import com.uas.jc_workstation.fragment.JumpSiteFragment;
+import com.uas.jc_workstation.fragment.KeyMaterialVerificationFragment;
+import com.uas.jc_workstation.fragment.LabeLreprintingFragment;
 import com.uas.jc_workstation.fragment.NotGoodCaiJiFragment;
 import com.uas.jc_workstation.fragment.PackageAcquisitionFragment;
 import com.uas.jc_workstation.fragment.PostPunchFragment;
@@ -35,6 +37,7 @@ import com.uas.jc_workstation.fragment.PutintoAdd_Fragment;
 import com.uas.jc_workstation.fragment.QualityManageFragment;
 import com.uas.jc_workstation.fragment.ReportDetailFragment;
 import com.uas.jc_workstation.fragment.RolloutFragment;
+import com.uas.jc_workstation.fragment.SNGuoZhanFragment;
 import com.uas.jc_workstation.fragment.StartsAndStopsFragment;
 import com.uas.jc_workstation.fragment.StepReceiveFragment;
 import com.uas.jc_workstation.fragment.StepTransferFragment;
@@ -215,7 +218,15 @@ public class FunctionActivity extends BaseActivity implements View.OnClickListen
                 case GloableParams.GRIDNAME_INOUT_STORAGE://入库采集
                     mFragment = new StorageCollectionFragment();
                     break;
-
+                case GloableParams.LABELREPRINTING://标签补打
+                    mFragment = new LabeLreprintingFragment();
+                    break;
+                case GloableParams.GRIDNAME_SN_GUOZHAN://SN过站
+                    mFragment = new SNGuoZhanFragment();
+                    break;
+                case GloableParams.KEY_MATERIAL_VERIFICATION://关键物料核对
+                    mFragment = new KeyMaterialVerificationFragment();
+                    break;
             }
             //添加Fragment
             mbundle.putString(Constants.FLAG.SC_CODE, sc_code);

app/src/main/java/com/uas/jc_workstation/activity/HomeActivity.java

@@ -155,7 +155,10 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);
                 break;
-
+            case GloableParams.LABELREPRINTING://标签补打
+                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
+                startActivity(intent);
+                break;
             case GloableParams.GRIDNAME_SETTING://设置
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);
@@ -167,6 +170,14 @@ public class HomeActivity extends BaseActivity implements AdapterView.OnItemClic
                 intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
                 startActivity(intent);
                 break;
+            case GloableParams.GRIDNAME_SN_GUOZHAN://SN过站
+                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
+                startActivity(intent);
+                break;
+            case GloableParams.KEY_MATERIAL_VERIFICATION://关键物料核对
+                intent.putExtra(DataSourceManager.KEY_GRID_ITEMNAME, itemName);
+                startActivity(intent);
+                break;
         }
     }
 

app/src/main/java/com/uas/jc_workstation/bean/KeyMaterialVaerificationBean.java

@@ -0,0 +1,65 @@
+package com.uas.jc_workstation.bean;
+
+public
+        /**
+         * Created by sw on 2025-01-10
+         */
+class KeyMaterialVaerificationBean {
+    private boolean success;
+    private DataBean data;
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public DataBean getData() {
+        return data;
+    }
+
+    public void setData(DataBean data) {
+        this.data = data;
+    }
+
+    public static class DataBean {
+        private String pr_code;
+        private String totalnum;
+        private String checknum;
+        private String pr_spec;
+
+        public String getPr_code() {
+            return pr_code;
+        }
+
+        public void setPr_code(String pr_code) {
+            this.pr_code = pr_code;
+        }
+
+        public String getTotalnum() {
+            return totalnum;
+        }
+
+        public void setTotalnum(String totalnum) {
+            this.totalnum = totalnum;
+        }
+
+        public String getChecknum() {
+            return checknum;
+        }
+
+        public void setChecknum(String checknum) {
+            this.checknum = checknum;
+        }
+
+        public String getPr_spec() {
+            return pr_spec;
+        }
+
+        public void setPr_spec(String pr_spec) {
+            this.pr_spec = pr_spec;
+        }
+    }
+}

app/src/main/java/com/uas/jc_workstation/bean/WorkOrderFlow.java

@@ -15,6 +15,16 @@ class WorkOrderFlow {
     private String PCD_DATE;
     private String PCD_INDATE;
 
+    public String getPCD_MACODE() {
+        return PCD_MACODE;
+    }
+
+    public void setPCD_MACODE(String PCD_MACODE) {
+        this.PCD_MACODE = PCD_MACODE;
+    }
+
+    private String PCD_MACODE;
+
     public Boolean getSelect() {
         return isSelect;
     }

app/src/main/java/com/uas/jc_workstation/fragment/BlueToothPrintFragment.java

@@ -340,7 +340,9 @@ public class BlueToothPrintFragment extends BaseFragment {
         if (!ListUtils.isEmpty(models)) {
             for (int i = 0; i < models.size(); i++) {
                 BluetoothDevice bluetoothDevice = models.get(i);
-                if (bluetoothDevice != null && bluetoothDevice.getBluetoothClass().getDeviceClass() == ConnectHelper.PRINT_TYPE) {
+                if (bluetoothDevice != null
+//                        && bluetoothDevice.getBluetoothClass().getDeviceClass() == ConnectHelper.PRINT_TYPE
+                                        ) {
                     printDevices.add(bluetoothDevice);
                 }
             }

app/src/main/java/com/uas/jc_workstation/fragment/CaiPiFragment.java

@@ -577,7 +577,6 @@ public class CaiPiFragment extends BaseFragment {
             }
         }
 
-
         View popView = LayoutInflater.from(getActivity()).inflate(R.layout.popupwindow_whbreaking_batch, null);
         ListView listView = (ListView) popView.findViewById(R.id.list_view);
         Button btnPrintf = (Button) popView.findViewById(R.id.btn_print);

app/src/main/java/com/uas/jc_workstation/fragment/GoodBadAddListFragment.java

@@ -114,6 +114,23 @@ public class GoodBadAddListFragment extends BaseFragment implements HttpCallback
             FunctionActivity.setTitle("备货历史");
         }
 
+//        mFilterImageView = (ImageView) getActivity().findViewById(R.id.btn_actionbar_scan_iv);
+//        mFilterImageView.setBackgroundResource(R.drawable.ic_advanced_filter);
+//        if (mWhichPage == PAGE_STORAGE_FUNACTION
+//                || mWhichPage == PAGE_STORAGE_ADD
+//                || mWhichPage == PAGE_STORAGE_DETAIL) {
+//            FunctionActivity.setTitle("入库单列表("+pi_type+")");
+//        } else if (mWhichPage == PAGE_OUT_DETAIL) {
+//            FunctionActivity.setTitle("出库单列表");
+//        } else if (mWhichPage == PAGE_OUT_HISTORY) {
+//            FunctionActivity.setTitle("备货历史");
+//        }
+//        progressDialog.show();
+//        mKeyword = mSearchEt.getText().toString().trim();
+//        requestStorageList();
+
+        mPageIndex = 1;
+
         mFilterImageView = (ImageView) getActivity().findViewById(R.id.btn_actionbar_scan_iv);
         mFilterImageView.setBackgroundResource(R.drawable.ic_advanced_filter);
 
@@ -283,7 +300,9 @@ public class GoodBadAddListFragment extends BaseFragment implements HttpCallback
                     FragmentUtils.switchFragment(GoodBadAddListFragment.this, mFragment);
                 } else if (mWhichPage == PAGE_STORAGE_ADD) {
 //                    if (mOnListSelectListener != null) {
+
                     EventBus.getDefault().post(new CloseListbean("关闭入库采集页面"));
+                    //getActivity().getSupportFragmentManager().popBackStack();
                     Fragment fragment = new GoodOrBadAddDetailFragment();
                     Bundle bundle = new Bundle();
                     bundle.putString("pi_class", storageInBillBean.getPI_CLASS());
@@ -295,7 +314,7 @@ public class GoodBadAddListFragment extends BaseFragment implements HttpCallback
                     bundle.putString("pi_invostatus", storageInBillBean.getPI_INVOSTATUS());
                     bundle.putString("pi_whname", storageInBillBean.getPI_WHNAME());
                     fragment.setArguments(bundle);
-                    FragmentUtils.switchFragment(GoodBadAddListFragment.this, fragment);
+                    FragmentUtils.switchFragment2(GoodBadAddListFragment.this, fragment);
 //                        mOnListSelectListener.onListSelect(storageInBillBean);
 
 //                    }
@@ -421,21 +440,6 @@ public class GoodBadAddListFragment extends BaseFragment implements HttpCallback
             ((FunctionActivity) getActivity()).setScanIvVisible(true);
             ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
             ((FunctionActivity) getActivity()).setListIconIvVisible(false);
-            mFilterImageView = (ImageView) getActivity().findViewById(R.id.btn_actionbar_scan_iv);
-            mFilterImageView.setBackgroundResource(R.drawable.ic_advanced_filter);
-            if (mWhichPage == PAGE_STORAGE_FUNACTION
-                    || mWhichPage == PAGE_STORAGE_ADD
-                    || mWhichPage == PAGE_STORAGE_DETAIL) {
-                FunctionActivity.setTitle("入库单列表("+pi_type+")");
-            } else if (mWhichPage == PAGE_OUT_DETAIL) {
-                FunctionActivity.setTitle("出库单列表");
-            } else if (mWhichPage == PAGE_OUT_HISTORY) {
-                FunctionActivity.setTitle("备货历史");
-            }
-            progressDialog.show();
-            mKeyword = mSearchEt.getText().toString().trim();
-            mPageIndex = 1;
-            requestStorageList();
         }
     }
 

app/src/main/java/com/uas/jc_workstation/fragment/GoodOrBadAddDetailFragment.java

@@ -112,12 +112,12 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
     private List<String> mSearchTypes;
     private ArrayAdapter mTypeArrayAdapter;
     private String mSearchType;
-    private String nextmacode;
+    private String nextmacode = "";
     private IpAndlinecodePortAdapter ipAndlinecodePortAdapter;
     private ClearableEditText edit_et;
     private List<LinecodeBean> linecodeBeanList;
     private PopupWindow editPW;
-    private String ma_code;
+    private String ma_code = "";
     private MyArrayAdapter<String> mAutoStringAdapter;
 
     @Override
@@ -132,11 +132,12 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
         super.onDestroy();
         EventBus.getDefault().unregister(this);
     }
+
     @Subscribe
     public void onMessageEvent(CloseListbean evensst) {
         getActivity().getSupportFragmentManager().popBackStack();
-
     }
+
     @Override
     protected int getLayout() {
         return R.layout.goodbad_in_add_detail;
@@ -174,7 +175,7 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
             pi_whname = arguments.getString("pi_whname");
             pi_class = arguments.getString("pi_class");
         }
-        pi_type = SharedPreUtil.getString(mActivity, "pi_type", null);
+        pi_type = SharedPreUtil.getString(mActivity, "pi_type", "");
         FunctionActivity.setTitle("入库采集("+pi_type+")");
         tv_inoutno.setText(pi_inoutno);
         tv_cangku.setText(pi_whname);
@@ -676,16 +677,17 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
                 break;
             case R.id.pop_storage_in_add_menu_7:
                 closeMenuPopupWindow();
+                getActivity().getSupportFragmentManager().popBackStack();
                 GoodBadAddListFragment storageInAddListFragment = new GoodBadAddListFragment();
                 bundle = new Bundle();
                 bundle.putString("pi_class", this.pi_class);
                 bundle.putInt("whichPage", StorageInAddListFragment.PAGE_STORAGE_ADD);
                 storageInAddListFragment.setArguments(bundle);
-                FragmentUtils.switchFragment(this, storageInAddListFragment);
+                FragmentUtils.switchFragment2(this, storageInAddListFragment);
                 storageInAddListFragment.setOnListSelectListener(new GoodBadAddListFragment.OnListSelectListener() {
                     @Override
                     public void onListSelect(StorageInBillBean storageInBillBean) {
-                        getActivity().getSupportFragmentManager().popBackStack();
+                        //getActivity().getSupportFragmentManager().popBackStack();
                         Fragment fragment = new GoodOrBadAddDetailFragment();
                         Bundle bundle = new Bundle();
                         bundle.putString("pi_class", storageInBillBean.getPI_CLASS());
@@ -697,7 +699,7 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
                         bundle.putString("pi_invostatus", storageInBillBean.getPI_INVOSTATUS());
                         bundle.putString("pi_whname", storageInBillBean.getPI_WHNAME());
                         fragment.setArguments(bundle);
-                        FragmentUtils.switchFragment(GoodOrBadAddDetailFragment.this, fragment);
+                        FragmentUtils.switchFragment2(GoodOrBadAddDetailFragment.this, fragment);
 
                     }
                 });
@@ -757,32 +759,37 @@ public class GoodOrBadAddDetailFragment extends BaseFragment implements View.OnC
      * 展示扩展菜单
      */
     private void showMoreMenu() {
-        View view = View.inflate(getActivity(), R.layout.pop_goodbadin_add_menu, null);
-        Button addBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_1);
-        Button listBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_2);
-        Button deleteBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_3);
-        Button barcodeListBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_4);
-        Button quantityListBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_5);
-        Button revokeBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_6);
-        Button passBillBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_7);
-        addBtn.setOnClickListener(this);
-        listBtn.setOnClickListener(this);
-        deleteBtn.setOnClickListener(this);
-        barcodeListBtn.setOnClickListener(this);
-        quantityListBtn.setOnClickListener(this);
-        revokeBtn.setOnClickListener(this);
-        passBillBtn.setOnClickListener(this);
-
-        mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
-        mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());
-        mMenuPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
-            @Override
-            public void onDismiss() {
-                closeMenuPopupWindow();
-            }
-        });
-        CommonUtil.setBackgroundAlpha(Objects.requireNonNull(getActivity()), 0.5f);
-        mMenuPopupWindow.showAsDropDown(mMoreBtn);
+        try {
+//            View view = View.inflate(getActivity(), R.layout.pop_goodbadin_add_menu, null);
+            View view = LayoutInflater.from(getActivity()).inflate(R.layout.pop_goodbadin_add_menu, null);
+            Button addBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_1);
+            Button listBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_2);
+            Button deleteBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_3);
+            Button barcodeListBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_4);
+            Button quantityListBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_5);
+            Button revokeBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_6);
+            Button passBillBtn = (Button) view.findViewById(R.id.pop_storage_in_add_menu_7);
+            addBtn.setOnClickListener(this);
+            listBtn.setOnClickListener(this);
+            deleteBtn.setOnClickListener(this);
+            barcodeListBtn.setOnClickListener(this);
+            quantityListBtn.setOnClickListener(this);
+            revokeBtn.setOnClickListener(this);
+            passBillBtn.setOnClickListener(this);
+
+            mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+            mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());
+            mMenuPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                @Override
+                public void onDismiss() {
+                    closeMenuPopupWindow();
+                }
+            });
+            CommonUtil.setBackgroundAlpha(Objects.requireNonNull(getActivity()), 0.5f);
+            mMenuPopupWindow.showAsDropDown(mMoreBtn);
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private void closeMenuPopupWindow() {

app/src/main/java/com/uas/jc_workstation/fragment/GoodOrBadFragment.java

@@ -208,7 +208,7 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
                 bundle.putString("pi_class", GoodOrBadFragment.this.pi_class);
                 bundle.putInt("whichPage", StorageInAddListFragment.PAGE_STORAGE_ADD);
                 storageInAddListFragment.setArguments(bundle);
-                FragmentUtils.switchFragment(GoodOrBadFragment.this, storageInAddListFragment);
+                FragmentUtils.switchFragment2(GoodOrBadFragment.this, storageInAddListFragment);
             }
         });
 
@@ -699,7 +699,7 @@ public class GoodOrBadFragment extends BaseFragment implements View.OnClickListe
             bundle.putString("pi_whcode", pi_whcode);
             bundle.putString("pi_whname", pi_whname);
             mFragment.setArguments(bundle);
-            FragmentUtils.switchFragment(GoodOrBadFragment.this, mFragment);
+            FragmentUtils.switchFragment2(GoodOrBadFragment.this, mFragment);
         }
     }
 

app/src/main/java/com/uas/jc_workstation/fragment/KeyMaterialVerificationFragment.java

@@ -0,0 +1,161 @@
+package com.uas.jc_workstation.fragment;
+
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
+import com.uas.jc_workstation.R;
+import com.uas.jc_workstation.bean.KeyMaterialVaerificationBean;
+import com.uas.jc_workstation.global.GloableParams;
+import com.uas.jc_workstation.util.CommonUtil;
+import com.uas.jc_workstation.util.HttpCallback;
+import com.uas.jc_workstation.util.HttpParams;
+import com.uas.jc_workstation.util.JsonTools;
+import com.uas.jc_workstation.util.VollyRequest;
+import com.uas.jc_workstation.view.ClearableEditText;
+
+public
+        /**
+         * Created by sw on 2025-01-10
+         */
+class KeyMaterialVerificationFragment extends BaseFragment{
+
+    private ClearableEditText cet_sn,cet_material_bacode;
+    private Button bt_ok;
+    private StringRequest mStringRequest;
+    private LinearLayout ll_tip,ll_data;
+    private TextView tv_tip,tv_totalnum,tv_checknum,tv_pr_code,tv_spec;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_key_material_verification;
+    }
+
+    @Override
+    protected void initViews() {
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText("关键物料核对");
+        cet_sn = root.findViewById(R.id.cet_sn);
+        cet_material_bacode = root.findViewById(R.id.cet_material_bacode);
+        bt_ok = root.findViewById(R.id.bt_ok);
+        ll_tip = root.findViewById(R.id.ll_tip);
+        ll_data = root.findViewById(R.id.ll_data);
+        tv_tip = root.findViewById(R.id.tv_tip);
+        tv_totalnum = root.findViewById(R.id.tv_totalnum);
+        tv_checknum = root.findViewById(R.id.tv_checknum);
+        tv_pr_code = root.findViewById(R.id.tv_pr_code);
+        tv_spec = root.findViewById(R.id.tv_spec);
+    }
+
+    @Override
+    protected void initEvents() {
+        cet_sn.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String data = cet_sn.getText().toString().trim();
+                    getgetinfo(data,cet_material_bacode.getText().toString().trim());
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        cet_material_bacode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    getgetinfo(cet_sn.getText().toString().trim(),cet_material_bacode.getText().toString().trim());
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        bt_ok.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getgetinfo(cet_sn.getText().toString().trim(),cet_material_bacode.getText().toString().trim());
+            }
+        });
+    }
+
+    private void getgetinfo(String sn, String wuliao) {
+        if (TextUtils.isEmpty(sn)){
+            CommonUtil.toastNoRepeat(mActivity, "请输入SN号");
+            return;
+        }
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_KEY_MATERIAL_VERIFICATION)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getMaCode")
+                        .flag(0)
+                        .addParam("iSN",sn)
+                        .addParam("iPCBA",wuliao)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        try{
+                            ll_tip.setVisibility(View.GONE);
+                            KeyMaterialVaerificationBean kmvBean = JsonTools.parseJsonToBean(o.toString(),KeyMaterialVaerificationBean.class);
+                            if (kmvBean.isSuccess()){
+                                if (kmvBean.getData() != null) {
+                                    ll_data.setVisibility(View.VISIBLE);
+                                    tv_totalnum.setText(kmvBean.getData().getTotalnum());
+                                    tv_checknum.setText(kmvBean.getData().getChecknum());
+                                    tv_pr_code.setText(kmvBean.getData().getPr_code());
+                                    tv_spec.setText(kmvBean.getData().getPr_spec());
+                                }else {
+                                    ll_tip.setVisibility(View.VISIBLE);
+                                    ll_data.setVisibility(View.GONE);
+                                    tv_tip.setTextColor(getResources().getColor(R.color.green));
+                                    tv_tip.setText("查询成功");
+                                }
+                                cet_material_bacode.setText("");
+                                cet_material_bacode.requestFocus();
+                            }
+                        }catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        ll_tip.setVisibility(View.VISIBLE);
+                        ll_data.setVisibility(View.GONE);
+                        tv_tip.setTextColor(getResources().getColor(R.color.red));
+                        tv_tip.setText(failStr);
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                        cet_material_bacode.setText("");
+                        cet_material_bacode.requestFocus();
+                    }
+                });
+    }
+
+    @Override
+    protected void initDatas() {
+
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

app/src/main/java/com/uas/jc_workstation/fragment/LabeLreprintingFragment.java

@@ -0,0 +1,313 @@
+package com.uas.jc_workstation.fragment;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+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.android.volley.toolbox.StringRequest;
+import com.uas.jc_workstation.R;
+import com.uas.jc_workstation.activity.FunctionActivity;
+import com.uas.jc_workstation.global.GloableParams;
+import com.uas.jc_workstation.tools.SharedPreUtil;
+import com.uas.jc_workstation.util.CommonUtil;
+import com.uas.jc_workstation.util.Constants;
+import com.uas.jc_workstation.util.FastjsonUtil;
+import com.uas.jc_workstation.util.FragmentUtils;
+import com.uas.jc_workstation.util.HttpCallback;
+import com.uas.jc_workstation.util.HttpParams;
+import com.uas.jc_workstation.util.PrintUtils;
+import com.uas.jc_workstation.util.VolleyRequest;
+import com.uas.jc_workstation.util.VollyRequest;
+import com.uas.jc_workstation.view.ClearableEditText;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Created by cjh 2024/06/03
+ * Desc: 标签补打
+ */
+public class LabeLreprintingFragment extends BaseFragment implements View.OnClickListener{
+    private StringRequest mStringRequest;
+    private ClearableEditText storage_recharge_collect_ets,cet_notes;
+    private LinearLayout line_hint;
+    private TextView tv_hint1;
+    private JSONArray dataArray;
+    private Button btn_starts;
+    private RadioGroup rg_hui;
+    private RadioButton rb_ok;
+    private RadioButton rb_no;
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_labe_lreprnting;
+    }
+
+    @Override
+    protected void initViews() {
+        setTitle("标签补打");
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+        storage_recharge_collect_ets = root.findViewById(R.id.storage_recharge_collect_ets);
+        line_hint = root.findViewById(R.id.line_hint);
+        tv_hint1 = root.findViewById(R.id.tv_hint1);
+        btn_starts = root.findViewById(R.id.btn_starts);
+        rg_hui = root.findViewById(R.id.rg_hui);
+        rb_ok = root.findViewById(R.id.rb_ok);
+        rb_no = root.findViewById(R.id.rb_no);
+        cet_notes = root.findViewById(R.id.cet_notes);
+        storage_recharge_collect_ets.requestFocus();
+
+    }
+
+
+    @Override
+    protected void initEvents() {
+        rb_ok.setChecked(true);
+        getPrintTemplate("Lotno!PDAPrint");
+        storage_recharge_collect_ets.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE
+                        || actionId == EditorInfo.IME_ACTION_SEND
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    String data = storage_recharge_collect_ets.getText().toString().trim();
+                    getgetinfo(data,cet_notes.getText().toString().trim());
+                    return true;
+                }
+                return false;
+            }
+        });
+        btn_starts.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getgetinfo(storage_recharge_collect_ets.getText().toString().trim(),cet_notes.getText().toString().trim());
+            }
+        });
+        rg_hui.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @SuppressLint("NonConstantResourceId")
+            @Override
+            public void onCheckedChanged(RadioGroup radioGroup, int checkid) {
+                switch (checkid){
+                    case R.id.rb_ok:
+                        getPrintTemplate("Lotno!PDAPrint");
+                        break;
+                    case R.id.rb_no:
+                        getPrintTemplate("PreBarcode");
+                        break;
+
+                }
+            }
+        });
+
+    }
+    private void getPrintTemplate(String caller) {
+        VolleyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_BARINFO_PRINTMODEL)
+                        .method(Request.Method.GET)
+                        .flag(0)
+                        .tag("barinfoPrint")
+                        .addParam("caller", caller)//Barcode!PDAPrint仓库
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        try {
+                            String result = o.toString();
+                            Log.e("prints", result);
+                            if (FastjsonUtil.validate(result)) {
+                                JSONObject resultObject = JSON.parseObject(result);
+                                JSONArray dataArray = resultObject.getJSONArray("data");
+                                if (dataArray != null && dataArray.size() > 0) {
+                                    SharedPreUtil.saveString(mActivity, Constants.FLAG.PRINT_TEMPLATE_CACHE, dataArray.toJSONString());
+                                }
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        Log.e("printf", failStr);
+                    }
+                });
+    }
+    @Override
+    protected void initDatas() {
+    }
+
+
+    /**
+     * 批次号enter事件
+     */
+    private void getgetinfo(String lotno,String remark) {
+        if (lotno.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入批次号");
+            return;
+        }
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_REPRINT)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getMaCode")
+                        .flag(0)
+                        .addParam("lotno",lotno)//原生产批号 ，必填
+                        .addParam("remark",remark)//备注
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        storage_recharge_collect_ets.setText("");
+                        storage_recharge_collect_ets.requestFocus();
+                        dataArray = FastjsonUtil.getJSONArray(o.toString(), "data");
+                        if (dataArray==null){
+                            CommonUtil.toastNoRepeat(mActivity, "数据为空");
+                            return;
+                        }
+                        printEvent(dataArray);
+                    }
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        storage_recharge_collect_ets.setText("");
+                        storage_recharge_collect_ets.requestFocus();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+    }
+
+    public static String removeBrackets(String input) {
+        return input.replaceAll("\\[", "").replaceAll("\\]", "");
+    }
+
+    public static void main(String[] args) {
+        String s="sxc[[123]sc]dv";
+        String regex = "\\[(.*?)]";
+        Pattern pattern= Pattern.compile(regex);
+        Matcher matcher=pattern.matcher(s);
+        System.out.println(matcher.find());
+    }
+
+    private boolean isPrinting = false;
+    private boolean isConnected = false;
+    private int mPrintDpi = 203;
+    private void printEvent(JSONArray printArray) {
+        if (isPrinting) {
+            CommonUtil.toastNoRepeat(mActivity, "正在打印中，请勿重复操作");
+            return;
+        }
+        isPrinting = true;
+        if (printArray != null && printArray.size() > 0) {
+            boolean isFail = false;
+            for (int i = 0; i < printArray.size(); i++) {
+                try {
+                    String stingdata = removeBrackets(printArray.toString());
+                    int printResult = PrintUtils.printBar(mActivity, stingdata.toString(), mPrintDpi, null);
+                    if (printResult <= 0) {
+                        isFail = true;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            progressDialog.dismiss();
+            if (isFail) {
+                isConnected = false;
+                SharedPreUtil.saveInt(mActivity, "printConnect", 0);
+                CommonUtil.toastNoRepeat(mActivity, "打印失败，请重新连接打印机");
+
+                BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, printArray.toString());
+                blueToothPrintFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(LabeLreprintingFragment.this, blueToothPrintFragment);
+            } else {
+                CommonUtil.toastNoRepeat(mActivity, "打印成功");
+            }
+        } else {
+            CommonUtil.toastNoRepeat(mActivity, "打印失败，条码数据为空");
+        }
+        isPrinting = false;
+    }
+
+
+
+    /**
+     * 当前时间
+     * @return
+     */
+    public static String geNowTime() {
+        String timeString = null;
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR));
+        Date today = calendar.getTime();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        String result = format.format(today);
+        timeString=result+":00";
+        return timeString;
+    }
+
+
+
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            setTitle("标签补打");
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        } else {
+            ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) getActivity()).setMoreBtnVisible(false);
+    }
+
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+//        if (resultCode != Activity.RESULT_OK) {
+//            return;
+//        }
+
+
+    }
+
+    @SuppressLint("NonConstantResourceId")
+    @Override
+    public void onClick(View v) {
+    }
+}

app/src/main/java/com/uas/jc_workstation/fragment/PostPunchFragment.java

@@ -123,6 +123,7 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
     private String ma_code;
     private SelectAdapter myAdapter;
     private RecyclerView mRecyclerView;
+    private CheckBox cb_gongdanqiehuan;
 
     @Override
     protected int getLayout() {
@@ -156,6 +157,7 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
 
         mMoreBtn = (Button) mActivity.findViewById(R.id.btn_actionbar_more);
         mRecyclerView = root.findViewById(R.id.feeded_rv);
+        cb_gongdanqiehuan = root.findViewById(R.id.cb_gongdanqiehuan);
 
         et_linecode_smts = (AutoCompleteTextView) mActivity.findViewById(R.id.et_linecode_smts);
         iv_gongdan_search = (ImageView) mActivity.findViewById(R.id.iv_gongdan_search);
@@ -342,6 +344,9 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
     }
 
     private void getMakeMan(String ma_code) {
+        if (cb_gongdanqiehuan.isChecked()) {
+            return;
+        }
         progressDialog.show();
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
@@ -381,6 +386,7 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
             workOrderFlow.setPCD_CARDCODE(data.getString("PCD_CARDCODE"));
             workOrderFlow.setPCD_CARDNAME(data.getString("PCD_CARDNAME"));
             workOrderFlow.setPCD_DATE(data.getString("PCD_DATE"));
+            workOrderFlow.setPCD_MACODE(data.getString("PCD_MACODE"));
             mFeededList.add(workOrderFlow);
         }
         setAdapter(mFeededList);
@@ -503,7 +509,6 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
             ComDataBeanList.add(bean);
         }
         initresourcesPopupWindow();
-
     }
 
     private void initresourcesPopupWindow() {
@@ -661,6 +666,7 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
                 ct_qty.requestFocus();
                 ct_qty.setSelection(ct_qty.getText().length());
                 getSourcePunchInfo(ct_qty.getText().toString().trim());
+                getMakeMan(et_linecode_smts.getText().toString().trim());
                 closeListPopupWindow();
             }
         });
@@ -1435,6 +1441,7 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
             ((SelectAdapter.ListItemViewHolder) holder).tv_liaocode.setText("人员卡号：" + mList.get(i).getPCD_CARDCODE());
             ((SelectAdapter.ListItemViewHolder) holder).tv_liaotetall.setText("人员名称：" + mList.get(i).getPCD_CARDNAME());
             ((SelectAdapter.ListItemViewHolder) holder).tv_liaospec.setText("上线时间：" + mList.get(i).getPCD_DATE());
+            ((SelectAdapter.ListItemViewHolder) holder).tv_name_work_order.setText("工单号：" + mList.get(i).getPCD_MACODE());
 
             ((SelectAdapter.ListItemViewHolder) holder).checkBox.setChecked(isItemChecked(i));
 
@@ -1482,6 +1489,7 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
             TextView tv_liaocode;
             TextView tv_liaotetall;
             TextView tv_liaospec;
+            TextView tv_name_work_order;
 
             ListItemViewHolder(View view) {
                 super(view);
@@ -1489,6 +1497,7 @@ public class PostPunchFragment extends BaseFragment implements View.OnClickListe
                 this.tv_liaotetall = (TextView) view.findViewById(R.id.tv_liaotetall);
                 this.tv_liaospec = (TextView) view.findViewById(R.id.tv_liaospec);
                 this.checkBox = (CheckBox) view.findViewById(R.id.select_checkbox);
+                this.tv_name_work_order = (TextView) view.findViewById(R.id.tv_name_work_order);
 
             }
         }

app/src/main/java/com/uas/jc_workstation/fragment/SNGuoZhanFragment.java

@@ -0,0 +1,458 @@
+package com.uas.jc_workstation.fragment;
+
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.AdapterView;
+import android.widget.AutoCompleteTextView;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.android.volley.AuthFailureError;
+import com.android.volley.DefaultRetryPolicy;
+import com.android.volley.Request;
+import com.android.volley.Response;
+import com.android.volley.VolleyError;
+import com.android.volley.toolbox.StringRequest;
+import com.uas.jc_workstation.R;
+import com.uas.jc_workstation.application.PdaApplication;
+import com.uas.jc_workstation.global.GloableParams;
+import com.uas.jc_workstation.tools.SharedPreUtil;
+import com.uas.jc_workstation.tools.VolleyUtil;
+import com.uas.jc_workstation.util.CommonUtil;
+import com.uas.jc_workstation.util.Constants;
+import com.uas.jc_workstation.util.JsonUtils;
+import com.uas.jc_workstation.util.LogUtil;
+import com.uas.jc_workstation.util.MyArrayAdapter;
+import com.uas.jc_workstation.view.ClearableEditText;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * SN过站主页
+ */
+public class SNGuoZhanFragment extends BaseFragment  {
+    AutoCompleteTextView ac_tv_gwzy;
+    ImageView iv_clear_1;
+    AutoCompleteTextView ac_tv_gdh;
+    ImageView iv_clear_2;
+    TextView tv_product_no;
+    TextView tv_product_name;
+    TextView tv_has_caiji_num;
+    TextView tv_not_caiji_num;
+    ClearableEditText et_sn;
+    TextView tv_msg;
+    private static final int MACODE_FUZZY = 0;//工单号
+    private static final int GWZY_FUZZY = 1;//岗位资源
+    private StringRequest mStringRequest;
+    private MyArrayAdapter mAutoStringAdapter;
+    private String pr_code;//产品编号
+    private String pr_detail;//产品名称
+    private String  mcd_okqty;// 已采集数
+    private String  mcd_remainqty;// 待采集数
+    private String iSourceCode;
+
+
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_sn_guozhan;
+    }
+
+    @Override
+    protected void initViews() {
+        root.setBackgroundColor(getResources().getColor(R.color.background_color_second));
+        ac_tv_gwzy=root.findViewById(R.id.ac_tv_gwzy);
+        iv_clear_1=root.findViewById(R.id.iv_clear_1);
+        ac_tv_gdh=root.findViewById(R.id.ac_tv_gdh);
+        iv_clear_2=root.findViewById(R.id.iv_clear_2);
+        tv_product_no=root.findViewById(R.id.tv_product_no);
+        tv_product_name=root.findViewById(R.id.tv_product_name);
+        tv_has_caiji_num=root.findViewById(R.id.tv_has_caiji_num);
+        tv_not_caiji_num=root.findViewById(R.id.tv_not_caiji_num);
+        et_sn=root.findViewById(R.id.et_sn);
+        tv_msg=root.findViewById(R.id.tv_msg);
+        ac_tv_gwzy.setThreshold(1);
+        ac_tv_gdh.setThreshold(1);
+        ac_tv_gwzy.requestFocus();
+        iSourceCode= SharedPreUtil.getString(mActivity
+                , Constants.FLAG.CACHE_DEFAULT_GWZY + CommonUtil.getUserName(mActivity), null);
+        if (!TextUtils.isEmpty(iSourceCode) ) {
+            ac_tv_gwzy.setText(iSourceCode);
+            ac_tv_gwzy.setSelection(iSourceCode.length());
+        }
+    }
+
+    @Override
+    protected void initEvents() {
+        ac_tv_gwzy.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if(!hasFocus){
+                    iSourceCode=ac_tv_gwzy.getText().toString().trim();
+                    if(!TextUtils.isEmpty(iSourceCode)){
+                        SharedPreUtil.saveString(mActivity, Constants.FLAG.CACHE_DEFAULT_GWZY + CommonUtil.getUserName(mActivity),iSourceCode);
+                    }
+                }
+            }
+        });
+        ac_tv_gwzy.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.length() >= 1) {
+                    if (!s.toString().matches(Constants.REGEX.NO_SYMBOL)) {
+                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.note_number_cannot_contain_special));
+                        ac_tv_gwzy.setText(null);
+                        ac_tv_gwzy.requestFocus();
+                    } else {
+                        fuzzySearch(ac_tv_gwzy,GWZY_FUZZY);
+                    }
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s == null || s.length() == 0) {
+                    iv_clear_1.setVisibility(View.GONE);
+                } else {
+                    iv_clear_1.setVisibility(View.VISIBLE);
+                }
+            }
+        });
+
+        ac_tv_gdh.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (s.length() >= 1) {
+                    if (!s.toString().matches(Constants.REGEX.NO_SYMBOL)) {
+                        CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.note_number_cannot_contain_special));
+                        ac_tv_gdh.setText(null);
+                        ac_tv_gdh.requestFocus();
+                    } else {
+                        fuzzySearch(ac_tv_gdh,MACODE_FUZZY);
+                    }
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (s == null || s.length() == 0) {
+                    iv_clear_2.setVisibility(View.GONE);
+                } else {
+                    iv_clear_2.setVisibility(View.VISIBLE);
+                }
+            }
+        });
+        et_sn.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_SEND
+                        || actionId == EditorInfo.IME_ACTION_SEARCH
+                        || actionId == EditorInfo.IME_ACTION_DONE
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    if (TextUtils.isEmpty(et_sn.getText().toString().trim())) {
+                        CommonUtil.toastNoRepeat(getActivity(), "请输入SN");
+                    } else if (CommonUtil.isStringContainsSpecialChar(et_sn.getText().toString().trim())) {
+                        CommonUtil.toastNoRepeat(getActivity(), "SN不能包含特殊字符");
+                    } else {
+                        validateSN();
+                    }
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        ac_tv_gdh.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                if (TextUtils.isEmpty(ac_tv_gwzy.getText().toString().trim())) {
+                    CommonUtil.toastNoRepeat(getActivity(), "请输入岗位资源");
+                } else if (CommonUtil.isStringContainsSpecialChar(ac_tv_gwzy.getText().toString().trim())) {
+                    CommonUtil.toastNoRepeat(getActivity(), "岗位资源不能包含特殊字符");
+                } else {
+                   iSourceCode=ac_tv_gwzy.getText().toString().trim();
+                   getProdInfoMessage(iSourceCode);
+                }
+            }
+        });
+
+        iv_clear_1.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ac_tv_gwzy.setText("");
+            }
+        });
+        iv_clear_2.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ac_tv_gdh.setText("");
+            }
+        });
+
+    }
+
+    private void validateSN() {
+        String iSourceCode=ac_tv_gwzy.getText().toString().trim();//岗位资源
+        String iMakeCode=ac_tv_gdh.getText().toString().trim();//工单号
+        String snStr=et_sn.getText().toString().trim();
+        if(TextUtils.isEmpty(iSourceCode)){
+            CommonUtil.toastNoRepeat(mActivity, "岗位资源不能为空");
+            return;
+        }
+//        if(TextUtils.isEmpty(iMakeCode)){
+//            CommonUtil.toastNoRepeat(mActivity, "工单号不能为空");
+//            return;
+//        }
+        if(TextUtils.isEmpty(snStr)){
+            CommonUtil.toastNoRepeat(mActivity, "SN不能为空");
+            return;
+        }
+        progressDialog.show();
+        String url = null;
+        try {
+            url = GloableParams.ADDRESS_SN_PASS+
+                    "?iMakeCode=" + URLEncoder.encode(iMakeCode, "utf-8")
+                    +"&iSourceCode="+URLEncoder.encode(iSourceCode, "utf-8")
+                    +"&iSN="+URLEncoder.encode(snStr, "utf-8")
+                    +"&iUserCode="+URLEncoder.encode(CommonUtil.getUserName(mActivity), "utf-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        //取消重复请求
+        PdaApplication.mRequestQueue.cancelAll(TAG);
+        mStringRequest = new StringRequest(Request.Method.GET, url, new Response.Listener<String>() {
+            @Override
+            public void onResponse(String s) {
+                progressDialog.dismiss();
+                try {
+                    JSONObject resultJsonObject = new JSONObject(s);
+                    JSONObject dataObject = resultJsonObject.getJSONObject("data");
+                    String oErr = JsonUtils.optStringNotNull(dataObject, "oErr");
+                    if(!TextUtils.isEmpty(oErr)){
+                        tv_msg.setText(oErr);
+                        tv_msg.setTextColor(getResources().getColor(R.color.red));
+                    }else{
+                        tv_msg.setText("SN:"+snStr+"采集成功");
+                        tv_msg.setTextColor(getResources().getColor(R.color.black));
+                        getProdInfoMessage(iSourceCode);
+                    }
+                    et_sn.setText("");
+                    et_sn.requestFocus();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+            }
+        }, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError error) {
+                progressDialog.dismiss();
+                String errorMsg= CommonUtil.showErrorToast(error);
+                et_sn.setText("");
+                et_sn.requestFocus();
+                tv_msg.setText(errorMsg);
+            }
+        }) {
+            @Override
+            public Map<String, String> getHeaders() throws AuthFailureError {
+                return VolleyUtil.getVolleyUtil().setCookies();
+            }
+        };
+        mStringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
+        mStringRequest.setTag(TAG);
+        PdaApplication.mRequestQueue.add(mStringRequest);
+    }
+    /**
+     * 确定按钮点击事件、enter事件
+     */
+    private void getProdInfoMessage(String iSourceCode) {
+        progressDialog.show();
+        String iMakeCode = ac_tv_gdh.getText().toString();
+
+        if (TextUtils.isEmpty(iMakeCode)) {
+            progressDialog.dismiss();
+            return;
+        }
+        String url = null;
+        try {
+            url = GloableParams.ADDRESS_GET_MAKE_INFO+ "?iMakeCode=" + URLEncoder.encode(iMakeCode, "utf-8")+"&iSourceCode="+URLEncoder.encode(iSourceCode, "utf-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        //取消重复请求
+        PdaApplication.mRequestQueue.cancelAll(TAG);
+        mStringRequest = new StringRequest(Request.Method.GET, url, new Response.Listener<String>() {
+            @Override
+            public void onResponse(String s) {
+                progressDialog.dismiss();
+                LogUtil.e("!!!ok", s);
+                try {
+                    JSONObject resultJsonObject = new JSONObject(s);
+                    JSONObject dataObject = resultJsonObject.getJSONObject("data");
+                    pr_code=JsonUtils.optStringNotNull(dataObject, "PR_CODE");
+                    pr_detail=JsonUtils.optStringNotNull(dataObject, "PR_DETAIL");
+                    mcd_okqty=JsonUtils.optStringNotNull(dataObject, "MCD_OKQTY");
+                    mcd_remainqty=JsonUtils.optStringNotNull(dataObject, "MCD_REMAINQTY");
+                    tv_product_no.setText(pr_code);
+                    tv_product_name.setText(pr_detail);
+                    tv_has_caiji_num.setText(mcd_okqty);
+                    tv_not_caiji_num.setText(mcd_remainqty);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+            }
+        }, new Response.ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError error) {
+                progressDialog.dismiss();
+                CommonUtil.showErrorToast(error);
+                reset();
+            }
+        }) {
+            @Override
+            public Map<String, String> getHeaders() throws AuthFailureError {
+                return VolleyUtil.getVolleyUtil().setCookies();
+            }
+        };
+        mStringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
+        mStringRequest.setTag(TAG);
+        PdaApplication.mRequestQueue.add(mStringRequest);
+    }
+
+    public void reset() {
+        if (getActivity() != null) {
+            ac_tv_gwzy.getText().clear();
+            ac_tv_gdh.getText().clear();
+            tv_product_name.setText("");
+            tv_product_no.setText("");
+            tv_has_caiji_num.setText("");
+            tv_not_caiji_num.setText("");
+            if (progressDialog.isShowing()){
+                progressDialog.dismiss();
+            }
+            CommonUtil.editTextGetFocus(ac_tv_gwzy);
+        }
+    }
+
+
+    /**
+     * 模糊查询
+     *
+     * @param jobsEditText
+     * @param fuzzy
+     */
+    private void fuzzySearch(final AutoCompleteTextView jobsEditText, final int fuzzy) {
+        String url = null;
+        try {
+            if (fuzzy == MACODE_FUZZY){//工单模糊搜索
+                url = GloableParams.ADDRESS_FULL_SEARCH_MAKE
+                        + "?iMakeCode=" + URLEncoder.encode(jobsEditText.getText().toString().toLowerCase(), "utf-8");
+            } else if (fuzzy == GWZY_FUZZY){//岗位资源模糊搜索
+                url = GloableParams.ADDRESS_FULL_SEARCH_SOURCE
+                        + "?iSource=" + URLEncoder.encode(jobsEditText.getText().toString().toLowerCase(), "utf-8");
+            }
+
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+            if (fuzzy == MACODE_FUZZY){
+                url = GloableParams.ADDRESS_FULL_SEARCH_MAKE
+                        + "?iMakeCode=" + jobsEditText.getText().toString().toLowerCase();
+            } else if (fuzzy == GWZY_FUZZY){
+                url = GloableParams.ADDRESS_FULL_SEARCH_SOURCE
+                        + "?iSource=" + jobsEditText.getText().toString().toLowerCase();
+            }
+        }
+
+        PdaApplication.mRequestQueue.cancelAll(TAG + "fuzzysearch");
+
+        mStringRequest = new StringRequest(Request.Method.GET, url,
+                new Response.Listener<String>() {
+                    @Override
+                    public void onResponse(String s) {
+                        Log.e("autoStrings", s);
+                        List<String> mAutoStrings = new ArrayList<String>();
+                        try {
+                            mAutoStrings.clear();
+                            mAutoStringAdapter = new MyArrayAdapter<String>(mActivity, android.R.layout.simple_dropdown_item_1line, mAutoStrings);
+                            if (jobsEditText != null) {
+                                jobsEditText.setAdapter(mAutoStringAdapter);
+                            }
+
+                            JSONObject resultObject = new JSONObject(s);
+                            JSONArray dataArray = resultObject.optJSONArray("data");
+                            if (dataArray != null) {
+                                for (int i = 0; i < dataArray.length(); i++) {
+                                    JSONObject dataObject = dataArray.optJSONObject(i);
+                                    if (dataObject != null) {
+                                        String pi_inoutno = JsonUtils.optStringNotNull(dataObject, fuzzy == MACODE_FUZZY ? "MA_CODE" : "SC_CODE");
+                                        if (!TextUtils.isEmpty(pi_inoutno))
+                                            mAutoStringAdapter.add(pi_inoutno);
+                                    }
+                                }
+                            }
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                },
+                new Response.ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError volleyError) {
+                        CommonUtil.showErrorToast(volleyError);
+                        jobsEditText.setText("");
+                        jobsEditText.requestFocus();
+                        CommonUtil.openKeybord(jobsEditText, mActivity);
+                    }
+                }) {
+            @Override
+            public Map<String, String> getHeaders() throws AuthFailureError {
+                return VolleyUtil.getVolleyUtil().setCookies();
+            }
+        };
+        mStringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
+        mStringRequest.setTag(TAG + "fuzzysearch");
+        PdaApplication.mRequestQueue.add(mStringRequest);
+    }
+
+
+    @Override
+    protected void initDatas() {
+        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText("SN过站");
+    }
+
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+}

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

@@ -139,11 +139,6 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
                     }
 
                 });
-
-
-
-
-
     }
 
     @Override
@@ -171,7 +166,6 @@ public class VersionUpgradeFragment extends BaseFragment implements ProgressResp
         }
     }
 
-
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {

app/src/main/java/com/uas/jc_workstation/global/GloableParams.java

@@ -368,7 +368,13 @@ public class GloableParams {
     public static String ADDRESS_PDAIO_GET_lOGINDELETE;
     public static String ADDRESS_INVENTORY_SUBMIT;      //入库详情提交
     public static String ADDRESS_GET_MAKEMAN;      //岗位打卡 ---工单流水信息
+    public static String ADDRESS_REPRINT;
 
+    public static  String ADDRESS_FULL_SEARCH_MAKE;
+    public static  String ADDRESS_FULL_SEARCH_SOURCE;
+    public static  String ADDRESS_SN_PASS;
+    public static  String ADDRESS_GET_MAKE_INFO;
+    public static  String ADDRESS_KEY_MATERIAL_VERIFICATION;    //关键物料核对
 
 
     /**
@@ -1075,6 +1081,18 @@ public class GloableParams {
     //工单流水
     private static final String ADDRESSTAIL_GET_MAKEMAN = "/api/pdashop/source/getMakeMan.action";
 
+    private static final String ADDRESSTAIL_REPRINT = "/api/pdashop/report/reprint.action";
+
+    //SN过站
+    private static final String ADDRESSTAIL_FULL_SEARCH_MAKE = "/api/pda/check/fuzzySearchMake.action";
+    private static final String ADDRESSTAIL_FULL_SEARCH_SOURCE = "/api/pda/check/fuzzySearchSource.action";
+    private static final String ADDRESSTAIL_SN_PASS = "/api/pda/check/SNPass.action";
+    private static final String ADDRESSTAIL_GET_MAKE_INFO = "/api/pda/check/GetMakeInfo.action";
+
+    //关键物料核对
+    private static final String ADDRESSTAIL_KEY_MATERIAL_VERIFICATION = "/api/pda/check/checkMaterial.action";
+
+
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
     //home主页面
@@ -1088,6 +1106,8 @@ public class GloableParams {
     public static final String POSTPUNCH = "岗位打卡";
     public static final String MACHINESTARTSANDSTOPS = "机台操作";
     public static final String GRIDNAME_INOUT_STORAGE = "出入库采集";
+    public static final String GRIDNAME_SN_GUOZHAN = "SN过站";
+    public static final String KEY_MATERIAL_VERIFICATION = "关键物料核对";
     public static String[] homeMenuNames = {
 //            WAREHOUSINGMANAGEMENT,
 //            OUTBOUNDMANAGEMENT,
@@ -1097,8 +1117,10 @@ public class GloableParams {
             HOME_DISPATCH_MANAGE,
             HOME_QUALITY_MANAGE,
             GRIDNAME_INOUT_STORAGE,
-            GRIDNAME_SETTING
+            GRIDNAME_SETTING,
 //            QUERYSTATIONINFORMATION
+            GRIDNAME_SN_GUOZHAN,
+            KEY_MATERIAL_VERIFICATION
     };
     public static int[] homeMenuIcons = {
 //            R.drawable.ic_storage_in,
@@ -1109,8 +1131,10 @@ public class GloableParams {
             R.drawable.ic_dispatch_manage,
             R.drawable.ic_quality_manage,
             R.drawable.mainmenu_outinstorage,
-            R.drawable.mainmenu_usersetting
+            R.drawable.mainmenu_usersetting,
 //            R.drawable.astation
+            R.drawable.storage_good_search,
+            R.drawable.guanjianwuliaohedui
     };
 
     //index界面
@@ -1135,6 +1159,7 @@ public class GloableParams {
     public static final String GRIDNAME_BAD_EXCHANGE = "换票";
     public static final String GRIDNAME_BAD_PRE_PROCESSING_REPORT = "预加工报工";
     public static final String GRIDNAME_BARCODE_SPLITTING = "条码拆分";
+    public static final String LABELREPRINTING = "标签补打";
    // public static final String GRIDNAME_STAFF_CHANGE = "人员换岗";
     //public static final String GRIDNAME_STAFF_UP = "人员上线";
   //  public static final String GRIDNAME_STAFF_DOWN = "人员下线";
@@ -1153,7 +1178,8 @@ public class GloableParams {
            //           GRIDNAME_TIAO_ZHAN,
            //           GRIDNAME_BAD_EXCHANGE,
            GRIDNAME_BAD_PRE_PROCESSING_REPORT,
-           GRIDNAME_BARCODE_SPLITTING
+           GRIDNAME_BARCODE_SPLITTING,
+           LABELREPRINTING
    };
 
     public static int[] indexMainGridImgs = {
@@ -1168,7 +1194,8 @@ public class GloableParams {
             //            R.drawable.index_smt_up,
             //            R.mipmap.badchange,
             R.mipmap.iv_processing,
-            R.drawable.ic_split_batch
+            R.drawable.ic_split_batch,
+            R.drawable.pjbd
     };
 
     //INDEX:出入库管理Index
@@ -1676,9 +1703,14 @@ public class GloableParams {
         GloableParams.ADDRESS_INVENTORY_SUBMIT = uriHead + GloableParams.ADDRESSTAIL_INVENTORY_SUBMIT;
 
         GloableParams.ADDRESS_GET_MAKEMAN = uriHead + GloableParams.ADDRESSTAIL_GET_MAKEMAN;
+        GloableParams.ADDRESS_REPRINT = uriHead + GloableParams.ADDRESSTAIL_REPRINT;
 
+        GloableParams.ADDRESS_FULL_SEARCH_MAKE = uriHead + GloableParams.ADDRESSTAIL_FULL_SEARCH_MAKE;
+        GloableParams.ADDRESS_FULL_SEARCH_SOURCE= uriHead + GloableParams.ADDRESSTAIL_FULL_SEARCH_SOURCE;
+        GloableParams.ADDRESS_SN_PASS = uriHead + GloableParams.ADDRESSTAIL_SN_PASS;
+        GloableParams.ADDRESS_GET_MAKE_INFO=uriHead+GloableParams.ADDRESSTAIL_GET_MAKE_INFO;
 
-
+        GloableParams.ADDRESS_KEY_MATERIAL_VERIFICATION = uriHead+GloableParams.ADDRESSTAIL_KEY_MATERIAL_VERIFICATION;
 
     }
 }

app/src/main/java/com/uas/jc_workstation/util/Constants.java

@@ -219,6 +219,9 @@ public interface Constants {
         //默认不良品仓库编号缓存
         String CACHE_DEFAULT_REJECTS_WAREHOUSE = "cache_default_rejects_warehouse";
 
+        //默认岗位资源
+        String CACHE_DEFAULT_GWZY= "cache_default_gwzy";
+
         //登录数据缓存
         String CACHE_LOGIN_DATA_LIST = "cache_login_data_list";
 

app/src/main/java/com/uas/jc_workstation/util/FragmentUtils.java

@@ -21,19 +21,50 @@ public class FragmentUtils {
         switchFragment(from, to, null);
     }
 
+    public static void switchFragment2(Fragment from, Fragment to) {
+        switchFragment2(from, to, null);
+    }
+
     public static void switchFragment(Fragment from, Fragment to, Bundle bundle) {
-        FragmentManager fragmentManager = from.getFragmentManager();
-        FragmentTransaction transaction = fragmentManager.beginTransaction();
-        if (bundle != null) {
-            to.setArguments(bundle);
+        try{
+            FragmentManager fragmentManager = from.getFragmentManager();
+            FragmentTransaction transaction = fragmentManager.beginTransaction();
+            if (bundle != null) {
+                to.setArguments(bundle);
+            }
+            if (!to.isAdded()) { // 先判断是否被add过
+                transaction.hide(from)
+                        .add(R.id.container_function_fragment, to)
+                        .addToBackStack(to.getClass().getSimpleName())
+                        .commit(); // 隐藏当前的fragment，add下一个到Activity中
+            } else {
+                transaction.hide(from).show(to).commit(); // 隐藏当前的fragment，显示下一个
+            }
+        }catch (Exception e) {
+            e.printStackTrace();
         }
-        if (!to.isAdded()) { // 先判断是否被add过
-            transaction.hide(from)
-                    .add(R.id.container_function_fragment, to)
-                    .addToBackStack(to.getClass().getSimpleName())
-                    .commit(); // 隐藏当前的fragment，add下一个到Activity中
-        } else {
-            transaction.hide(from).show(to).commit(); // 隐藏当前的fragment，显示下一个
+    }
+
+    public static void switchFragment2(Fragment from, Fragment to, Bundle bundle) {
+        try{
+            FragmentManager fragmentManager = from.getFragmentManager();
+            FragmentTransaction transaction = fragmentManager.beginTransaction();
+            if (bundle != null) {
+                to.setArguments(bundle);
+            }
+            if (to.isAdded()) { // 先判断是否被add过
+                transaction.hide(from)
+                        .replace(R.id.container_function_fragment, to)
+                        .commit(); // 隐藏当前的fragment，add下一个到Activity中
+            } else {
+                transaction.hide(from)
+                        .add(R.id.container_function_fragment, to)
+                        .addToBackStack(to.getClass().getSimpleName())
+                        .commit(); // 隐藏当前的fragment，add下一个到Activity中
+                //transaction.hide(from).show(to).commit(); // 隐藏当前的fragment，显示下一个
+            }
+        }catch (Exception e) {
+            e.printStackTrace();
         }
     }
 }

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

@@ -42,6 +42,7 @@ public class PrintUtils {
                         int printY = (int) (toprate * dpi / 25.4);
                         double barHeight = FastjsonUtil.getDouble(templateObject, "LP_HEIGHT");
                         int barHeightInt = (int) (barHeight * dpi / 25.4);
+                        int  lp_width = FastjsonUtil.getInt(templateObject, "LP_WIDTH");
                         int fontSize = FastjsonUtil.getInt(templateObject, "LP_SIZE");
                         String printKey = FastjsonUtil.getText(templateObject, "LP_NAME");
 
@@ -63,12 +64,16 @@ public class PrintUtils {
                                     if ("BAR_BATCHCODE".equals(printKey)) {
                                         textFont = 7;
                                     }
-                                    printHelper = printHelper.printText(printText)
-                                            .setX(printX)
-                                            .setY(printY)
-                                            .setBold(2)
-                                            .setTextFont(textFont)
+                                    printHelper = printHelper.printText("")
+                                            .setTextAutLine(printX+"",printY + (int) ((0.6 * dpi) / 25.4)+"",lp_width,fontSize,false,false,printText)
                                             .build();
+
+//                                    printHelper = printHelper.printText(printText)
+//                                            .setX(printX)
+//                                            .setY(printY)
+//                                            .setBold(2)
+//                                            .setTextFont(textFont)
+//                                            .build();
                                     break;
                                 case "qrcode"://打印二维码
                                     printHelper = printHelper.printQr(printText)

app/src/main/res/layout/.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

app/src/main/res/layout/.idea/misc.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CMakeSettings">
-    <configurations>
-      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
-    </configurations>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_3" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

app/src/main/res/layout/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/layout.iml" filepath="$PROJECT_DIR$/.idea/layout.iml" />
-    </modules>
-  </component>
-</project>

app/src/main/res/layout/.idea/runConfigurations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

app/src/main/res/layout/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../../../.." vcs="Git" />
-  </component>
-</project>

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

@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+    <LinearLayout
+        android:layout_marginTop="30dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+
+        <TextView
+            style="@style/inputItemCaption"
+            android:text="SN"
+            android:textColor="@color/black"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginEnd="10dp"
+            android:layout_marginStart="5dp"
+            android:background="@drawable/bg_line_edittext">
+
+            <com.uas.jc_workstation.view.ClearableEditText
+                android:id="@+id/cet_sn"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@null"
+                android:hint="请输入SN号"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_marginTop="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_margin="12dp"
+        >
+
+        <TextView
+            style="@style/inputItemCaption"
+            android:text="物料条码"
+            android:textColor="@color/black"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginEnd="10dp"
+            android:layout_marginStart="5dp"
+            android:background="@drawable/bg_line_edittext">
+
+            <com.uas.jc_workstation.view.ClearableEditText
+                android:id="@+id/cet_material_bacode"
+                style="@style/EditTextStyle"
+                android:layout_weight="1"
+                android:background="@null"
+                android:hint="请输入物料条码"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/bt_ok"
+            style="@style/ButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            android:text="确定" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_tip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginRight="@dimen/dp_10"
+        android:background="@drawable/shape_msg_block"
+        android:orientation="vertical"
+        android:padding="@dimen/sp_16"
+        tools:visibility="visible"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/tv_tip"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="提示"
+            android:textColor="@color/black"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_data"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/shape_msg_block"
+        android:orientation="vertical"
+        android:padding="10dp"
+        tools:visibility="visible"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+
+            <TextView
+                android:layout_width="80dp"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:text="物料总数: "
+                android:textColor="@color/black"/>
+
+            <TextView
+                android:id="@+id/tv_totalnum"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:layout_marginStart="10sp"
+                android:text=""
+                android:textColor="@color/black"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_marginTop="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+
+            <TextView
+                android:layout_width="80dp"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:text="已核对数: "
+                android:textColor="@color/black"/>
+
+            <TextView
+                android:id="@+id/tv_checknum"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:layout_marginStart="10sp"
+                android:text=""
+                android:textColor="@color/black"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_marginTop="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+
+            <TextView
+                android:layout_width="80dp"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:text="产品编号: "
+                android:textColor="@color/black"/>
+
+            <TextView
+                android:id="@+id/tv_pr_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:layout_marginStart="10sp"
+                android:text=""
+                android:textColor="@color/black"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_marginTop="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+
+            <TextView
+                android:layout_width="80dp"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:text="规格: "
+                android:textColor="@color/black"/>
+
+            <TextView
+                android:id="@+id/tv_spec"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:layout_marginStart="10sp"
+                android:text=""
+                android:textColor="@color/black"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+</LinearLayout>

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

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_marginTop="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingLeft="@dimen/sp_16"
+            android:paddingRight="@dimen/sp_16">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext">
+
+                <com.uas.jc_workstation.view.ClearableEditText
+                    android:id="@+id/storage_recharge_collect_ets"
+                    style="@style/EditTextStyle"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:hint="请输入批次号"
+                    android:imeOptions="actionSend"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+            <TextView
+                style="@style/inputItemCaption"
+                android:text="批次号"
+                android:textColor="@color/red"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_marginTop="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingLeft="@dimen/sp_16"
+            android:paddingRight="@dimen/sp_16">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/bg_line_edittext">
+
+                <com.uas.jc_workstation.view.ClearableEditText
+                    android:id="@+id/cet_notes"
+                    style="@style/EditTextStyle"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:hint="请输入备注"
+                    android:imeOptions="actionSend"
+                    android:textColor="@color/black" />
+            </LinearLayout>
+
+            <TextView
+                style="@style/inputItemCaption"
+                android:text="备注"
+                android:textColor="@color/red"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/line_hint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginRight="@dimen/dp_10"
+            android:background="@drawable/shape_msg_block"
+            android:orientation="vertical"
+            android:padding="@dimen/sp_16"
+            android:visibility="gone">
+
+            <TextView
+                android:id="@+id/tv_hint1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="提示"
+                android:textColor="@color/black"></TextView>
+
+        </LinearLayout>
+
+        <RadioGroup
+            android:id="@+id/rg_hui"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/rb_ok"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="报工"
+                android:textSize="@dimen/sp_14"></RadioButton>
+
+            <RadioButton
+                android:id="@+id/rb_no"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:text="预加工"></RadioButton>
+        </RadioGroup>
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/btn_starts"
+            style="@style/ButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="12dp"
+            android:text="打印" />
+
+    </LinearLayout>
+
+
+</RelativeLayout>

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

@@ -5,315 +5,350 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/ll_gangwei"
+    <android.support.v4.widget.NestedScrollView
+        android:id="@+id/navigation_header_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
-
+        >
         <LinearLayout
+            android:id="@+id/ll_gangwei"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:padding="@dimen/sp_16">
-
-            <TextView
-                style="@style/inputItemCaption"
-                android:text="操作"
-                android:textColor="@color/red"/>
+            android:orientation="vertical">
 
-            <RadioGroup
-                android:id="@+id/rg_hui"
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center"
-                android:orientation="horizontal">
+                android:orientation="horizontal"
+                android:padding="@dimen/sp_16">
 
-                <RadioButton
-                    android:id="@+id/rb_ok"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:text="签到"/>
+                <TextView
+                    style="@style/inputItemCaption"
+                    android:text="操作"
+                    android:textColor="@color/red"/>
 
-                <RadioButton
-                    android:id="@+id/rb_no"
-                    android:layout_width="wrap_content"
+                <RadioGroup
+                    android:id="@+id/rg_hui"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:layout_weight="1"
-                    android:text="签退"/>
-            </RadioGroup>
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingLeft="@dimen/sp_16"
-            android:paddingRight="@dimen/sp_16">
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/rb_ok"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
+                        android:text="签到"/>
+
+                    <RadioButton
+                        android:id="@+id/rb_no"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_weight="1"
+                        android:text="签退"/>
+                </RadioGroup>
+            </LinearLayout>
 
-            <TextView
-                style="@style/inputItemCaption"
-                android:text="打卡时间"
-                android:textColor="@color/red"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_line_edittext">
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/sp_16"
+                android:paddingRight="@dimen/sp_16">
 
-                <com.uas.jc_workstation.view.ClearableEditText
-                    android:id="@+id/storage_recharge_collect_ets"
-                    style="@style/EditTextStyle"
-                    android:layout_weight="1"
-                    android:background="@null"
-                    android:focusable="false"
-                    android:focusableInTouchMode="false"
-                    android:hint="请选择时间"
-                    android:imeOptions="actionSend"
-                    android:textColor="@color/black" />
+                <TextView
+                    style="@style/inputItemCaption"
+                    android:text="打卡时间"
+                    android:textColor="@color/red"/>
 
-            </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_line_edittext">
 
-        </LinearLayout>
+                    <com.uas.jc_workstation.view.ClearableEditText
+                        android:id="@+id/storage_recharge_collect_ets"
+                        style="@style/EditTextStyle"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:focusable="false"
+                        android:focusableInTouchMode="false"
+                        android:hint="请选择时间"
+                        android:imeOptions="actionSend"
+                        android:textColor="@color/black" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_10"
-            android:orientation="horizontal"
-            android:paddingLeft="@dimen/sp_16"
-            android:paddingRight="@dimen/sp_16">
+                </LinearLayout>
 
-            <TextView
-                style="@style/inputItemCaption"
-                android:text="工单流水"
-                android:textColor="@color/red"
-                />
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_line_edittext"
-                android:orientation="horizontal">
-
-                <AutoCompleteTextView
-                    android:id="@+id/et_linecode_smts"
-                    style="@style/EditTextLineStyle"
-                    android:layout_height="match_parent"
-                    android:layout_width="match_parent"
-                    android:inputType="number"
-                    android:hint="请输入工单流水" />
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/sp_16"
+                android:paddingRight="@dimen/sp_16">
 
-            </LinearLayout>
+                <TextView
+                    style="@style/inputItemCaption"
+                    android:text="工单切换"
+                    android:textColor="@color/black"/>
 
-            <ImageView
-                android:id="@+id/iv_gongdan_search"
-                android:layout_width="@dimen/dp_40"
-                android:layout_height="@dimen/dp_40"
-                android:layout_gravity="center"
-                android:layout_marginLeft="5dp"
-                android:background="@drawable/bg_button"
-                android:clickable="false"
-                android:src="@drawable/search_48" />
-        </LinearLayout>
+                <CheckBox
+                    android:id="@+id/cb_gongdanqiehuan"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    />
 
+            </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_10"
-            android:orientation="horizontal"
-            android:paddingLeft="@dimen/sp_16"
-            android:paddingRight="@dimen/sp_16">
 
-            <TextView
-                style="@style/inputItemCaption"
-                android:text="岗位"
-                android:textColor="@color/red"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_line_edittext"
-                android:orientation="horizontal">
-
-                <com.uas.jc_workstation.view.ClearableEditText
-                    android:id="@+id/ct_qty"
-                    style="@style/EditTextStyle"
+                android:layout_marginTop="@dimen/dp_10"
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/sp_16"
+                android:paddingRight="@dimen/sp_16">
+
+                <TextView
+                    style="@style/inputItemCaption"
+                    android:text="工单流水"
+                    android:textColor="@color/red"
+                    />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:background="@null"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:hint="请采集输入岗位"
-                    android:imeOptions="actionSend"
-                    android:textColor="@color/black" />
+                    android:background="@drawable/bg_line_edittext"
+                    android:orientation="horizontal">
+
+                    <AutoCompleteTextView
+                        android:id="@+id/et_linecode_smts"
+                        style="@style/EditTextLineStyle"
+                        android:layout_height="match_parent"
+                        android:layout_width="match_parent"
+                        android:hint="请输入工单流水" />
+
+                </LinearLayout>
 
                 <ImageView
-                    android:id="@+id/iv_sao"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:id="@+id/iv_gongdan_search"
+                    android:layout_width="@dimen/dp_40"
+                    android:layout_height="@dimen/dp_40"
                     android:layout_gravity="center"
-                    android:layout_marginRight="10dp"
+                    android:layout_marginLeft="5dp"
+                    android:background="@drawable/bg_button"
                     android:clickable="false"
-                    android:src="@drawable/ic_edittext_scan" />
+                    android:src="@drawable/search_48" />
             </LinearLayout>
 
-            <ImageView
-                android:id="@+id/storage_recharge_scan_ivs"
-                android:layout_width="@dimen/dp_40"
-                android:layout_height="@dimen/dp_40"
-                android:layout_gravity="center"
-                android:layout_marginLeft="5dp"
-                android:background="@drawable/bg_button"
-                android:clickable="false"
-                android:src="@drawable/search_48" />
-        </LinearLayout>
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_10"
-            android:orientation="horizontal"
-            android:paddingLeft="@dimen/sp_16"
-            android:paddingRight="@dimen/sp_16">
-
-            <TextView
-                style="@style/inputItemCaption"
-                android:text="卡号"
-                android:textColor="@color/black"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/bg_line_edittext"
-                android:orientation="horizontal">
+                android:layout_marginTop="@dimen/dp_10"
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/sp_16"
+                android:paddingRight="@dimen/sp_16">
 
-                <com.uas.jc_workstation.view.ClearableEditText
-                    android:id="@+id/ce_yuanyin"
-                    style="@style/EditTextStyle"
+                <TextView
+                    style="@style/inputItemCaption"
+                    android:text="岗位"
+                    android:textColor="@color/red"/>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:background="@null"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:hint="请输入卡号"
-                    android:imeOptions="actionSend"
-                    android:textColor="@color/black" />
+                    android:background="@drawable/bg_line_edittext"
+                    android:orientation="horizontal">
+
+                    <com.uas.jc_workstation.view.ClearableEditText
+                        android:id="@+id/ct_qty"
+                        style="@style/EditTextStyle"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:hint="请采集输入岗位"
+                        android:imeOptions="actionSend"
+                        android:textColor="@color/black" />
+
+                    <ImageView
+                        android:id="@+id/iv_sao"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="10dp"
+                        android:clickable="false"
+                        android:src="@drawable/ic_edittext_scan" />
+                </LinearLayout>
 
                 <ImageView
-                    android:id="@+id/iv_ka"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:id="@+id/storage_recharge_scan_ivs"
+                    android:layout_width="@dimen/dp_40"
+                    android:layout_height="@dimen/dp_40"
                     android:layout_gravity="center"
-                    android:layout_marginRight="10dp"
+                    android:layout_marginLeft="5dp"
+                    android:background="@drawable/bg_button"
                     android:clickable="false"
-                    android:src="@drawable/ic_edittext_scan" />
+                    android:src="@drawable/search_48" />
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/tv_inputpop"
-                style="@style/inputItemCaption"
-                android:layout_marginLeft="@dimen/dp_10"
-                android:background="@drawable/bg_button"
-                android:text="输入人数"
-                android:textColor="@color/white"/>
 
-        </LinearLayout>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_10"
+                android:orientation="horizontal"
+                android:paddingLeft="@dimen/sp_16"
+                android:paddingRight="@dimen/sp_16">
 
-        <TextView
-            android:visibility="gone"
-            android:id="@+id/tv_hint"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginRight="@dimen/dp_10"
-            android:background="@drawable/shape_msg_block"
-            android:padding="@dimen/sp_16"
-            android:text="提示"
-            android:textColor="@color/black"
-            />
+                <TextView
+                    style="@style/inputItemCaption"
+                    android:text="卡号"
+                    android:textColor="@color/black"/>
 
-        <LinearLayout
-            android:id="@+id/line_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_marginRight="@dimen/dp_10"
-            android:background="@drawable/shape_msg_block"
-            android:orientation="vertical"
-            android:padding="@dimen/sp_16"
-            android:textColor="@color/black"
-            android:visibility="gone"
-            tools:visibility="visible"
-            >
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_line_edittext"
+                    android:orientation="horizontal">
+
+                    <com.uas.jc_workstation.view.ClearableEditText
+                        android:id="@+id/ce_yuanyin"
+                        style="@style/EditTextStyle"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:hint="请输入卡号"
+                        android:imeOptions="actionSend"
+                        android:textColor="@color/black" />
+
+                    <ImageView
+                        android:id="@+id/iv_ka"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="10dp"
+                        android:clickable="false"
+                        android:src="@drawable/ic_edittext_scan" />
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/tv_inputpop"
+                    style="@style/inputItemCaption"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:background="@drawable/bg_button"
+                    android:text="输入人数"
+                    android:textColor="@color/white"/>
+
+            </LinearLayout>
 
             <TextView
+                android:visibility="gone"
+                android:id="@+id/tv_hint"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:background="@drawable/shape_msg_block"
+                android:padding="@dimen/sp_16"
                 android:text="提示"
-                android:textColor="@color/black"/>
+                android:textColor="@color/black"
+                />
 
-            <TextView
-                android:id="@+id/tv_sccode"
+            <LinearLayout
+                android:id="@+id/line_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/black"/>
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginTop="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:background="@drawable/shape_msg_block"
+                android:orientation="vertical"
+                android:padding="@dimen/sp_16"
+                android:textColor="@color/black"
+                android:visibility="gone"
+                tools:visibility="visible"
+                >
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="提示"
+                    android:textColor="@color/black"/>
 
-            <TextView
-                android:id="@+id/tv_wscode"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_sccode"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"/>
 
-            <TextView
-                android:id="@+id/tv_nnt"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_wscode"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"/>
 
-            <TextView
-                android:id="@+id/tv_changetext"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/black"/>
+                <TextView
+                    android:id="@+id/tv_nnt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"/>
 
-            <TextView
-                android:id="@+id/tv_pc_nnt"
+                <TextView
+                    android:id="@+id/tv_changetext"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"/>
+
+                <TextView
+                    android:id="@+id/tv_pc_nnt"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"/>
+
+                <TextView
+                    android:id="@+id/tv_pepoer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/blue"/>
+
+            </LinearLayout>
+
+            <android.support.v7.widget.RecyclerView
+                android:layout_marginTop="10dp"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:id="@+id/feeded_rv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/black"/>
+                />
 
-            <TextView
-                android:id="@+id/tv_pepoer"
+            <Button
+                android:visibility="invisible"
+                style="@style/ButtonStyle"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="@color/blue"/>
+                android:layout_alignParentBottom="true"
+                android:layout_margin="12dp"
+               />
 
         </LinearLayout>
 
-    </LinearLayout>
-
-    <android.support.v7.widget.RecyclerView
-        android:layout_below="@+id/ll_gangwei"
-        android:layout_above="@+id/jlt_storage_in_barcode_save_btn"
-        android:layout_marginTop="10dp"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:layout_marginRight="@dimen/dp_10"
-        android:id="@+id/feeded_rv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        />
+    </android.support.v4.widget.NestedScrollView>
 
 
     <Button

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

@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="15dp">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical">
+        <TextView
+            android:layout_width="65dp"
+            android:layout_height="wrap_content"
+            android:text="岗位资源"
+            android:textColor="@color/black"
+            android:layout_marginRight="10dp"
+            android:textSize="14sp"
+            />
+
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <AutoCompleteTextView
+                android:id="@+id/ac_tv_gwzy"
+                style="@style/EditTextLineStyle"
+                android:hint="请输入岗位资源" />
+
+            <ImageView
+                android:id="@+id/iv_clear_1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|right"
+                android:layout_marginRight="13dp"
+                android:src="@drawable/wrong"
+                android:visibility="gone" />
+        </FrameLayout>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_marginTop="10dp">
+        <TextView
+            android:layout_width="65dp"
+            android:layout_height="wrap_content"
+            android:text="工单号     "
+            android:textColor="@color/black"
+            android:layout_marginRight="10dp"
+            android:textSize="14sp"
+            />
+
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <AutoCompleteTextView
+                android:id="@+id/ac_tv_gdh"
+                style="@style/EditTextLineStyle"
+                android:hint="请输入工单号" />
+
+            <ImageView
+                android:id="@+id/iv_clear_2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|right"
+                android:layout_marginRight="13dp"
+                android:src="@drawable/wrong"
+                android:visibility="gone" />
+        </FrameLayout>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_marginTop="20dp">
+        <TextView
+            android:layout_width="65dp"
+            android:layout_height="wrap_content"
+            android:text="产品编号  "
+            android:textColor="@color/black"
+            android:layout_marginRight="10dp"
+            android:textSize="14sp"
+            />
+        <TextView
+            android:id="@+id/tv_product_no"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="543637676574747"
+            android:textColor="@color/black"
+            android:layout_marginRight="10dp"
+            android:textSize="14sp"
+            />
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_marginTop="20dp">
+        <TextView
+            android:layout_width="65dp"
+            android:layout_height="wrap_content"
+            android:text="产品名称  "
+            android:textColor="@color/black"
+            android:layout_marginRight="10dp"
+            android:textSize="14sp"
+            />
+        <TextView
+            android:id="@+id/tv_product_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="543637676574747"
+            android:textColor="@color/black"
+            android:layout_marginRight="10dp"
+            android:textSize="14sp"
+            />
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_marginTop="20dp">
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+            <TextView
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:text="已采集"
+                android:textColor="@color/black"
+                android:layout_marginRight="10dp"
+                android:textSize="14sp"
+                />
+            <TextView
+                android:id="@+id/tv_has_caiji_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="78"
+                android:textColor="@color/black"
+                android:layout_marginRight="10dp"
+                android:textSize="14sp"
+                />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+            <TextView
+                android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:text="待采集"
+                android:textColor="@color/black"
+                android:layout_marginRight="10dp"
+                android:textSize="14sp"
+                />
+            <TextView
+                android:id="@+id/tv_not_caiji_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="78"
+                android:textColor="@color/black"
+                android:layout_marginRight="10dp"
+                android:textSize="14sp"
+                />
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_marginTop="10dp">
+        <TextView
+            android:layout_width="65dp"
+            android:layout_height="wrap_content"
+            android:text="SN"
+            android:textColor="@color/black"
+            android:layout_marginRight="10dp"
+            android:textSize="14sp"
+            />
+
+        <FrameLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+            <com.uas.jc_workstation.view.ClearableEditText
+                android:id="@+id/et_sn"
+                style="@style/EditTextStyle"
+                android:hint="请输入SN"
+                android:textColor="@color/black" />
+        </FrameLayout>
+    </LinearLayout>
+    <TextView
+        android:id="@+id/tv_msg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:textColor="@color/color_dark_grey"
+        android:textSize="14sp"
+        tools:text="SN:356采集成功"
+        />
+
+</LinearLayout>

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

@@ -155,7 +155,7 @@
                     style="@style/EditTextLineStyle"
                     android:layout_height="match_parent"
                     android:layout_width="match_parent"
-                    android:inputType="number"
+                    android:inputType="text"
                     android:hint="请输入工单流水" />
 
             </LinearLayout>

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

@@ -4,52 +4,62 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
+
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
         <CheckBox
             android:id="@+id/select_checkbox"
             android:layout_width="@dimen/dp_40"
             android:layout_height="wrap_content"
-            android:layout_gravity="center">
-        </CheckBox>
+            android:layout_gravity="center"></CheckBox>
+
         <LinearLayout
-            android:orientation="vertical"
-            android:layout_gravity="center"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="vertical">
+
             <TextView
                 android:id="@+id/tv_liaocode"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/dp_10"
                 android:layout_marginRight="@dimen/dp_10"
-                android:text="11234123ee21234er"
-                android:gravity="center">
-            </TextView>
+                android:gravity="center"
+                android:text="11234123ee21234er"></TextView>
+
             <TextView
                 android:id="@+id/tv_liaotetall"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/dp_10"
                 android:layout_marginRight="@dimen/dp_10"
-                android:text="11234123ee21234er"
-                android:gravity="center">
-            </TextView>
+                android:gravity="center"
+                android:text="11234123ee21234er"></TextView>
+
             <TextView
                 android:id="@+id/tv_liaospec"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/dp_10"
                 android:layout_marginRight="@dimen/dp_10"
-                android:text="11234123ee21234er"
-                android:gravity="center">
-            </TextView>
+                android:gravity="center"
+                android:text="11234123ee21234er"></TextView>
+
+            <TextView
+                android:id="@+id/tv_name_work_order"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
+                android:gravity="center"
+                android:text="11234123ee21234er"/>
         </LinearLayout>
 
     </LinearLayout>
 
 
-
 </LinearLayout>

build.gradle

@@ -68,8 +68,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 16,
-            versionName      : "v1.0.6"
+            versionCode      : 29,
+            versionName      : "v1.1.9"
     ]
 
     depsVersion = [

pda_libs/bluetooth/src/main/java/com/uas/bluetooth/PrintHelper.java

@@ -87,6 +87,11 @@ public class PrintHelper {
             return this;
         }
 
+        public TextBuilder setTextAutLine(String x,String y,int width,int size,boolean isbole,boolean isdouble,String str) throws Exception {
+            HPRTPrinterHelper .AutLine(x,y,width,size,isbole,isdouble,str);
+            return this;
+        }
+
         public TextBuilder setBold(int bold) {
             if (bold < 0) {
                 bold = 0;

pda_libs/pulltoreflashlibrary/build/.transforms/17005f89b90c5050b618be0979aecdd9.bin

@@ -1 +0,0 @@
-i/

pda_libs/pulltoreflashlibrary/build/.transforms/2fb68a38fc167b4b172311002483c56b.bin

@@ -1 +0,0 @@
-o/debug

pda_libs/pulltoreflashlibrary/build/.transforms/3e576527fbe97a9ecc851b0767c1a242.bin

@@ -1 +0,0 @@
-o/classes

pda_libs/pulltoreflashlibrary/build/generated/source/r/debug/android/arch/core/R.java

@@ -1,10 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * gradle plugin from the resource data it found. It
- * should not be modified by hand.
- */
-package android.arch.core;
-
-public final class R {
-}

pda_libs/pulltoreflashlibrary/build/generated/source/r/debug/android/arch/lifecycle/R.java

@@ -1,10 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * gradle plugin from the resource data it found. It
- * should not be modified by hand.
- */
-package android.arch.lifecycle;
-
-public final class R {
-}

pda_libs/pulltoreflashlibrary/build/generated/source/r/debug/android/arch/lifecycle/livedata/R.java

@@ -1,10 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * gradle plugin from the resource data it found. It
- * should not be modified by hand.
- */
-package android.arch.lifecycle.livedata;
-
-public final class R {
-}

pda_libs/pulltoreflashlibrary/build/generated/source/r/debug/android/arch/lifecycle/livedata/core/R.java

@@ -1,10 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * gradle plugin from the resource data it found. It
- * should not be modified by hand.
- */
-package android.arch.lifecycle.livedata.core;
-
-public final class R {
-}

pda_libs/pulltoreflashlibrary/build/generated/source/r/debug/android/arch/lifecycle/viewmodel/R.java

@@ -1,10 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * gradle plugin from the resource data it found. It
- * should not be modified by hand.
- */
-package android.arch.lifecycle.viewmodel;
-
-public final class R {
-}

pda_libs/pulltoreflashlibrary/build/generated/source/r/debug/android/support/asynclayoutinflater/R.java

@@ -1,161 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * gradle plugin from the resource data it found. It
- * should not be modified by hand.
- */
-package android.support.asynclayoutinflater;
-
-public final class R {
-    public static final class attr {
-        public static int alpha = 0x7f040028;
-        public static int font = 0x7f040074;
-        public static int fontProviderAuthority = 0x7f040076;
-        public static int fontProviderCerts = 0x7f040077;
-        public static int fontProviderFetchStrategy = 0x7f040078;
-        public static int fontProviderFetchTimeout = 0x7f040079;
-        public static int fontProviderPackage = 0x7f04007a;
-        public static int fontProviderQuery = 0x7f04007b;
-        public static int fontStyle = 0x7f04007c;
-        public static int fontVariationSettings = 0x7f04007d;
-        public static int fontWeight = 0x7f04007e;
-        public static int ttcIndex = 0x7f040117;
-    }
-    public static final class color {
-        public static int notification_action_color_filter = 0x7f06003d;
-        public static int notification_icon_bg_color = 0x7f06003e;
-        public static int ripple_material_light = 0x7f060048;
-        public static int secondary_text_default_material_light = 0x7f06004a;
-    }
-    public static final class dimen {
-        public static int compat_button_inset_horizontal_material = 0x7f08004c;
-        public static int compat_button_inset_vertical_material = 0x7f08004d;
-        public static int compat_button_padding_horizontal_material = 0x7f08004e;
-        public static int compat_button_padding_vertical_material = 0x7f08004f;
-        public static int compat_control_corner_material = 0x7f080050;
-        public static int compat_notification_large_icon_max_height = 0x7f080051;
-        public static int compat_notification_large_icon_max_width = 0x7f080052;
-        public static int notification_action_icon_size = 0x7f080061;
-        public static int notification_action_text_size = 0x7f080062;
-        public static int notification_big_circle_margin = 0x7f080063;
-        public static int notification_content_margin_start = 0x7f080064;
-        public static int notification_large_icon_height = 0x7f080065;
-        public static int notification_large_icon_width = 0x7f080066;
-        public static int notification_main_column_padding_top = 0x7f080067;
-        public static int notification_media_narrow_margin = 0x7f080068;
-        public static int notification_right_icon_size = 0x7f080069;
-        public static int notification_right_side_padding_top = 0x7f08006a;
-        public static int notification_small_icon_background_padding = 0x7f08006b;
-        public static int notification_small_icon_size_as_large = 0x7f08006c;
-        public static int notification_subtext_size = 0x7f08006d;
-        public static int notification_top_pad = 0x7f08006e;
-        public static int notification_top_pad_large_text = 0x7f08006f;
-    }
-    public static final class drawable {
-        public static int notification_action_background = 0x7f09005a;
-        public static int notification_bg = 0x7f09005b;
-        public static int notification_bg_low = 0x7f09005c;
-        public static int notification_bg_low_normal = 0x7f09005d;
-        public static int notification_bg_low_pressed = 0x7f09005e;
-        public static int notification_bg_normal = 0x7f09005f;
-        public static int notification_bg_normal_pressed = 0x7f090060;
-        public static int notification_icon_background = 0x7f090061;
-        public static int notification_template_icon_bg = 0x7f090062;
-        public static int notification_template_icon_low_bg = 0x7f090063;
-        public static int notification_tile_bg = 0x7f090064;
-        public static int notify_panel_notification_icon_bg = 0x7f090065;
-    }
-    public static final class id {
-        public static int action_container = 0x7f0c0008;
-        public static int action_divider = 0x7f0c000a;
-        public static int action_image = 0x7f0c000b;
-        public static int action_text = 0x7f0c0011;
-        public static int actions = 0x7f0c0012;
-        public static int async = 0x7f0c0016;
-        public static int blocking = 0x7f0c0017;
-        public static int chronometer = 0x7f0c001b;
-        public static int forever = 0x7f0c0027;
-        public static int icon = 0x7f0c002b;
-        public static int icon_group = 0x7f0c002c;
-        public static int info = 0x7f0c002e;
-        public static int italic = 0x7f0c002f;
-        public static int line1 = 0x7f0c0031;
-        public static int line3 = 0x7f0c0032;
-        public static int normal = 0x7f0c0038;
-        public static int notification_background = 0x7f0c0039;
-        public static int notification_main_column = 0x7f0c003a;
-        public static int notification_main_column_container = 0x7f0c003b;
-        public static int right_icon = 0x7f0c0045;
-        public static int right_side = 0x7f0c0046;
-        public static int tag_transition_group = 0x7f0c0061;
-        public static int tag_unhandled_key_event_manager = 0x7f0c0062;
-        public static int tag_unhandled_key_listeners = 0x7f0c0063;
-        public static int text = 0x7f0c0064;
-        public static int text2 = 0x7f0c0065;
-        public static int time = 0x7f0c0068;
-        public static int title = 0x7f0c0069;
-    }
-    public static final class integer {
-        public static int status_bar_notification_info_maxnum = 0x7f0d0005;
-    }
-    public static final class layout {
-        public static int notification_action = 0x7f0f001d;
-        public static int notification_action_tombstone = 0x7f0f001e;
-        public static int notification_template_custom_big = 0x7f0f001f;
-        public static int notification_template_icon_group = 0x7f0f0020;
-        public static int notification_template_part_chronometer = 0x7f0f0021;
-        public static int notification_template_part_time = 0x7f0f0022;
-    }
-    public static final class string {
-        public static int status_bar_notification_info_overflow = 0x7f15002f;
-    }
-    public static final class style {
-        public static int TextAppearance_Compat_Notification = 0x7f1600ec;
-        public static int TextAppearance_Compat_Notification_Info = 0x7f1600ed;
-        public static int TextAppearance_Compat_Notification_Line2 = 0x7f1600ee;
-        public static int TextAppearance_Compat_Notification_Time = 0x7f1600ef;
-        public static int TextAppearance_Compat_Notification_Title = 0x7f1600f0;
-        public static int Widget_Compat_NotificationActionContainer = 0x7f160158;
-        public static int Widget_Compat_NotificationActionText = 0x7f160159;
-    }
-    public static final class styleable {
-        public static int[] ColorStateListItem = { 0x7f040028, 0x0101031f, 0x010101a5 };
-        public static int ColorStateListItem_alpha = 0;
-        public static int ColorStateListItem_android_alpha = 1;
-        public static int ColorStateListItem_android_color = 2;
-        public static int[] FontFamily = { 0x7f040076, 0x7f040077, 0x7f040078, 0x7f040079, 0x7f04007a, 0x7f04007b };
-        public static int FontFamily_fontProviderAuthority = 0;
-        public static int FontFamily_fontProviderCerts = 1;
-        public static int FontFamily_fontProviderFetchStrategy = 2;
-        public static int FontFamily_fontProviderFetchTimeout = 3;
-        public static int FontFamily_fontProviderPackage = 4;
-        public static int FontFamily_fontProviderQuery = 5;
-        public static int[] FontFamilyFont = { 0x01010532, 0x0101053f, 0x01010570, 0x01010533, 0x0101056f, 0x7f040074, 0x7f04007c, 0x7f04007d, 0x7f04007e, 0x7f040117 };
-        public static int FontFamilyFont_android_font = 0;
-        public static int FontFamilyFont_android_fontStyle = 1;
-        public static int FontFamilyFont_android_fontVariationSettings = 2;
-        public static int FontFamilyFont_android_fontWeight = 3;
-        public static int FontFamilyFont_android_ttcIndex = 4;
-        public static int FontFamilyFont_font = 5;
-        public static int FontFamilyFont_fontStyle = 6;
-        public static int FontFamilyFont_fontVariationSettings = 7;
-        public static int FontFamilyFont_fontWeight = 8;
-        public static int FontFamilyFont_ttcIndex = 9;
-        public static int[] GradientColor = { 0x0101020b, 0x010101a2, 0x010101a3, 0x0101019e, 0x01010512, 0x01010513, 0x010101a4, 0x0101019d, 0x01010510, 0x01010511, 0x01010201, 0x010101a1 };
-        public static int GradientColor_android_centerColor = 0;
-        public static int GradientColor_android_centerX = 1;
-        public static int GradientColor_android_centerY = 2;
-        public static int GradientColor_android_endColor = 3;
-        public static int GradientColor_android_endX = 4;
-        public static int GradientColor_android_endY = 5;
-        public static int GradientColor_android_gradientRadius = 6;
-        public static int GradientColor_android_startColor = 7;
-        public static int GradientColor_android_startX = 8;
-        public static int GradientColor_android_startY = 9;
-        public static int GradientColor_android_tileMode = 10;
-        public static int GradientColor_android_type = 11;
-        public static int[] GradientColorItem = { 0x010101a5, 0x01010514 };
-        public static int GradientColorItem_android_color = 0;
-        public static int GradientColorItem_android_offset = 1;
-    }
-}

pda_libs/pulltoreflashlibrary/build/generated/source/r/debug/android/support/compat/R.java

@@ -1,161 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * gradle plugin from the resource data it found. It
- * should not be modified by hand.
- */
-package android.support.compat;
-
-public final class R {
-    public static final class attr {
-        public static int alpha = 0x7f040028;
-        public static int font = 0x7f040074;
-        public static int fontProviderAuthority = 0x7f040076;
-        public static int fontProviderCerts = 0x7f040077;
-        public static int fontProviderFetchStrategy = 0x7f040078;
-        public static int fontProviderFetchTimeout = 0x7f040079;
-        public static int fontProviderPackage = 0x7f04007a;
-        public static int fontProviderQuery = 0x7f04007b;
-        public static int fontStyle = 0x7f04007c;
-        public static int fontVariationSettings = 0x7f04007d;
-        public static int fontWeight = 0x7f04007e;
-        public static int ttcIndex = 0x7f040117;
-    }
-    public static final class color {
-        public static int notification_action_color_filter = 0x7f06003d;
-        public static int notification_icon_bg_color = 0x7f06003e;
-        public static int ripple_material_light = 0x7f060048;
-        public static int secondary_text_default_material_light = 0x7f06004a;
-    }
-    public static final class dimen {
-        public static int compat_button_inset_horizontal_material = 0x7f08004c;
-        public static int compat_button_inset_vertical_material = 0x7f08004d;
-        public static int compat_button_padding_horizontal_material = 0x7f08004e;
-        public static int compat_button_padding_vertical_material = 0x7f08004f;
-        public static int compat_control_corner_material = 0x7f080050;
-        public static int compat_notification_large_icon_max_height = 0x7f080051;
-        public static int compat_notification_large_icon_max_width = 0x7f080052;
-        public static int notification_action_icon_size = 0x7f080061;
-        public static int notification_action_text_size = 0x7f080062;
-        public static int notification_big_circle_margin = 0x7f080063;
-        public static int notification_content_margin_start = 0x7f080064;
-        public static int notification_large_icon_height = 0x7f080065;
-        public static int notification_large_icon_width = 0x7f080066;
-        public static int notification_main_column_padding_top = 0x7f080067;
-        public static int notification_media_narrow_margin = 0x7f080068;
-        public static int notification_right_icon_size = 0x7f080069;
-        public static int notification_right_side_padding_top = 0x7f08006a;
-        public static int notification_small_icon_background_padding = 0x7f08006b;
-        public static int notification_small_icon_size_as_large = 0x7f08006c;
-        public static int notification_subtext_size = 0x7f08006d;
-        public static int notification_top_pad = 0x7f08006e;
-        public static int notification_top_pad_large_text = 0x7f08006f;
-    }
-    public static final class drawable {
-        public static int notification_action_background = 0x7f09005a;
-        public static int notification_bg = 0x7f09005b;
-        public static int notification_bg_low = 0x7f09005c;
-        public static int notification_bg_low_normal = 0x7f09005d;
-        public static int notification_bg_low_pressed = 0x7f09005e;
-        public static int notification_bg_normal = 0x7f09005f;
-        public static int notification_bg_normal_pressed = 0x7f090060;
-        public static int notification_icon_background = 0x7f090061;
-        public static int notification_template_icon_bg = 0x7f090062;
-        public static int notification_template_icon_low_bg = 0x7f090063;
-        public static int notification_tile_bg = 0x7f090064;
-        public static int notify_panel_notification_icon_bg = 0x7f090065;
-    }
-    public static final class id {
-        public static int action_container = 0x7f0c0008;
-        public static int action_divider = 0x7f0c000a;
-        public static int action_image = 0x7f0c000b;
-        public static int action_text = 0x7f0c0011;
-        public static int actions = 0x7f0c0012;
-        public static int async = 0x7f0c0016;
-        public static int blocking = 0x7f0c0017;
-        public static int chronometer = 0x7f0c001b;
-        public static int forever = 0x7f0c0027;
-        public static int icon = 0x7f0c002b;
-        public static int icon_group = 0x7f0c002c;
-        public static int info = 0x7f0c002e;
-        public static int italic = 0x7f0c002f;
-        public static int line1 = 0x7f0c0031;
-        public static int line3 = 0x7f0c0032;
-        public static int normal = 0x7f0c0038;
-        public static int notification_background = 0x7f0c0039;
-        public static int notification_main_column = 0x7f0c003a;
-        public static int notification_main_column_container = 0x7f0c003b;
-        public static int right_icon = 0x7f0c0045;
-        public static int right_side = 0x7f0c0046;
-        public static int tag_transition_group = 0x7f0c0061;
-        public static int tag_unhandled_key_event_manager = 0x7f0c0062;
-        public static int tag_unhandled_key_listeners = 0x7f0c0063;
-        public static int text = 0x7f0c0064;
-        public static int text2 = 0x7f0c0065;
-        public static int time = 0x7f0c0068;
-        public static int title = 0x7f0c0069;
-    }
-    public static final class integer {
-        public static int status_bar_notification_info_maxnum = 0x7f0d0005;
-    }
-    public static final class layout {
-        public static int notification_action = 0x7f0f001d;
-        public static int notification_action_tombstone = 0x7f0f001e;
-        public static int notification_template_custom_big = 0x7f0f001f;
-        public static int notification_template_icon_group = 0x7f0f0020;
-        public static int notification_template_part_chronometer = 0x7f0f0021;
-        public static int notification_template_part_time = 0x7f0f0022;
-    }
-    public static final class string {
-        public static int status_bar_notification_info_overflow = 0x7f15002f;
-    }
-    public static final class style {
-        public static int TextAppearance_Compat_Notification = 0x7f1600ec;
-        public static int TextAppearance_Compat_Notification_Info = 0x7f1600ed;
-        public static int TextAppearance_Compat_Notification_Line2 = 0x7f1600ee;
-        public static int TextAppearance_Compat_Notification_Time = 0x7f1600ef;
-        public static int TextAppearance_Compat_Notification_Title = 0x7f1600f0;
-        public static int Widget_Compat_NotificationActionContainer = 0x7f160158;
-        public static int Widget_Compat_NotificationActionText = 0x7f160159;
-    }
-    public static final class styleable {
-        public static int[] ColorStateListItem = { 0x7f040028, 0x0101031f, 0x010101a5 };
-        public static int ColorStateListItem_alpha = 0;
-        public static int ColorStateListItem_android_alpha = 1;
-        public static int ColorStateListItem_android_color = 2;
-        public static int[] FontFamily = { 0x7f040076, 0x7f040077, 0x7f040078, 0x7f040079, 0x7f04007a, 0x7f04007b };
-        public static int FontFamily_fontProviderAuthority = 0;
-        public static int FontFamily_fontProviderCerts = 1;
-        public static int FontFamily_fontProviderFetchStrategy = 2;
-        public static int FontFamily_fontProviderFetchTimeout = 3;
-        public static int FontFamily_fontProviderPackage = 4;
-        public static int FontFamily_fontProviderQuery = 5;
-        public static int[] FontFamilyFont = { 0x01010532, 0x0101053f, 0x01010570, 0x01010533, 0x0101056f, 0x7f040074, 0x7f04007c, 0x7f04007d, 0x7f04007e, 0x7f040117 };
-        public static int FontFamilyFont_android_font = 0;
-        public static int FontFamilyFont_android_fontStyle = 1;
-        public static int FontFamilyFont_android_fontVariationSettings = 2;
-        public static int FontFamilyFont_android_fontWeight = 3;
-        public static int FontFamilyFont_android_ttcIndex = 4;
-        public static int FontFamilyFont_font = 5;
-        public static int FontFamilyFont_fontStyle = 6;
-        public static int FontFamilyFont_fontVariationSettings = 7;
-        public static int FontFamilyFont_fontWeight = 8;
-        public static int FontFamilyFont_ttcIndex = 9;
-        public static int[] GradientColor = { 0x0101020b, 0x010101a2, 0x010101a3, 0x0101019e, 0x01010512, 0x01010513, 0x010101a4, 0x0101019d, 0x01010510, 0x01010511, 0x01010201, 0x010101a1 };
-        public static int GradientColor_android_centerColor = 0;
-        public static int GradientColor_android_centerX = 1;
-        public static int GradientColor_android_centerY = 2;
-        public static int GradientColor_android_endColor = 3;
-        public static int GradientColor_android_endX = 4;
-        public static int GradientColor_android_endY = 5;
-        public static int GradientColor_android_gradientRadius = 6;
-        public static int GradientColor_android_startColor = 7;
-        public static int GradientColor_android_startX = 8;
-        public static int GradientColor_android_startY = 9;
-        public static int GradientColor_android_tileMode = 10;
-        public static int GradientColor_android_type = 11;
-        public static int[] GradientColorItem = { 0x010101a5, 0x01010514 };
-        public static int GradientColorItem_android_color = 0;
-        public static int GradientColorItem_android_offset = 1;
-    }
-}