物料库存核查页面增加料号功能及相关接口修改调整

app/src/main/java/com/uas/pda_smart_com/fragment/NewWHCheckMakeMaterialFragment.java

@@ -49,7 +49,7 @@ public class NewWHCheckMakeMaterialFragment extends BaseFragment implements View
 //        AdapterView.OnItemClickListener,
         VolleyUtil.VolleyFinishListener {
     private static final int SCAN_BARCODE_CODE = 301;
-    ClearableEditText etProdcode, etWhcode;
+    ClearableEditText etProdcode, etWhcode,cet_item_number;
     TextView tvPrDetail, tvPrSpec;
     TextView btnSearch;
     WHCheckMakeMaterialListAdapter adapter;
@@ -82,6 +82,7 @@ public class NewWHCheckMakeMaterialFragment extends BaseFragment implements View
         //->采集
         etProdcode = (ClearableEditText) root.findViewById(R.id.et_prodcode_whmm);
         etWhcode = (ClearableEditText) root.findViewById(R.id.et_whcode_whmm);
+        cet_item_number = (ClearableEditText) root.findViewById(R.id.cet_item_number);
         btnSearch = (TextView) root.findViewById(R.id.btn_search_whmm);
         //->信息显示
         tvPrDetail = (TextView) root.findViewById(R.id.tv_pr_detail);
@@ -167,6 +168,7 @@ public class NewWHCheckMakeMaterialFragment extends BaseFragment implements View
     //按钮点击事件
     private void disposeOnClickEnter() {
         String strProdcode = etProdcode.getText().toString().trim();
+        String strNumbssser = cet_item_number.getText().toString().trim();
         String strWhcode = etWhcode.getText().toString().trim();
         if (strProdcode.equals("") || strProdcode == null) {
             etProdcode.setWarnIconVisible();
@@ -175,8 +177,8 @@ public class NewWHCheckMakeMaterialFragment extends BaseFragment implements View
         //请求详细数据
         showLoadingView();
         requestType = VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_CHECK;
-        VolleyUtil.getVolleyUtil().requestMakeMaterialCheck(getActivity(), GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_GET,
-                requestType, strProdcode, strWhcode);
+        VolleyUtil.getVolleyUtil().requestMakeMaterialCheck2(getActivity(), GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_GET,
+                requestType, strProdcode,strNumbssser, strWhcode);
     }
 
     @Override

app/src/main/java/com/uas/pda_smart_com/fragment/WHCheckMakeMaterialFragment.java

@@ -1,391 +0,0 @@
-package com.uas.pda_smart_com.fragment;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.BitmapDrawable;
-import android.os.AsyncTask;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.PopupWindow;
-import android.widget.TextView;
-
-import com.google.gson.reflect.TypeToken;
-import com.uas.pda_smart_com.R;
-import com.uas.pda_smart_com.activity.FunctionActivity;
-import com.uas.pda_smart_com.adapter.WHCheckMakeDetailListAdapter;
-import com.uas.pda_smart_com.adapter.WHCheckMakeMaterialListAdapter;
-import com.uas.pda_smart_com.bean.WHMakeMaterialDetail;
-import com.uas.pda_smart_com.bean.WHMakeMaterialProduct;
-import com.uas.pda_smart_com.global.GloableParams;
-import com.uas.pda_smart_com.tools.DataSourceManager;
-import com.uas.pda_smart_com.tools.GsonUtil;
-import com.uas.pda_smart_com.tools.VolleyUtil;
-import com.uas.pda_smart_com.util.CameraUtil;
-import com.uas.pda_smart_com.util.CommonUtil;
-import com.uas.pda_smart_com.view.ClearableEditText;
-import com.uas.pda_smart_com.view.ConfirmDialog;
-import com.uuzuche.lib_zxing.activity.CaptureActivity;
-import com.uuzuche.lib_zxing.activity.CodeUtils;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.List;
-
-/**
- * @note:物料库存核查Fragment
- */
-public class WHCheckMakeMaterialFragment extends BaseFragment implements View.OnClickListener, DataSourceManager.NotifyData, AdapterView.OnItemClickListener, VolleyUtil.VolleyFinishListener {
-    private static final int SCAN_BARCODE_CODE = 301;
-    ClearableEditText etProdcode, etWhcode;
-    TextView tvPrDetail, tvPrSpec;
-    TextView btnSearch;
-    WHCheckMakeMaterialListAdapter adapter;
-    List<WHMakeMaterialProduct> detailItemList;
-    int requestType = -1;
-    private ListView lvDetail;
-    private ImageView mScanImageView;
-    private int mFocusId;
-
-    @Override
-    protected int getLayout() {
-        return R.layout.fragment_whcheck_makematerial;
-    }
-
-    @Override
-    protected void initViews() {
-        ((FunctionActivity) mActivity).setScanIvVisible(true);
-        detailItemList = DataSourceManager.getDataSourceManager().getMakeMaterialCheckItemList();
-        //接口回调
-        //VolleyUtil.setVolleyHandler(volleyHandler);
-        VolleyUtil.getVolleyUtil().setOnVolleyFinishListener(this);
-        DataSourceManager.getDataSourceManager().setNotifyData(this);
-        //获取组件
-        //->List
-        lvDetail = (ListView) root.findViewById(R.id.lv_detail_whmm);
-        Log.e("tableList", detailItemList.toString());
-        adapter = new WHCheckMakeMaterialListAdapter(detailItemList, getActivity());
-        lvDetail.setAdapter(adapter);
-        //->采集
-        etProdcode = (ClearableEditText) root.findViewById(R.id.et_prodcode_whmm);
-        etWhcode = (ClearableEditText) root.findViewById(R.id.et_whcode_whmm);
-        btnSearch = (TextView) root.findViewById(R.id.btn_search_whmm);
-        //->信息显示
-        tvPrDetail = (TextView) root.findViewById(R.id.tv_pr_detail);
-        tvPrSpec = (TextView) root.findViewById(R.id.tv_pr_spec);
-
-        mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
-    }
-
-    @Override
-    protected void initEvents() {
-        btnSearch.setOnClickListener(this);
-        lvDetail.setOnItemClickListener(this);
-        etProdcode.setOnKeyListener(new View.OnKeyListener() {
-            @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
-                    disposeOnClickEnter();
-                    return true;
-                }
-                return false;
-            }
-        });
-
-        mScanImageView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (CameraUtil.hasCamera()) {
-                    if (root.findFocus() != null) {
-                        mFocusId = root.findFocus().getId();
-                        Intent intent = new Intent();
-                        intent.setClass(mActivity, CaptureActivity.class);
-                        startActivityForResult(intent, SCAN_BARCODE_CODE);
-                    }
-                } else {
-                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
-                }
-            }
-        });
-    }
-
-    @Override
-    protected void initDatas() {
-        editTextGetFocus(etProdcode);
-        //->Actionbar
-        ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(R.string.title_makematerial_whmm);
-
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (resultCode != Activity.RESULT_OK) {
-            return;
-        }
-
-        if (requestCode == SCAN_BARCODE_CODE && data != null) {
-            if (data.getExtras() != null) {
-                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
-                if (mFocusId == R.id.et_prodcode_whmm) {
-                    etProdcode.setText(result);
-                    etProdcode.setSelection(result.length());
-                } else if (mFocusId == R.id.et_whcode_whmm) {
-                    etWhcode.setText(result);
-                    etWhcode.setSelection(result.length());
-                }
-            }
-        }
-    }
-
-    //按钮点击事件
-    private void disposeOnClickEnter() {
-        String strProdcode = etProdcode.getText().toString().trim();
-        String strWhcode = etWhcode.getText().toString().trim();
-        if (strProdcode.equals("") || strProdcode == null) {
-            etProdcode.setWarnIconVisible();
-            return;
-        }
-        //请求详细数据
-        showLoadingView();
-        requestType = VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_CHECK;
-        VolleyUtil.getVolleyUtil().requestMakeMaterialCheck(getActivity(), GloableParams.ADDRESS_WH_PRODUCT, VolleyUtil.METHOD_GET,
-                requestType, strProdcode, strWhcode);
-    }
-
-    @Override
-    public void onDestroy() {
-        //清理数据
-        detailItemList.removeAll(detailItemList);
-        hideKeyboard(etProdcode);
-        VolleyUtil.distoryVolley();
-
-        ((FunctionActivity) mActivity).setScanIvVisible(false);
-        super.onDestroy();
-    }
-
-
-    /*=============================明细PopWin页面============================*/
-
-    /**
-     * @注释:明细popwin页面
-     */
-    PopupWindow detailPopwin;
-
-    private void showDetailPopwin(List dataList) {
-        if (dataList == null || dataList.size() == 0) {
-            showNotice("无明细数据");
-            return;
-        }
-        View contentView = View.inflate(getActivity(), R.layout.popwin_whcheck_detail, null);
-        //获取组件
-        //->List
-        ListView lvDetail = (ListView) contentView.findViewById(R.id.lv_detail);
-        WHCheckMakeDetailListAdapter adapter = new WHCheckMakeDetailListAdapter(getActivity(), dataList);
-        lvDetail.setAdapter(adapter);
-        TextView tv = (TextView) contentView.findViewById(R.id.tv_table_3);
-        //PopupWindow
-        detailPopwin = new PopupWindow(contentView, ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.WRAP_CONTENT);
-        detailPopwin.setBackgroundDrawable(new BitmapDrawable());
-        detailPopwin.setFocusable(true);
-        detailPopwin.setOutsideTouchable(true);
-        View parentView = ((Activity) getActivity()).getWindow().findViewById(Window.ID_ANDROID_CONTENT);
-        //当pop菜单超出屏幕时，平移位置
-        detailPopwin.showAtLocation(parentView, Gravity.CENTER, 0, 0);
-    }
-
-    /*=============================公用方法===================================*/
-    /**
-     * @注释:显示错误提示
-     */
-    ConfirmDialog noticeDialog;
-
-    private void showNotice(String noticeMsg) {
-        noticeDialog = new ConfirmDialog(getActivity());
-        noticeDialog.show(noticeMsg, ConfirmDialog.NOTICE);
-
-        new AsyncTask<String, Void, Float>() {
-            @Override
-            protected Float doInBackground(String... params) {
-                try {
-                    //notice显示1.5s
-                    Thread.sleep(1000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                return null;
-            }
-
-            @Override
-            protected void onPostExecute(Float aFloat) {
-                noticeDialog.dismiss();
-            }
-        }.execute();
-    }
-
-    /**
-     * 获取输入框焦点
-     */
-    private void editTextGetFocus(EditText editText) {
-        editText.setFocusable(true);
-        editText.setFocusableInTouchMode(true);
-        editText.setEnabled(true);
-        editText.setClickable(true);
-        editText.requestFocus();
-    }
-
-    /**
-     * 显示loadingView
-     */
-    private void showLoadingView() {
-        if (!progressDialog.isShowing()) {
-            progressDialog.show();
-        }
-    }
-
-    //隐藏键盘
-    InputMethodManager inputManager;
-
-    private void hideKeyboard(final EditText view) {
-        inputManager = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-        //获取键盘管理对象
-        inputManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
-    }
-
-    String TAG = "WHCheck:";
-
-    /*=============================数据源发生变化===================================*/
-    @Override
-    public void NotifyDataChanged(int noticeType) {
-        //修改信息显示区域的信息
-        String strDetail = detailItemList.get(0).getPR_DETAIL();
-        String strSpec = detailItemList.get(0).getPR_SPEC();
-
-        //信息区域显示
-        tvPrDetail.setText("" + strDetail);
-        tvPrSpec.setText("" + strSpec);
-
-        //table数据源修改
-        adapter.notifyDataSetChanged();
-    }
-
-    /*=========================监听事件===================================*/
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        //获取点击行所对应的detail对象
-        WHMakeMaterialProduct tmpProd = detailItemList.get(position);
-        String strPrcode = tmpProd.getBAR_PRODCODE().trim();
-        String strWhcode = tmpProd.getBAR_WHCODE().trim();
-        String strLocation = tmpProd.getBAR_LOCATION();
-        if (strLocation == null || strLocation.equals("null") || strLocation.equals("")) {
-            strLocation = "null";
-        }
-        //请求服务器获取明细
-        JSONObject paramJson = new JSONObject();
-        try {
-            paramJson.put("pr_code", strPrcode);
-            paramJson.put("wh_code", strWhcode);
-            paramJson.put("bar_location", strLocation);
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        Log.e("WHCheck", "!!!" + paramJson.toString());
-        requestType = VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_DETAIL;
-        VolleyUtil.getVolleyUtil().requestMakeMaterialDetail(getActivity(), GloableParams.ADDRESS_WH_DETAIL, VolleyUtil.METHOD_GET,
-                requestType, strPrcode, strWhcode, strLocation);
-    }
-
-    @Override
-    public void onClick(View v) {
-        disposeOnClickEnter();
-    }
-
-    @Override
-    public void onVolleyFinish(int isSuccess, Object result) {
-        switch (isSuccess) {
-            case VolleyUtil.SUCCESS_SUCCESS:
-                disposeVolleySuccess(result);
-                break;
-            case VolleyUtil.FAILED_FAILED:
-                disposeVolleyFailed(result);
-                break;
-        }
-        progressDialog.dismiss();
-    }
-
-    //Volley失败
-    private void disposeVolleyFailed(Object result) {
-        showNotice(result.toString());
-    }
-
-    //Volley成功
-    private void disposeVolleySuccess(Object result) {
-        String str = (String) result;
-        switch (requestType) {
-            //物料库存核查：Check数据
-            case VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_CHECK:
-                break;
-            //物料库存核查：明细数据
-            case VolleyUtil.FRAGMETN_WHCHECK_PRODUCT_DETAIL:
-                Log.e("WHCHECK:make", "" + result.toString());
-                //显示明细数据弹框
-                //disposeVolleyDetail(result);
-                showDetailPopwin(disposeVolleyDetail(result));
-                break;
-        }
-    }
-
-    //Volley明细数据->list
-    private List disposeVolleyDetail(Object result) {
-        List<WHMakeMaterialDetail> list = null;
-        String strResult = (String) result;
-        try {
-            JSONObject resultJson = new JSONObject(strResult);
-            JSONArray targetJsonArray = resultJson.getJSONArray("target");
-            list = GsonUtil.changeGsonToList(targetJsonArray.toString(),
-                    new TypeToken<List<WHMakeMaterialDetail>>() {
-                    }.getType());
-            Log.e(TAG, "detaillist:" + list.toString());
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-        return list;
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0) {
-            if (progressDialog != null && progressDialog.isShowing()) {
-//                loadingView.dismiss();
-//                VolleyUtil.distoryVolley();
-                return true;
-            }
-            if (detailPopwin != null && detailPopwin.isShowing()) {
-                detailPopwin.dismiss();
-                return true;
-            }
-            if (noticeDialog != null && noticeDialog.isShowing()) {
-                noticeDialog.dismiss();
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean onFragmentBackPressed() {
-        return false;
-    }
-}

app/src/main/java/com/uas/pda_smart_com/tools/VolleyUtil.java

@@ -346,6 +346,29 @@ public class VolleyUtil {
         PdaApplication.mRequestQueue.add(stringRequest);
     }
 
+    /**
+     * @注释:物料库存核查:获取详细物料数据,增加(料号/条码号)参数
+     */
+    public void requestMakeMaterialCheck2(Context pContext, String pUrl, int method, int pRequestType, final String pProcode,String bar_code, final String pWhcode) {
+        //String  pr_code  //料号   测试数据：2CX-X028M-0002R01
+        //String  bar_code  // 条码号 测试数据：240903B0377
+        //String  wh_code  //仓库编号  测试数据：B0101
+        getVolleyUtil();
+        context = pContext;
+        requestType = pRequestType;
+//        pUrl = pUrl + "?pr_code=" + pProcode + "&bar_code=" + bar_code + "&wh_code=" + pWhcode;
+        pUrl = pUrl + "?pr_code=" + pProcode + "&wh_code=" + pWhcode;
+        Log.e("VOLLEYURL", pUrl);
+        stringRequest = new StringRequest(Request.Method.GET, pUrl, stringListener, errorListener) {
+            @Override
+            public Map<String, String> getHeaders() throws AuthFailureError {
+                return setCookies();
+            }
+        };
+        stringRequest.setRetryPolicy(new DefaultRetryPolicy(10 * 1000, 0, 1f));
+        PdaApplication.mRequestQueue.add(stringRequest);
+    }
+
     /**
      * @注释:尾料还仓
      */

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

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--仓库管理：物料库存核查-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <!--搜索-->
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/space_top_8"
-        android:layout_marginLeft="@dimen/space_left_8"
-        android:layout_marginRight="@dimen/space_right_8">
-        <com.uas.pda_smart_com.view.ClearableEditText
-            android:id="@+id/et_prodcode_whmm"
-            android:hint="物料编号"
-            style="@style/PopWinEditTextStyle"
-            android:layout_weight="2"/>
-        <com.uas.pda_smart_com.view.ClearableEditText
-            android:id="@+id/et_whcode_whmm"
-            android:layout_marginLeft="@dimen/space_left_8"
-            android:layout_marginRight="@dimen/space_right_8"
-            style="@style/PopWinEditTextStyle"
-            android:hint="仓位"
-            android:layout_weight="3"/>
-        <TextView
-            android:id="@+id/btn_search_whmm"
-            style="@style/PopWinButtonStyle"
-            android:layout_weight="4"
-            android:background="@drawable/search_16"/>
-    </LinearLayout>
-    <!--中部-->
-    <TableLayout
-        android:layout_marginTop="@dimen/space_top_8"
-        style="@style/CardWhiteStyle_wrapheight">
-
-        <TableRow>
-            <TextView
-                style="@style/CardContentTextStyle"
-                android:text="@string/text_fragment_whcheck_pr_detail"/>
-            <TextView
-                android:id="@+id/tv_pr_detail"
-                style="@style/CardContentTextStyle"
-                android:textColor="@color/text_search"/>
-        </TableRow>
-        <TableRow>
-            <TextView
-                style="@style/CardContentTextStyle"
-                android:text="@string/text_fragment_whcheck_pr_spec" />
-            <TextView
-                android:id="@+id/tv_pr_spec"
-                style="@style/CardContentTextStyle"
-                android:textColor="@color/text_search" />
-        </TableRow>
-    </TableLayout>
-
-    <LinearLayout
-        style="@style/CardWhiteSytle_fillheight"
-        android:background="@color/white">
-        <include layout="@layout/item_list_table"/>
-        <!--信息列表-->
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fillViewport="true"
-            android:background="@color/transparent">
-            <ListView
-                android:id="@+id/lv_detail_whmm"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/transparent"/>
-        </ScrollView>
-    </LinearLayout>
-</LinearLayout>

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

@@ -9,21 +9,34 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/space_top_8"
         android:layout_marginLeft="@dimen/space_left_8"
-        android:layout_marginRight="@dimen/space_right_8">
+        android:layout_marginRight="@dimen/space_right_8"
+        android:orientation="vertical"
+        >
+
         <com.uas.pda_smart_com.view.ClearableEditText
             android:id="@+id/et_prodcode_whmm"
-            android:hint="物料编号"
+            android:hint="条码号"
             style="@style/PopWinEditTextStyle"
             android:layout_weight="2"/>
+
+        <com.uas.pda_smart_com.view.ClearableEditText
+            android:visibility="gone"
+            android:id="@+id/cet_item_number"
+            android:hint="料号"
+            style="@style/PopWinEditTextStyle"
+            android:layout_marginTop="8dp"
+            android:layout_weight="2"/>
+
         <com.uas.pda_smart_com.view.ClearableEditText
             android:id="@+id/et_whcode_whmm"
-            android:layout_marginLeft="@dimen/space_left_8"
-            android:layout_marginRight="@dimen/space_right_8"
+            android:layout_marginTop="8dp"
             style="@style/PopWinEditTextStyle"
             android:hint="仓位"
             android:layout_weight="3"/>
+
         <TextView
             android:id="@+id/btn_search_whmm"
+            android:layout_marginTop="8dp"
             style="@style/PopWinButtonStyle"
             android:layout_weight="4"
             android:background="@drawable/search_16"/>