解决扫描二维码重复请求问题, 增加彩盒标签与外箱标签校验，外箱标签与栈板标签校验，彩盒标签和机身标签校验页面功能.新页面输入框增加跳转

app/src/main/java/uas/erp/huiyan_wms/bean/WorkOrderData.java

@@ -0,0 +1,47 @@
+package uas.erp.huiyan_wms.bean;
+
+/**
+ * Created by sw on 2025-12-04
+ */
+public class WorkOrderData {
+
+    //返回三个字段ma_code 工单号,ma_prodcode 产品编号,pr_detail  产品名称
+
+    private String MA_CODE;
+    private String MA_PRODCODE;
+    private String PR_DETAIL;
+    private boolean isSelect;
+
+    public boolean isSelect() {
+        return isSelect;
+    }
+
+    public void setSelect(boolean select) {
+        isSelect = select;
+    }
+
+    public String getMA_CODE() {
+        return MA_CODE;
+    }
+
+    public void setMA_CODE(String MA_CODE) {
+        this.MA_CODE = MA_CODE;
+    }
+
+    public String getMA_PRODCODE() {
+        return MA_PRODCODE;
+    }
+
+    public void setMA_PRODCODE(String MA_PRODCODE) {
+        this.MA_PRODCODE = MA_PRODCODE;
+    }
+
+    public String getPR_DETAIL() {
+        return PR_DETAIL;
+    }
+
+    public void setPR_DETAIL(String PR_DETAIL) {
+        this.PR_DETAIL = PR_DETAIL;
+    }
+
+}

app/src/main/java/uas/erp/huiyan_wms/fragment/ColorBoxAndOuterBoxVerificationFragment.java

@@ -0,0 +1,487 @@
+package uas.erp.huiyan_wms.fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.listener.OnItemClickListener;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import razerdp.basepopup.BasePopupWindow;
+import uas.erp.huiyan_wms.R;
+import uas.erp.huiyan_wms.bean.WorkOrderData;
+import uas.erp.huiyan_wms.global.GloableParams;
+import uas.erp.huiyan_wms.util.CommonUtil;
+import uas.erp.huiyan_wms.util.FastjsonUtil;
+import uas.erp.huiyan_wms.util.HttpCallback;
+import uas.erp.huiyan_wms.util.HttpParams;
+import uas.erp.huiyan_wms.util.StringUtil;
+import uas.erp.huiyan_wms.util.VollyRequest;
+import uas.erp.huiyan_wms.view.ClearableEditText;
+
+public
+        /**
+         * Created by sw on 2025-12-04
+         */
+class ColorBoxAndOuterBoxVerificationFragment extends BaseFragment {
+
+    private static final int SCAN_OUTER_BOX_LABEL = 101;
+    private static final int SCAN_MODEL_CODE = 102;
+
+    private ClearableEditText cet_work_order_no;
+    private ImageView iv_work_order_no;
+    private ClearableEditText cet_product_code;
+    private ClearableEditText cet_product_name;
+    private ClearableEditText cet_outer_box_label;
+    private ImageView iv_outer_box_label;
+    private ClearableEditText cet_color_box_label;
+    private ImageView iv_color_box_label;
+    private Button bt_submit_verification;
+    private StringRequest mStringRequest;
+    private ArrayList<WorkOrderData> workOrderDataList;
+    private ClearableEditText edit_et;
+    private RecyclerView rv_line_ip_port_data;
+    private PopupWindow editPW;
+    private WorkOrderDataAdapter workOrderDataAdapter;
+    private String ma_code;
+    private String ma_prodcode;
+    private String pr_detail;
+    private String type;
+    private TextView tv_code1_label,tv_code2_label;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fra_color_box_and_outer_box_verification;
+    }
+
+    @Override
+    protected void initViews() {
+        cet_work_order_no = root.findViewById(R.id.cet_work_order_no);
+        iv_work_order_no = root.findViewById(R.id.iv_work_order_no);
+        cet_product_code = root.findViewById(R.id.cet_product_code);
+        cet_product_name = root.findViewById(R.id.cet_product_name);
+        cet_outer_box_label = root.findViewById(R.id.cet_outer_box_label);
+        iv_outer_box_label = root.findViewById(R.id.iv_outer_box_label);
+        cet_color_box_label = root.findViewById(R.id.cet_color_box_label);
+        iv_color_box_label = root.findViewById(R.id.iv_color_box_label);
+        bt_submit_verification = root.findViewById(R.id.bt_submit_verification);
+        tv_code1_label = root.findViewById(R.id.tv_code1_label);
+        tv_code2_label = root.findViewById(R.id.tv_code2_label);
+        cet_work_order_no.requestFocus();
+    }
+
+    @Override
+    protected void initEvents() {
+        iv_work_order_no.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String ma_code = cet_work_order_no.getText().toString().trim();
+                getWorkOrderData(ma_code);
+            }
+        });
+
+        iv_outer_box_label.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.scanBarcode(mActivity, ColorBoxAndOuterBoxVerificationFragment.this, SCAN_OUTER_BOX_LABEL);
+            }
+        });
+
+        iv_color_box_label.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.scanBarcode(mActivity, ColorBoxAndOuterBoxVerificationFragment.this, SCAN_MODEL_CODE);
+            }
+        });
+
+        bt_submit_verification.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String ma_code = cet_work_order_no.getText().toString().trim();
+                String code1 = cet_outer_box_label.getText().toString().trim();
+                String code2 = cet_color_box_label.getText().toString().trim();
+                submitVerification(ma_code,type,code1,code2);
+            }
+        });
+
+        cet_outer_box_label.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            cet_color_box_label.requestFocus();
+                            return true;
+                        default:
+                            return true;
+                    }
+                }
+                return false;
+            }
+        });
+
+        cet_color_box_label.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String ma_code = cet_work_order_no.getText().toString().trim();
+                            String code1 = cet_outer_box_label.getText().toString().trim();
+                            String code2 = cet_color_box_label.getText().toString().trim();
+                            submitVerification(ma_code,type,code1,code2);
+                            return true;
+                        default:
+                            return true;
+                    }
+                }
+                return false;
+            }
+        });
+    }
+
+    private void submitVerification(String ma_code,String type,String code1,String code2) {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_LABEL_CHECK)
+                        .method(Request.Method.GET)
+                        .tag(GloableParams.ADDRESS_LABEL_CHECK)
+                        .flag(0)
+                        .addParam("ma_code", ma_code)
+                        .addParam("type", type)
+                        .addParam("code1", code1)
+                        .addParam("code2", code2)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        try {
+                            progressDialog.dismiss();
+                            Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                            if (isSuccess){
+                                CommonUtil.toastNoRepeat(mActivity, "校验成功");
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+
+                });
+    }
+
+    private void getWorkOrderData(String ma_code) {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_FUZZ_SERACH_MAKE)
+                        .method(Request.Method.GET)
+                        .tag(GloableParams.ADDRESS_FUZZ_SERACH_MAKE)
+                        .flag(0)
+                        .addParam("ma_code", ma_code)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        try {
+                            progressDialog.dismiss();
+                            Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(),"success");
+                            JSONArray dataArray = FastjsonUtil.getJSONArray(o.toString(), "items");
+                            //String data = FastjsonUtil.getText(o.toString(), "data");
+                            if (isSuccess){
+                                if (dataArray == null){
+                                    CommonUtil.toastNoRepeat(mActivity,"未搜索到匹配数据");
+                                }else {
+                                    workOrderDataList.clear();
+                                    for (Object index : dataArray) {
+                                        JSONObject data = (JSONObject) index;
+                                        WorkOrderData workOrderData = new WorkOrderData();
+                                        workOrderData.setMA_CODE(data.getString("MA_CODE"));
+                                        workOrderData.setMA_PRODCODE(data.getString("MA_PRODCODE"));
+                                        workOrderData.setPR_DETAIL(data.getString("PR_DETAIL"));
+                                        workOrderDataList.add(workOrderData);
+                                    }
+                                    initresourcesPopupWindow();
+                                }
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+
+                });
+    }
+
+    private void initresourcesPopupWindow() {
+        View contView = LayoutInflater.from(mActivity).inflate(R.layout.index_recycle_item, null);
+        edit_et = (ClearableEditText) contView.findViewById(R.id.edit_et);
+        TextView sure_tv = (TextView) contView.findViewById(R.id.sure_tv);
+        TextView cancle_tv = (TextView) contView.findViewById(R.id.cancle_tv);
+        ImageView search_im = contView.findViewById(R.id.search_im);
+        LinearLayout line_top = contView.findViewById(R.id.line_top);
+        rv_line_ip_port_data = contView.findViewById(R.id.rv_ip_port_data);
+        rv_line_ip_port_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
+        rv_line_ip_port_data.setLayoutManager(new LinearLayoutManager(mActivity));
+        workOrderDataAdapter = new WorkOrderDataAdapter(workOrderDataList);
+        rv_line_ip_port_data.setAdapter(workOrderDataAdapter);
+
+        edit_et.requestFocus();
+        editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        editPW.setTouchable(true);
+        editPW.setBackgroundDrawable(new BitmapDrawable());
+        editPW.setOnDismissListener(new BasePopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeListPopupWindow();
+            }
+        });
+        View parentView = mActivity.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        editPW.showAtLocation(parentView, Gravity.CENTER, 0, 0);
+        CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
+        edit_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            setResetData();
+                            return true;
+                        default:
+                            return true;
+                    }
+                }
+                return false;
+            }
+        });
+
+        search_im.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setResetData();
+            }
+        });
+
+        //确定
+        sure_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (StringUtil.isEmpty(ma_code)){
+                    CommonUtil.toastNoRepeat(mActivity,"请选择工单");
+                    return;
+                }
+                cet_work_order_no.setText(ma_code);
+                cet_product_code.setText(ma_prodcode);
+                cet_product_name.setText(pr_detail);
+                cet_outer_box_label.requestFocus();
+                closeListPopupWindow();
+            }
+        });
+
+        //取消
+        cancle_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeListPopupWindow();
+            }
+        });
+
+        String mSearchStr = edit_et.getText().toString().trim();
+        if (TextUtils.isEmpty(mSearchStr)) {
+            workOrderDataAdapter = new WorkOrderDataAdapter(workOrderDataList);
+            rv_line_ip_port_data.setAdapter(workOrderDataAdapter);
+            List<WorkOrderData> lineCodeEntities = workOrderDataAdapter.getmList();
+            for (int i = 0; i < lineCodeEntities.size(); i++) {
+                lineCodeEntities.get(i).setSelect(false);
+            }
+            workOrderDataAdapter.notifyDataSetChanged();
+            workOrderDataAdapter.setOnItemClickListener(new OnItemClickListener() {
+                @Override
+                public void onItemClick(@NonNull @NotNull BaseQuickAdapter<?, ?> adapter, @NonNull @NotNull View view, int position) {
+                    List<WorkOrderData> ipAndPortBeans = workOrderDataAdapter.getmList();
+                    ma_code = ipAndPortBeans.get(position).getMA_CODE();
+                    ma_prodcode = ipAndPortBeans.get(position).getMA_PRODCODE();
+                    pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
+                    for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                        ipAndPortBeans.get(i).setSelect(false);
+                    }
+                    ipAndPortBeans.get(position).setSelect(true);
+                    workOrderDataAdapter.notifyDataSetChanged();
+                }
+            });
+        }
+    }
+
+    private void setResetData() {
+        String mSearchStr = edit_et.getText().toString().trim();
+        if (!mSearchStr.isEmpty()) {
+            List<WorkOrderData> thisList = new ArrayList<>();
+            for(int i=0;i<workOrderDataList.size();i++){
+                if(workOrderDataList.get(i).getMA_CODE().contains(mSearchStr)
+                        ||workOrderDataList.get(i).getMA_PRODCODE().contains(mSearchStr)
+                        ||workOrderDataList.get(i).getPR_DETAIL().contains(mSearchStr)){
+                    thisList.add(workOrderDataList.get(i));
+                }
+            }
+            workOrderDataAdapter = new WorkOrderDataAdapter(thisList);
+        } else {
+            workOrderDataAdapter = new WorkOrderDataAdapter(workOrderDataList);
+        }
+        rv_line_ip_port_data.setAdapter(workOrderDataAdapter);
+        List<WorkOrderData> lineCodeEntities = workOrderDataAdapter.getmList();
+        for (int i = 0; i < lineCodeEntities.size(); i++) {
+            lineCodeEntities.get(i).setSelect(false);
+        }
+        workOrderDataAdapter.notifyDataSetChanged();
+        workOrderDataAdapter.setOnItemClickListener(new OnItemClickListener() {
+
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                List<WorkOrderData> ipAndPortBeans = workOrderDataAdapter.getmList();
+                ma_code = ipAndPortBeans.get(position).getMA_CODE();
+                ma_prodcode = ipAndPortBeans.get(position).getMA_PRODCODE();
+                pr_detail = ipAndPortBeans.get(position).getPR_DETAIL();
+                for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                    ipAndPortBeans.get(i).setSelect(false);
+                }
+                ipAndPortBeans.get(position).setSelect(true);
+                workOrderDataAdapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+    private void closeListPopupWindow() {
+        if (editPW != null) {
+            editPW.dismiss();
+            editPW = null;
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
+    }
+
+    @Override
+    protected void initDatas() {
+        workOrderDataList = new ArrayList<>();
+
+        Bundle arguments = getArguments();
+        if (arguments != null) {
+            type = arguments.getString("type");
+            if (type.equals("GIFTBOX")) {
+                tv_code1_label.setText("外箱标签：");
+                tv_code2_label.setText("彩盒标签：");
+                setTitle("彩盒标签与外箱标签校验");
+            }else if (type.equals("OUTBOX")) {
+                tv_code1_label.setText("栈板标签：");
+                tv_code2_label.setText("外箱标签：");
+                setTitle("外箱标签与栈板标签校验");
+            }else if (type.equals("FUGELABEL")) {
+                tv_code1_label.setText("机身标签：");
+                tv_code2_label.setText("彩盒标签：");
+                setTitle("彩盒标签和机身标签校验");
+            }
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+        if (requestCode == SCAN_OUTER_BOX_LABEL && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                cet_outer_box_label.setText(result);
+                cet_outer_box_label.setSelection(result.length());
+            }
+        }
+        if (requestCode == SCAN_MODEL_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                cet_color_box_label.setText(result);
+                cet_color_box_label.setSelection(result.length());
+            }
+        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+
+    private class WorkOrderDataAdapter extends BaseQuickAdapter<WorkOrderData, BaseViewHolder> {
+        private List<WorkOrderData> mmmmList;
+
+        public List<WorkOrderData> getmList() {
+            return mmmmList;
+        }
+
+        public void setmList(List<WorkOrderData> mList) {
+            this.mmmmList = mList;
+        }
+        public WorkOrderData getBeanByPositon(int position){
+            return mmmmList.get(position);
+        }
+
+        private WorkOrderDataAdapter(@Nullable List<WorkOrderData> data) {
+            super(R.layout.item_work_order_data, data);
+            this.mmmmList = data;
+        }
+        @Override
+        protected void convert(BaseViewHolder helper, WorkOrderData item) {
+            helper.setText(R.id.tv_work_order,item.getMA_CODE());
+            helper.setText(R.id.tv_product_no,item.getMA_PRODCODE());
+            helper.setText(R.id.tv_product_name,item.getPR_DETAIL());
+            LinearLayout line_true = helper.itemView.findViewById(R.id.line_true);
+            if (item.isSelect()) {
+                line_true.setSelected(true);
+            } else {
+                line_true.setSelected(false);
+            }
+        }
+    }
+}

app/src/main/java/uas/erp/huiyan_wms/fragment/IOCOutMakeMaterialOper.java

@@ -653,10 +653,15 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         etBarCode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    confirmEvent();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            confirmEvent();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/uas/erp/huiyan_wms/fragment/IndexWareHouseContentFragment.java

@@ -1,5 +1,6 @@
 package uas.erp.huiyan_wms.fragment;
 
+import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.AdapterView;
@@ -160,17 +161,26 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
                 case GloableParams.GRIDNAME_COLOR_BOX_AND_OUTER_BOX_VERIFICATION://彩盒标签与外箱标签校验
-                    fragment = new OutboundLis_Two_fragment();
+                    fragment = new ColorBoxAndOuterBoxVerificationFragment();
+                    Bundle bundle1 = new Bundle();
+                    bundle1.putString("type","GIFTBOX");
+                    fragment.setArguments(bundle1);
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
                 case GloableParams.GRIDNAME_CALIBRATION_OF_OUTER_BOX_AND_PALLET://外箱标签与栈板标签校验
-                    fragment = new OutboundLis_Two_fragment();
+                    fragment = new ColorBoxAndOuterBoxVerificationFragment();
+                    Bundle bundle2 = new Bundle();
+                    bundle2.putString("type","OUTBOX");
+                    fragment.setArguments(bundle2);
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
                 case GloableParams.GRIDNAME_COLOR_BOX_AND_FUSELAGE_VERIFICATION://彩盒标签和机身标签校验
-                    fragment = new OutboundLis_Two_fragment();
+                    fragment = new ColorBoxAndOuterBoxVerificationFragment();
+                    Bundle bundle3 = new Bundle();
+                    bundle3.putString("type","FUGELABEL");
+                    fragment.setArguments(bundle3);
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;

app/src/main/java/uas/erp/huiyan_wms/fragment/NewBePutInStorageOrderDetailFragment.java

@@ -38,6 +38,7 @@ import uas.erp.huiyan_wms.util.FastjsonUtil;
 import uas.erp.huiyan_wms.util.FragmentUtils;
 import uas.erp.huiyan_wms.util.HttpCallback;
 import uas.erp.huiyan_wms.util.HttpParams;
+import uas.erp.huiyan_wms.util.MyLog;
 import uas.erp.huiyan_wms.util.VolleyRequest;
 import uas.erp.huiyan_wms.view.ClearableEditText;
 
@@ -88,7 +89,7 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
         radiobutton0 = root.findViewById(R.id.radiobutton0);
         radiobutton2 = root.findViewById(R.id.radiobutton2);
         radiobig = root.findViewById(R.id.radiobig);
-        radiobig.setChecked(true);
+        radiobutton0.setChecked(true);
 
         mTypeColumn = new Column<String>("类型", "PIM_TYPE");
         mcontentColumn = new Column<String>("内容", "CONTENT");
@@ -126,14 +127,30 @@ public class NewBePutInStorageOrderDetailFragment extends BaseFragment{
         jlt_storage_in_barcode_barcode_et.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 input = jlt_storage_in_barcode_barcode_et.getText().toString().trim();
-                    getmakeInWarhouse(input);
-                    return true;
+                //以下方法防止两次发送请求
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            MyLog.e("aaa","已进入扫码enter");
+                            String input = jlt_storage_in_barcode_barcode_et.getText().toString().trim();
+                            getmakeInWarhouse(input);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
+
+//                if (actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_SEND
+//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                    MyLog.e("aaa","已进入扫码enter");
+//                    String input = jlt_storage_in_barcode_barcode_et.getText().toString().trim();
+//                    getmakeInWarhouse(input);
+//                    return true;
+//                }
+//                return false;
             }
         });
 

app/src/main/java/uas/erp/huiyan_wms/fragment/NewOutboundDeliveryorderDetailFragment.java

@@ -83,7 +83,7 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
         radiobutton2 = root.findViewById(R.id.radiobutton2);
         radiobig = root.findViewById(R.id.radiobig);
         tv_qty = root.findViewById(R.id.tv_qty);
-        radiobig.setChecked(true);
+        radiobutton0.setChecked(true);
 
 
         mTypeColumn = new Column<String>("类型", "PIM_TYPE");
@@ -121,10 +121,6 @@ public class NewOutboundDeliveryorderDetailFragment extends BaseFragment{
                     }
                 });
 
-
-
-
-
         jlt_storage_in_barcode_barcode_et.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {

app/src/main/java/uas/erp/huiyan_wms/fragment/StorageIQCInFragment.java

@@ -156,6 +156,8 @@ public class StorageIQCInFragment extends BaseFragment implements View.OnClickLi
                     return true;
                 }
                 return false;
+
+
             }
         });
     }

app/src/main/java/uas/erp/huiyan_wms/fragment/StoragerechargeAdd_Fragment.java

@@ -444,7 +444,7 @@ public class StoragerechargeAdd_Fragment extends BaseFragment implements OnColum
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_DETAIL)
                 .method(Request.Method.GET)
-                .tag(TAG + "datalist")
+                .tag(GloableParams.ADDRESS_DOCUMENTLIBRARY_CODETWO_COMMIT_DETAIL)
                 .flag(0)
                 .addParam("va_id",string_va_ids)
                 .build(), new HttpCallback() {

app/src/main/java/uas/erp/huiyan_wms/fragment/SupplierPlatformFragment.java

@@ -174,12 +174,16 @@ public class SupplierPlatformFragment extends BaseFragment implements View.OnCli
         mBarcodeEditText.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 barcode = mBarcodeEditText.getText().toString().trim();
-                    getDataByBarcode(barcode);
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String barcode = mBarcodeEditText.getText().toString().trim();
+                            getDataByBarcode(barcode);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/uas/erp/huiyan_wms/fragment/WHRevokeStockFragment.java

@@ -234,11 +234,15 @@ public class WHRevokeStockFragment extends BaseFragment {
         mBarcodeEditText.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
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    getSonBarcode();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            getSonBarcode();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/uas/erp/huiyan_wms/fragment/WHTransferLocationFragment.java

@@ -105,13 +105,16 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
         etCode.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
-                        || actionId == EditorInfo.IME_ACTION_GO
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    disposeConfirmClickEnter();
-                    etCode.setText("");
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            disposeConfirmClickEnter();
+                            etCode.setText("");
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }
@@ -120,12 +123,15 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
         etNewLocation.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
-                        || actionId == EditorInfo.IME_ACTION_GO
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    disposeTransferClickEnter();
-                    return true;
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            disposeTransferClickEnter();
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/uas/erp/huiyan_wms/global/GloableParams.java

@@ -275,6 +275,9 @@ public class GloableParams {
     public static String ADDRESS_DOCUMENT_DETAILS;
     public static String ADDRESS_INVENTORY_SUBMIT;      //入库详情提交
 
+    public static String ADDRESS_FUZZ_SERACH_MAKE;      //工单号弹窗
+    public static String ADDRESS_LABEL_CHECK;      //提交校验
+
 
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
@@ -753,6 +756,11 @@ public class GloableParams {
     //提交
     private static final String ADDRESSTAIL_INVENTORY_SUBMIT = "/scm/reserve/ProdInOutFinish.action";
 
+    //工单号弹窗
+    private static final String ADDRESSTAIL_FUZZ_SERACH_MAKE = "/api/pda/receiving/fuzzSerachMake.action";
+    //提交校验
+    private static final String ADDRESSTAIL_LABEL_CHECK = "/api/pda/receiving/LabelCheck.action";
+
 
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
@@ -835,9 +843,9 @@ public class GloableParams {
             R.drawable.kucuntiaomadongjie,
             R.drawable.ic_finished_product_storage,
             R.drawable.ic_finished_product_outbound,
-            R.drawable.ic_finished_product_outbound,
-            R.drawable.ic_finished_product_outbound,
-            R.drawable.ic_finished_product_outbound
+            R.drawable.waixiangbiaoqian,
+            R.drawable.zhanbanbiaoqian,
+            R.drawable.jishenbiaoqian
     };
     //DETAIL:搜索备料单号，下拉列表
     public static final String SPINNER_PREPARE_SEARCH = "搜索备料单号";
@@ -1224,6 +1232,9 @@ public class GloableParams {
         GloableParams.ADDRESS_DOCUMENT_DETAILS = uriHead + GloableParams.ADDRESSTAIL_DOCUMENT_DETAILS;
         GloableParams.ADDRESS_INVENTORY_SUBMIT = uriHead + GloableParams.ADDRESSTAIL_INVENTORY_SUBMIT;
 
+        GloableParams.ADDRESS_FUZZ_SERACH_MAKE = uriHead + GloableParams.ADDRESSTAIL_FUZZ_SERACH_MAKE;
+        GloableParams.ADDRESS_LABEL_CHECK = uriHead + GloableParams.ADDRESSTAIL_LABEL_CHECK;
+
 
     }
 }

app/src/main/java/uas/erp/huiyan_wms/util/CommonUtil.java

@@ -852,13 +852,27 @@ public class CommonUtil {
         editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView textView, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_SEND
-                        || actionId == EditorInfo.IME_ACTION_DONE
-                        || actionId == EditorInfo.IME_ACTION_NEXT
-                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    String text = textView.getText().toString().trim();
-                    myEditorActionListener.MyEditorAction(text, actionId, event);
-                    return true;
+//                if (actionId == EditorInfo.IME_ACTION_SEND
+//                        || actionId == EditorInfo.IME_ACTION_DONE
+//                        || actionId == EditorInfo.IME_ACTION_NEXT
+//                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+//                    String text = textView.getText().toString().trim();
+//                    myEditorActionListener.MyEditorAction(text, actionId, event);
+//                    return true;
+//                }
+//                return false;
+
+                //解决部分PDA机器的重复调用,(按下和抬起都执行一次)
+                if (actionId == EditorInfo.IME_ACTION_SEND ||
+                        (event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    switch (event.getAction()) {
+                        case KeyEvent.ACTION_UP:
+                            String text = textView.getText().toString().trim();
+                            myEditorActionListener.MyEditorAction(text, actionId, event);
+                            return true;
+                        default:
+                            return true;
+                    }
                 }
                 return false;
             }

app/src/main/java/uas/erp/huiyan_wms/view/ClearableEditText.java

@@ -13,7 +13,6 @@ import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import uas.erp.huiyan_wms.R;
 
-
 /**
  * @注释：输入框右边的清除按钮
  */

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

@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="15dp"
+        >
+
+        <TextView
+            style="@style/tl_tv_style"
+            android:layout_height="match_parent"
+            android:gravity="center|left"
+            android:layout_width="95dp"
+            android:text="工单号:"
+            android:textColor="@color/body_text_1"
+            android:textSize="16sp"  />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            >
+
+            <uas.erp.huiyan_wms.view.ClearableEditText
+                android:id="@+id/cet_work_order_no"
+                android:background="@drawable/bg_line_edittext"
+                style="@style/EditTextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint=""
+                android:lines="1"
+                android:paddingEnd="40dp"
+                />
+
+            <ImageView
+                android:id="@+id/iv_work_order_no"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_marginStart="5dp"
+                android:layout_marginEnd="10dp"
+                android:background="@drawable/bg_button"
+                android:src="@drawable/search_48"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <!--产品编码-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="5dp">
+
+        <TextView
+            style="@style/tl_tv_style"
+            android:layout_height="match_parent"
+            android:gravity="center|left"
+            android:layout_width="95dp"
+            android:text="产品编码："
+            android:textColor="@color/body_text_1"
+            android:textSize="16sp" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            >
+
+            <uas.erp.huiyan_wms.view.ClearableEditText
+                android:id="@+id/cet_product_code"
+                android:background="@drawable/bg_line_edittext"
+                style="@style/EditTextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint=""
+                android:lines="1"
+                android:enabled="false"
+                />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <!--产品名称-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="5dp">
+
+        <TextView
+            style="@style/tl_tv_style"
+            android:layout_height="match_parent"
+            android:gravity="center|left"
+            android:layout_width="95dp"
+            android:text="产品名称："
+            android:textColor="@color/body_text_1"
+            android:textSize="16sp" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            >
+
+            <uas.erp.huiyan_wms.view.ClearableEditText
+                android:id="@+id/cet_product_name"
+                android:background="@drawable/bg_line_edittext"
+                style="@style/EditTextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint=""
+                android:lines="1"
+                android:enabled="false"
+                />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <!--外箱标签-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="5dp">
+
+        <TextView
+            android:id="@+id/tv_code1_label"
+            style="@style/tl_tv_style"
+            android:layout_height="match_parent"
+            android:gravity="center|left"
+            android:layout_width="95dp"
+            android:text="外箱标签："
+            android:textColor="@color/body_text_1"
+            android:textSize="16sp" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            >
+
+            <uas.erp.huiyan_wms.view.ClearableEditText
+                android:id="@+id/cet_outer_box_label"
+                android:background="@drawable/bg_line_edittext"
+                style="@style/EditTextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint=""
+                android:lines="1"
+                android:maxLines="1"
+                android:paddingEnd="40dp"
+                />
+
+            <ImageView
+                android:id="@+id/iv_outer_box_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:layout_marginStart="5dp"
+                android:layout_marginEnd="10dp"
+                android:src="@drawable/ic_edittext_scan"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <!--彩盒标签-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="5dp">
+
+        <TextView
+            android:id="@+id/tv_code2_label"
+            style="@style/tl_tv_style"
+            android:layout_height="match_parent"
+            android:gravity="center|left"
+            android:layout_width="95dp"
+            android:text="彩盒标签："
+            android:textColor="@color/body_text_1"
+            android:textSize="16sp" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            >
+
+            <uas.erp.huiyan_wms.view.ClearableEditText
+                android:id="@+id/cet_color_box_label"
+                android:background="@drawable/bg_line_edittext"
+                style="@style/EditTextStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint=""
+                android:lines="1"
+                android:paddingEnd="40dp"
+                android:maxLines="1"
+                />
+
+            <ImageView
+                android:id="@+id/iv_color_box_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:layout_marginStart="5dp"
+                android:layout_marginEnd="10dp"
+                android:src="@drawable/ic_edittext_scan"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+
+
+    <Button
+        android:layout_marginTop="10dp"
+        android:id="@+id/bt_submit_verification"
+        style="@style/ButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:text="提交校验" />
+
+</LinearLayout>

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

@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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:background="#F2F2F2"
     android:orientation="vertical">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white"
         android:orientation="vertical"
         android:padding="16dp">
+
         <LinearLayout
-            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
             <TextView
                 style="@style/tl_tv_style"
                 android:layout_height="match_parent"
@@ -23,14 +25,14 @@
                 android:padding="10dp"
                 android:text="仓库编号"
                 android:textColor="@color/red"
-                android:textSize="14sp"/>
+                android:textSize="14sp" />
 
             <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_weight="1">
+                android:orientation="horizontal">
 
                 <uas.erp.huiyan_wms.view.ClearableEditText
                     android:id="@+id/ed_jump"
@@ -45,35 +47,37 @@
 
 
             </LinearLayout>
+
             <ImageView
                 android:id="@+id/iv_search"
                 android:layout_width="@dimen/dp_40"
                 android:layout_height="@dimen/dp_40"
                 android:layout_gravity="center_vertical"
-                android:background="@drawable/bg_button"
                 android:layout_marginLeft="@dimen/space_left_5"
-                android:src="@drawable/search_48"/>
+                android:background="@drawable/bg_button"
+                android:src="@drawable/search_48" />
 
         </LinearLayout>
+
         <TextView
             android:id="@+id/tv_moren"
-            android:text="默认仓库:"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/blueq"
+            android:layout_marginLeft="@dimen/dp_10"
             android:layout_marginTop="@dimen/dp_10"
             android:layout_marginBottom="5dp"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:visibility="gone">
-        </TextView>
+            android:text="默认仓库:"
+            android:textColor="@color/blueq"
+            android:visibility="gone"></TextView>
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_data"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-        </androidx.recyclerview.widget.RecyclerView>
+            android:layout_height="wrap_content"></androidx.recyclerview.widget.RecyclerView>
 
 
     </LinearLayout>
+
     <Button
         android:id="@+id/storage_in_add_detail_commit_btn"
         style="@style/ButtonStyle"

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

@@ -6,12 +6,16 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
+        >
 
         <GridView
             android:id="@+id/grid_menu_storage_index"
             style="@style/MenuGridViewStyle"
             android:numColumns="3"/>
+
     </RelativeLayout>
 
 

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

@@ -328,7 +328,7 @@
                     android:text="全选" />
             </RelativeLayout>
 
-            <com.uas.pda_smart_com.view.MostListView
+            <uas.erp.huiyan_wms.view.MostListView
                 android:id="@+id/revoke_stock_in_list_mlv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
@@ -383,7 +383,7 @@
             </RelativeLayout>
 
 
-            <com.uas.pda_smart_com.view.MostListView
+            <uas.erp.huiyan_wms.view.MostListView
                 android:id="@+id/revoke_stock_out_list_mlv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />

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

@@ -91,7 +91,7 @@
 
                 <include layout="@layout/innermsg_collect_scmake" />
 
-                <com.uas.pda_smart_com.view.MostListView
+                <uas.erp.huiyan_wms.view.MostListView
                     android:id="@+id/smt_down_material_result_lv"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />

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

@@ -327,7 +327,7 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <com.uas.pda_smart_com.view.MostListView
+            <uas.erp.huiyan_wms.view.MostListView
                 android:id="@+id/smt_query_diff_not_mlv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
@@ -376,7 +376,7 @@
                 </LinearLayout>
             </LinearLayout>
 
-            <com.uas.pda_smart_com.view.MostListView
+            <uas.erp.huiyan_wms.view.MostListView
                 android:id="@+id/smt_query_diff_error_mlv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />

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

@@ -14,7 +14,7 @@
         tools:text="239439579  minghceng  guige"
         />
 
-    <com.uas.pda_smart_com.view.MostListView
+    <uas.erp.huiyan_wms.view.MostListView
         android:id="@+id/barcode_supple_print_list_msg_mlv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>

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

@@ -2,7 +2,7 @@
 <!--一级griditem布局-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="100dp"
+    android:layout_height="wrap_content"
     android:gravity="center"
     android:focusable="false"
     android:layout_centerInParent="true"
@@ -23,6 +23,6 @@
         android:layout_below="@id/first_griditem_img"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="14sp"
+        android:textSize="13sp"
         android:layout_centerHorizontal="true"/>
 </RelativeLayout>

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

@@ -166,7 +166,7 @@
             android:text="展开" />
     </LinearLayout>
 
-    <com.uas.pda_smart_com.view.MostListView
+    <uas.erp.huiyan_wms.view.MostListView
         android:id="@+id/stock_task_multiple_list_lv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:ignore="MissingDefaultResource">
+
+    <LinearLayout
+        android:background="@drawable/login_technological_process"
+        android:id="@+id/line_true"
+        android:layout_marginTop="5dp"
+        android:layout_marginLeft="30dp"
+        android:layout_marginRight="30dp"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_horizontal"
+            >
+
+            <TextView
+                android:gravity="center"
+                android:text="工单号: "
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="13sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_work_order"
+                android:gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="13sp"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_horizontal"
+            >
+
+            <TextView
+                android:gravity="center"
+                android:text="产品编号: "
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="13sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_product_no"
+                android:gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="13sp"
+                />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center_horizontal"
+            >
+
+            <TextView
+                android:gravity="center"
+                android:text="产品名称: "
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="13sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_product_name"
+                android:gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="13sp"
+                />
+
+        </LinearLayout>
+
+
+    </LinearLayout>
+
+
+</RelativeLayout>

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 31,
             compileSdkVersion: 31,
             buildToolsVersion: "35.0.0",
-            versionCode      : 7,
-            versionName      : "1.0.6"
+            versionCode      : 10,
+            versionName      : "1.0.9"
     ]
 
     depsVersion = [