思拓微根据更新文档, 出库采集增加开始出库,结束出库,物料编号判断弹窗处理. 智能上架(扫码式) 条码列表增加标题和已勾选盘数, 已勾选盘数修改为已勾选条数,功能改为统计勾选数量.

app/src/main/java/com/uas/uas_mes_stw/bean/PositionInfo.java

@@ -0,0 +1,36 @@
+package com.uas.uas_mes_stw.bean;
+
+public
+        /**
+         * Created by sw on 2025-03-31
+         */
+class PositionInfo {
+
+    private String PL_CODE; //仓位编号
+    private int PL_CAPACITY;     //仓位容量
+    private int V_CAPACITY;     //已存放容量
+
+    public String getPL_CODE() {
+        return PL_CODE;
+    }
+
+    public void setPL_CODE(String PL_CODE) {
+        this.PL_CODE = PL_CODE;
+    }
+
+    public int getPL_CAPACITY() {
+        return PL_CAPACITY;
+    }
+
+    public void setPL_CAPACITY(int PL_CAPACITY) {
+        this.PL_CAPACITY = PL_CAPACITY;
+    }
+
+    public int getV_CAPACITY() {
+        return V_CAPACITY;
+    }
+
+    public void setV_CAPACITY(int v_CAPACITY) {
+        V_CAPACITY = v_CAPACITY;
+    }
+}

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

@@ -616,29 +616,51 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         btn_startoutku.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startchuku();
+                String trim = cet_item_number.getText().toString().trim();
+                if (TextUtils.isEmpty(trim)) {
+                    new android.app.AlertDialog.Builder(mActivity).setTitle("提示")
+                            .setMessage("是否点亮所有物料？")
+                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    dialog.dismiss();
+                                    startchuku(trim);
+                                }
+                            })
+                            .setNegativeButton("取消", null).create().show();
+                } else {
+                    startchuku(trim);
+                }
             }
         });
 
         btn_stopoutku.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                new AlertDialog.Builder(getActivity()).setTitle("提示")
-                        .setMessage("确认结束出库？")
-                        .setPositiveButton("确定", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                dialog.dismiss();
-                                stopchuku();
-                            }
-                        })
-                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                dialog.dismiss();
-                            }
-                        })
-                        .show();
+                String trim = cet_item_number.getText().toString().trim();
+                if (TextUtils.isEmpty(trim)) {
+                    new android.app.AlertDialog.Builder(mActivity).setTitle("提示")
+                            .setMessage("是否所有物料确认结束出库？")
+                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    dialog.dismiss();
+                                    stopchuku(trim);
+                                }
+                            })
+                            .setNegativeButton("取消", null).create().show();
+                } else {
+                    new android.app.AlertDialog.Builder(mActivity).setTitle("提示")
+                            .setMessage("是否确认物料：" + trim + ", 结束出库?")
+                            .setPositiveButton("确认", new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    dialog.dismiss();
+                                    stopchuku(trim);
+                                }
+                            })
+                            .setNegativeButton("取消", null).create().show();
+                }
             }
         });
         cet_item_number.setOnKeyListener(new View.OnKeyListener() {
@@ -839,7 +861,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                             materialAdapter.setmList(itemNumberList);
                         }
                     }
-                }catch (Exception e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
@@ -891,7 +913,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                     cet_item_number.setText(pd_prodcode);
                     etBarCode.requestFocus();
                     etBarCode.setSelection(etBarCode.getText().length());
-                    startchuku();
+                    startchuku(pd_prodcode);
                     closeItemNumberPopupWindow();
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -1055,10 +1077,11 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     /**
      * 开始出库
      */
-    private void startchuku() {
+    private void startchuku(String prodcode) {
         Log.e("pi_id", pi_id);
+
         progressDialog.show();
-        String url = GloableParams.ADDRESS_PAD_STARTPRODOUT + "?id=" + pi_id + "&prodcode=" + cet_item_number.getText().toString().trim();
+        String url = GloableParams.ADDRESS_PAD_STARTPRODOUT + "?id=" + pi_id + "&prodcode=" + prodcode;
         PdaApplication.mRequestQueue.cancelAll(TAG);
         mCollectTypeRadioGroup.setEnabled(false);
         jsonRequest = new JsonObjectRequest(Request.Method.POST, url, null, new Response.Listener<JSONObject>() {
@@ -1124,9 +1147,9 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     /**
      * 结束出库
      */
-    private void stopchuku() {
+    private void stopchuku(String prodcode) {
         progressDialog.show();
-        String url = GloableParams.ADDRESS_COMMON_ENDPRODOUT + "?id=" + pi_id + "&prodcode=" + cet_item_number.getText().toString().trim();
+        String url = GloableParams.ADDRESS_COMMON_ENDPRODOUT + "?id=" + pi_id + "&prodcode=" + prodcode;
         PdaApplication.mRequestQueue.cancelAll(TAG);
         mCollectTypeRadioGroup.setEnabled(false);
         jsonRequest = new JsonObjectRequest(Request.Method.POST, url, null, new Response.Listener<JSONObject>() {
@@ -1326,7 +1349,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 text_finishno.setVisibility(View.VISIBLE);
                                 text_finishno.setText(finishno);
                                 //包含 当前物料 并且 包含 已完成备料  才弹出物料的放大镜来
-                                if (finishno.contains("当前物料") && finishno.contains("已完成备料")){
+                                if (finishno.contains("当前物料") && finishno.contains("已完成备料")) {
                                     getItemNumberData();
                                 }
                             } else {

app/src/main/java/com/uas/uas_mes_stw/fragment/SmartShelvestFragment.java

@@ -36,6 +36,7 @@ import com.android.volley.Request;
 import com.uas.uas_mes_stw.R;
 import com.uas.uas_mes_stw.activity.FunctionActivity;
 import com.uas.uas_mes_stw.bean.InductionBean;
+import com.uas.uas_mes_stw.bean.PositionInfo;
 import com.uas.uas_mes_stw.global.GloableParams;
 import com.uas.uas_mes_stw.listener.MyEditorActionListener;
 import com.uas.uas_mes_stw.util.CameraUtil;
@@ -46,7 +47,6 @@ import com.uas.uas_mes_stw.util.FragmentUtils;
 import com.uas.uas_mes_stw.util.HttpCallback;
 import com.uas.uas_mes_stw.util.HttpParams;
 import com.uas.uas_mes_stw.util.JsonUtils;
-import com.uas.uas_mes_stw.util.LogUtil;
 import com.uas.uas_mes_stw.util.StringUtil;
 import com.uas.uas_mes_stw.util.UnshelvedMaterialsBean;
 import com.uas.uas_mes_stw.util.VolleyRequest;
@@ -83,11 +83,20 @@ public class SmartShelvestFragment extends BaseFragment {
     private SelectAdapter myAdapter;
     private ArrayList<InductionBean> mFeededList;
     private CheckBox cb_quanxuan;
-    private String barIds = "";
+    private String barIds = "";     //条码ID
+    private int barNmber = 0;     //条码数量
     private RelativeLayout rl_quanxuan;
 
     private String INNO = "";       //入库单
-    private String UNUPCOUNT = "";  //未上架物料
+    private String INID = "";       //入库单ID
+    private String UNUPCOUNT = "";  //未上架物料数
+    private RelativeLayout rl_muqiancangwei;  //目前仓位
+    private RecyclerView rv_muqiancangwei;  //目前仓位List
+    private LinearLayout ll_store_info;
+    private LinearLayout ll_weishangjia;
+    private TextView tv_rukudan_value,tv_yishangjiawuliao_value,tv_weishangjiawuliao_value,tv_yigouxuanpanshu;
+    private CurrentPositionAdapter currentPositionAdapter;
+    private ArrayList<PositionInfo> positionInfos;
 
     @Override
     protected int getLayout() {
@@ -113,6 +122,17 @@ public class SmartShelvestFragment extends BaseFragment {
         rv_data = mActivity.findViewById(R.id.rv_data);
         cb_quanxuan = mActivity.findViewById(R.id.cb_quanxuan);
         rl_quanxuan = mActivity.findViewById(R.id.rl_quanxuan);
+
+        ll_store_info = mActivity.findViewById(R.id.ll_store_info);
+        tv_rukudan_value = mActivity.findViewById(R.id.tv_rukudan_value);
+        ll_weishangjia = mActivity.findViewById(R.id.ll_weishangjia);
+        tv_yishangjiawuliao_value = mActivity.findViewById(R.id.tv_yishangjiawuliao_value);
+        tv_weishangjiawuliao_value = mActivity.findViewById(R.id.tv_weishangjiawuliao_value);
+        tv_yigouxuanpanshu = mActivity.findViewById(R.id.tv_yigouxuanpanshu);
+
+        rl_muqiancangwei = mActivity.findViewById(R.id.rl_muqiancangwei);
+        rv_muqiancangwei = mActivity.findViewById(R.id.rv_muqiancangwei);
+
         mBarcodeEditText.requestFocus();
         jsonObject = new org.json.JSONObject();
     }
@@ -194,28 +214,43 @@ public class SmartShelvestFragment extends BaseFragment {
         cb_quanxuan.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (buttonView.isPressed()) {   //只有当用户主动点击时才处理选中状态变化
-                    if (isChecked) {
-                        if (mFeededList.size() > 0) {
-                            barIds = "";
-                            for (int i = 0; i < mFeededList.size(); i++) {
-                                mFeededList.get(i).setCheck(true);
-                                barIds += mFeededList.get(i).getBAR_ID() + "," ;
+                try {
+                    if (buttonView.isPressed()) {   //只有当用户主动点击时才处理选中状态变化
+                        if (isChecked) {
+                            if (mFeededList.size() > 0) {
+                                barIds = "";
+                                barNmber = 0;
+                                for (int i = 0; i < mFeededList.size(); i++) {
+                                    mFeededList.get(i).setCheck(true);
+                                    barIds += mFeededList.get(i).getBAR_ID() + "," ;
+                                }
+                                barNmber = mFeededList.size();
                             }
-                        }
-                    } else {
-                        if (mFeededList.size() > 0) {
-                            barIds = "";
-                            for (int i = 0; i < mFeededList.size(); i++) {
-                                mFeededList.get(i).setCheck(false);
+                        } else {
+                            if (mFeededList.size() > 0) {
+                                barIds = "";
+                                barNmber = 0;
+                                for (int i = 0; i < mFeededList.size(); i++) {
+                                    mFeededList.get(i).setCheck(false);
+                                }
                             }
                         }
+                        tv_yigouxuanpanshu.setText(String.valueOf(barNmber));
+                        setAdapter(mFeededList);
+                        myAdapter.notifyDataSetChanged();
                     }
-                    setAdapter(mFeededList);
-                    myAdapter.notifyDataSetChanged();
+                }catch (Exception e) {
+                    e.printStackTrace();
                 }
             }
         });
+
+        ll_weishangjia.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                queryPID(INID);
+            }
+        });
     }
 
     private void initPopupWindow() {
@@ -223,7 +258,7 @@ public class SmartShelvestFragment extends BaseFragment {
 
         Button doneButton = (Button) view.findViewById(R.id.pop_storage_recharge_menu_1);
         Button todoButton = (Button) view.findViewById(R.id.pop_storage_recharge_menu_2);
-        Button bt_unshelved_materials = (Button) view.findViewById(R.id.bt_unshelved_materials);
+
         doneButton.setText("仓位物料查询");
         todoButton.setVisibility(View.GONE);
         mFragment = new PositionInquiryFragment();
@@ -239,13 +274,6 @@ public class SmartShelvestFragment extends BaseFragment {
             }
         });
 
-        bt_unshelved_materials.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                queryPID(INNO);
-            }
-        });
-
         mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
         mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());
         mMenuPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
@@ -289,6 +317,7 @@ public class SmartShelvestFragment extends BaseFragment {
                             Fragment mFragment = new UnshelvedMaterialsFra();
                             Bundle bundle = new Bundle();
                             bundle.putString(Constants.FLAG.FLAG_INNO, INNO);
+                            bundle.putString(Constants.FLAG.FLAG_INID, INID);
                             bundle.putString(Constants.FLAG.FLAG_UNUPCOUNT, UNUPCOUNT);
                             bundle.putSerializable(Constants.FLAG.FLAG_UNUPCOUNT_VALUE,(Serializable)list);
                             mFragment.setArguments(bundle);
@@ -308,6 +337,7 @@ public class SmartShelvestFragment extends BaseFragment {
                 mResultTextView.setVisibility(View.VISIBLE);
                 tv_newtext1.setVisibility(View.GONE);
                 tv_newtext2.setVisibility(View.GONE);
+                rl_muqiancangwei.setVisibility(View.GONE);
                 mResultTextView.setText(failStr);
             }
         });
@@ -323,6 +353,15 @@ public class SmartShelvestFragment extends BaseFragment {
 
     @Override
     protected void initDatas() {
+        positionInfos = new ArrayList<>();
+        currentPositionAdapter = new CurrentPositionAdapter(positionInfos);
+        rv_muqiancangwei.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
+        rv_muqiancangwei.setLayoutManager(new LinearLayoutManager(mActivity));
+        //设置Item增加、移除动画
+        rv_muqiancangwei.setItemAnimator(new DefaultItemAnimator());
+        setCurrentPosition(positionInfos);
+        rv_muqiancangwei.setAdapter(currentPositionAdapter);
+
         mFeededList = new ArrayList<>();
         myAdapter = new SelectAdapter(mFeededList);
         rv_data.addItemDecoration(new DividerItemDecoration(mActivity, LinearLayout.VERTICAL));
@@ -368,16 +407,49 @@ public class SmartShelvestFragment extends BaseFragment {
                     String LOCATIONS = dataObject.getString("LOCATIONS") == null ? "" : dataObject.getString("LOCATIONS");
                     mResultTextView.setTextColor(getResources().getColor(R.color.blue));
                     mResultTextView.setVisibility(View.VISIBLE);
-                    tv_newtext1.setVisibility(View.VISIBLE);
+                    // tv_newtext1.setVisibility(View.VISIBLE);
                     tv_newtext2.setVisibility(View.VISIBLE);
-                    mResultTextView.setText(TYPE + ":" + mBarcodeEditText.getText().toString().trim()
-                            + "\n编号:" + BAR_PRODCODE + " 数量:" + BAR_REMAIN
-                            + "\n物料:" + PR_DETAIL
-                            + "\n规格:" + PR_SPEC
-                            + "\n默认仓位:" + PR_LOCATION);
-                    tv_newtext1.setText("目前仓位:" + BAR_LOCATION
-                            + "\n已存放仓位:" + LOCATIONS);
-                    tv_newtext2.setText("建议仓位:" + LOCATION);
+                    mResultTextView.setText(TYPE + ": " + mBarcodeEditText.getText().toString().trim()
+                            + "\n料号: " + BAR_PRODCODE + "     数量: " + BAR_REMAIN
+                            + "\n物料: " + PR_DETAIL
+                            + "\n规格: " + PR_SPEC
+                            + "\n默认仓位: " + PR_LOCATION + "     目前仓位: " + BAR_LOCATION);
+                    tv_newtext2.setText("建议仓位: " + LOCATION);
+                    //tv_newtext1.setText("\n目前仓位:" + BAR_LOCATION);
+                    //tv_newtext1.setText("已存放仓位:" + LOCATIONS);
+
+                    //物料信息
+                    JSONObject noprodlist = dataObject.getJSONObject("NOPRODLIST");
+                    if (noprodlist != null) {
+                        ll_store_info.setVisibility(View.VISIBLE);
+                        INNO = noprodlist.getString("INNO");  //入库单
+                        INID = noprodlist.getString("INID");  //入库单ID
+                        UNUPCOUNT = noprodlist.getString("UNUPCOUNT");  //未上架物料数
+                        tv_rukudan_value.setText(noprodlist.getString("INNO"));  //入库单
+                        tv_yishangjiawuliao_value.setText(noprodlist.getString("UPCOUNT"));
+                        tv_weishangjiawuliao_value.setText(noprodlist.getString("UNUPCOUNT"));
+                    }else {
+                        ll_store_info.setVisibility(View.GONE);
+                    }
+                    //目前已放仓位
+                    JSONArray loclistArr = dataObject.getJSONArray("LOCLIST");
+                    if (loclistArr != null && loclistArr.size() > 0) {
+                        rl_muqiancangwei.setVisibility(View.VISIBLE);
+                        positionInfos.clear();
+                        for (int i = 0; i < loclistArr.size(); i++) {
+                            JSONObject jsonObject = loclistArr.getJSONObject(i);
+                            PositionInfo positionInfo = new PositionInfo();
+                            positionInfo.setPL_CODE(FastjsonUtil.getText(jsonObject, "PL_CODE"));
+                            positionInfo.setV_CAPACITY(FastjsonUtil.getInt(jsonObject, "V_CAPACITY"));
+                            positionInfo.setPL_CAPACITY(FastjsonUtil.getInt(jsonObject, "PL_CAPACITY"));
+                            positionInfos.add(positionInfo);
+                        }
+                        setCurrentPosition(positionInfos);
+                        currentPositionAdapter.notifyDataSetChanged();
+                    }else {
+                        rl_muqiancangwei.setVisibility(View.GONE);
+                    }
+
                     if (!mLocationEditText.getText().toString().isEmpty() && !mBarcodeEditText.getText().toString().isEmpty()) {
                         saveBarAcceptCode("0");
                     } else {
@@ -385,9 +457,9 @@ public class SmartShelvestFragment extends BaseFragment {
                     }
                     JSONArray othersArr = dataObject.getJSONArray("OTHERS");
                     if (othersArr != null && othersArr.size() > 0) {
-
                         rl_quanxuan.setVisibility(View.VISIBLE);
                         cb_quanxuan.setChecked(false);
+                        tv_yigouxuanpanshu.setText("0");
                         mFeededList.clear();
                         barIds = "";
                         for (int i = 0; i < othersArr.size(); i++) {
@@ -412,13 +484,12 @@ public class SmartShelvestFragment extends BaseFragment {
                     CommonUtil.toastNoRepeat(mActivity, failStr);
                     mResultTextView.setTextColor(Color.RED);
                     mResultTextView.setVisibility(View.VISIBLE);
-                    tv_newtext1.setVisibility(View.GONE);
-                    tv_newtext2.setVisibility(View.GONE);
                     mResultTextView.setText(failStr);
                     mBarcodeEditText.requestFocus();
                     mBarcodeEditText.setText(null);
                     mLocationEditText.setText(null);
                     clearListData();
+                    clearViewInfo();
                 }
             });
         } catch (Exception e) {
@@ -426,6 +497,13 @@ public class SmartShelvestFragment extends BaseFragment {
         }
     }
 
+    private void clearViewInfo() {
+        tv_newtext1.setVisibility(View.GONE);
+        tv_newtext2.setVisibility(View.GONE);
+        ll_store_info.setVisibility(View.GONE);
+        rl_muqiancangwei.setVisibility(View.GONE);
+    }
+
     private void clearListData() {
         rl_quanxuan.setVisibility(View.GONE);
         mFeededList.clear();
@@ -464,8 +542,6 @@ public class SmartShelvestFragment extends BaseFragment {
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 mResultTextView.setVisibility(View.VISIBLE);
-                tv_newtext1.setVisibility(View.GONE);
-                tv_newtext2.setVisibility(View.GONE);
                 mResultTextView.setTextColor(getResources().getColor(R.color.blue));
 
                 JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(), "data");
@@ -492,6 +568,7 @@ public class SmartShelvestFragment extends BaseFragment {
                             .setNegativeButton("否", null).show();
                 }
                 clearListData();
+                clearViewInfo();
                 mBarcodeEditText.requestFocus();
             }
 
@@ -507,11 +584,10 @@ public class SmartShelvestFragment extends BaseFragment {
                     mBarcodeEditText.setText(null);
                 }
                 mResultTextView.setVisibility(View.VISIBLE);
-                tv_newtext1.setVisibility(View.GONE);
-                tv_newtext2.setVisibility(View.GONE);
                 mResultTextView.setTextColor(getResources().getColor(R.color.red));
                 mResultTextView.setText(failStr);
                 clearListData();
+                clearViewInfo();
             }
         });
 
@@ -527,14 +603,13 @@ public class SmartShelvestFragment extends BaseFragment {
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 mResultTextView.setVisibility(View.VISIBLE);
-                tv_newtext1.setVisibility(View.GONE);
-                tv_newtext2.setVisibility(View.GONE);
                 mResultTextView.setText(null);
                 mBarcodeEditText.setText(null);
                 mBarcodeEditText.requestFocus();
                 mResultTextView.setTextColor(getResources().getColor(R.color.blue));
                 mResultTextView.setText("结束上架操作成功");
                 clearListData();
+                clearViewInfo();
             }
 
             @Override
@@ -543,16 +618,14 @@ public class SmartShelvestFragment extends BaseFragment {
                 CommonUtil.toastNoRepeat(mActivity, failStr);
                 mResultTextView.setTextColor(getResources().getColor(R.color.red));
                 mResultTextView.setVisibility(View.VISIBLE);
-                tv_newtext1.setVisibility(View.GONE);
-                tv_newtext2.setVisibility(View.GONE);
                 mResultTextView.setText(failStr);
                 mBarcodeEditText.requestFocus();
                 mBarcodeEditText.setText(null);
                 mLocationEditText.setText(null);
                 clearListData();
+                clearViewInfo();
             }
         });
-
     }
 
     @Override
@@ -681,14 +754,17 @@ public class SmartShelvestFragment extends BaseFragment {
                         ((ListItemViewHolder) holder).cb_danxuan.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                             @Override
                             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                                if (buttonView.isPressed()) {   //只有当用户主动点击时才处理选中状态变化
+                                try {
+                                     if (buttonView.isPressed()) {   //只有当用户主动点击时才处理选中状态变化
                                     if (isChecked) {
                                         if (!TextUtils.isEmpty(barIds)) {
                                             if (!barIds.contains(mList.get(i).getBAR_ID())) {
                                                 barIds += mList.get(i).getBAR_ID() + ",";
+                                                barNmber++;
                                             }
                                         } else {
                                             barIds = mList.get(i).getBAR_ID() + ",";
+                                            barNmber ++;
                                         }
                                     } else {
                                         boolean checked = cb_quanxuan.isChecked();
@@ -701,15 +777,17 @@ public class SmartShelvestFragment extends BaseFragment {
                                                 int endIndex = startIndex + mList.get(i).getBAR_ID().length() + 1;
                                                 // 删除子串
                                                 barIds = barIds.substring(0, startIndex).concat(barIds.substring(endIndex));
-                                                LogUtil.e("aaa","checkBox.setOnCheckedChangeListener长度是:" +barIds);
+                                                barNmber--;
                                             }
                                         }
                                     }
+                                    tv_yigouxuanpanshu.setText(String.valueOf(barNmber));
+                                }
+                                }catch (Exception e) {
+                                    e.printStackTrace();
                                 }
                             }
                         });
-
-
         }
 
         @Override
@@ -738,4 +816,154 @@ public class SmartShelvestFragment extends BaseFragment {
         rv_data.setAdapter(myAdapter);
     }
 
+    //目前仓位
+    public class CurrentPositionAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+        private ArrayList<PositionInfo> mList = new ArrayList<>();
+        private SparseBooleanArray mSelectedPositions = new SparseBooleanArray();
+        private boolean mIsSelectable = false;
+
+        public CurrentPositionAdapter(ArrayList<PositionInfo> list) {
+            if (list == null) {
+                throw new IllegalArgumentException("model Data must not be null");
+            }
+            mList = list;
+        }
+
+        //更新adpter的数据和选择状态
+        public void updateDataSet(ArrayList<PositionInfo> list) {
+            this.mList = list;
+            mSelectedPositions = new SparseBooleanArray();
+            //            ab.setTitle("已选择" + 0 + "项");
+            notifyDataSetChanged();
+        }
+
+        //获得选中条目的结果
+        public ArrayList<PositionInfo> getSelectedItem() {
+            ArrayList<PositionInfo> selectList = new ArrayList<>();
+            for (int i = 0; i < mList.size(); i++) {
+                if (isItemChecked(i)) {
+                    selectList.add(mList.get(i));
+                }
+            }
+            return selectList;
+        }
+
+        @Override
+        public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
+            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_position_info, viewGroup, false);
+            return new ListItemViewHolder(itemView);
+        }
+
+        //设置给定位置条目的选择状态
+        private void setItemChecked(int position, boolean isChecked) {
+            mSelectedPositions.put(position, isChecked);
+        }
+
+        //根据位置判断条目是否选中
+        private boolean isItemChecked(int position) {
+            return mSelectedPositions.get(position);
+        }
+
+        //根据位置判断条目是否可选
+        private boolean isSelectable() {
+            return mIsSelectable;
+        }
+
+        //设置给定位置条目的可选与否的状态
+        private void setSelectable(boolean selectable) {
+            mIsSelectable = selectable;
+        }
+
+        //绑定界面，设置监听
+        @Override
+        public void onBindViewHolder(final RecyclerView.ViewHolder holder, @SuppressLint("RecyclerView") int i) {
+            if (i == 0) {
+                ((ListItemViewHolder) holder).tv_cangwei.setVisibility(View.VISIBLE);
+                ((ListItemViewHolder) holder).tv_rongliang.setVisibility(View.VISIBLE);
+                ((ListItemViewHolder) holder).tv_caozuo.setVisibility(View.VISIBLE);
+            }else {
+                ((ListItemViewHolder) holder).tv_cangwei.setVisibility(View.GONE);
+                ((ListItemViewHolder) holder).tv_rongliang.setVisibility(View.GONE);
+                ((ListItemViewHolder) holder).tv_caozuo.setVisibility(View.GONE);
+            }
+
+            ((ListItemViewHolder) holder).tv_cangwei_value.setText(mList.get(i).getPL_CODE());
+            int v_capacity = mList.get(i).getV_CAPACITY();
+            int pl_capacity = mList.get(i).getPL_CAPACITY();
+            ((ListItemViewHolder) holder).tv_rongliang_value.setText(v_capacity + "/" + pl_capacity);
+            if (v_capacity == pl_capacity) {
+                ((ListItemViewHolder) holder).tv_caozuo_value.setText("已满仓");
+                ((ListItemViewHolder) holder).tv_caozuo_value.setEnabled(false);
+                ((ListItemViewHolder) holder).tv_caozuo_value.setTextColor(getActivity().getResources().getColor(R.color.gray1));
+            }else {
+                ((ListItemViewHolder) holder).tv_caozuo_value.setText("确认满仓");
+                ((ListItemViewHolder) holder).tv_caozuo_value.setTextColor(getActivity().getResources().getColor(R.color.button_focus));
+                ((ListItemViewHolder) holder).tv_caozuo_value.setEnabled(true);
+            }
+
+            ((ListItemViewHolder) holder).tv_caozuo_value.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    progressDialog.show();
+                    try {
+                        VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                                .url(GloableParams.ADDRESS_UPDATE_FULL_STATUS)
+                                .method(Request.Method.POST)
+                                .addParam("location", mList.get(i).getPL_CODE())
+                                .addParam("qty", String.valueOf(v_capacity))
+                                .build(), new HttpCallback() {
+                            @Override
+                            public void onSuccess(int flag, Object o) throws Exception {
+                                progressDialog.dismiss();
+                                boolean success = FastjsonUtil.getBoolean(o.toString(), "success");
+                                JSONObject dataObject = FastjsonUtil.getJSONObject(o.toString(), "data");
+                                if (success) {
+                                    mList.get(i).setPL_CAPACITY(mList.get(i).getV_CAPACITY());
+                                    notifyDataSetChanged();
+                                }
+                            }
+
+                            @Override
+                            public void onFail(int flag, String failStr) throws Exception {
+                                progressDialog.dismiss();
+                                CommonUtil.toastNoRepeat(mActivity, failStr);
+                            }
+                        });
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            return mList == null ? 0 : mList.size();
+        }
+
+        public class ListItemViewHolder extends RecyclerView.ViewHolder {
+            TextView tv_cangwei;
+            TextView tv_cangwei_value;
+            TextView tv_rongliang;
+            TextView tv_rongliang_value;
+            TextView tv_caozuo;
+            TextView tv_caozuo_value;
+
+            ListItemViewHolder(View view) {
+                super(view);
+                this.tv_cangwei = (TextView) view.findViewById(R.id.tv_cangwei);
+                this.tv_cangwei_value = (TextView) view.findViewById(R.id.tv_cangwei_value);
+                this.tv_rongliang = (TextView) view.findViewById(R.id.tv_rongliang);
+                this.tv_rongliang_value = (TextView) view.findViewById(R.id.tv_rongliang_value);
+                this.tv_caozuo = (TextView) view.findViewById(R.id.tv_caozuo);
+                this.tv_caozuo_value = (TextView) view.findViewById(R.id.tv_caozuo_value);
+            }
+        }
+    }
+
+    private void setCurrentPosition(ArrayList<PositionInfo> mList) {
+        currentPositionAdapter = new CurrentPositionAdapter(mList);
+        rv_muqiancangwei.setAdapter(currentPositionAdapter);
+    }
 }

app/src/main/java/com/uas/uas_mes_stw/fragment/UnshelvedMaterialsFra.java

@@ -28,7 +28,7 @@ class UnshelvedMaterialsFra extends BaseFragment{
 
     private TextView tv_rukudan_value,tv_weishangjia_value;
     private RecyclerView rv_data;
-    private String inno,unupcount;
+    private String inno,inid,unupcount;
     private UnshelvedMaterialsAdapter myAdapter;
     private List<UnshelvedMaterialsBean> mFeededList;
 
@@ -40,7 +40,6 @@ class UnshelvedMaterialsFra extends BaseFragment{
     @Override
     protected void initViews() {
         ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.Unshelved_materials));
-
         tv_rukudan_value = root.findViewById(R.id.tv_rukudan_value);
         tv_weishangjia_value = root.findViewById(R.id.tv_weishangjia_value);
         rv_data = root.findViewById(R.id.rv_data);
@@ -56,6 +55,7 @@ class UnshelvedMaterialsFra extends BaseFragment{
         Bundle bundle = getArguments();
         if (bundle != null) {
             inno = bundle.getString(Constants.FLAG.FLAG_INNO);
+            inid = bundle.getString(Constants.FLAG.FLAG_INID);
             unupcount = bundle.getString(Constants.FLAG.FLAG_UNUPCOUNT);
             mFeededList = (List<UnshelvedMaterialsBean>) getArguments().getSerializable(Constants.FLAG.FLAG_UNUPCOUNT_VALUE);
             // 使用list数据
@@ -101,7 +101,7 @@ class UnshelvedMaterialsFra extends BaseFragment{
         @NonNull
         @Override
         public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_rv_zhinengshangjia, viewGroup, false);
+            View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_unshelved_materrials, viewGroup, false);
             return new ListItemViewHolder(itemView);
         }
 

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

@@ -321,6 +321,7 @@ public class GloableParams {
 
 
 
+
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
     //登录页面请求地址
@@ -358,7 +359,6 @@ public class GloableParams {
     //仓位列表
     private static final String ADDRESSTAIL_UPDATE_FULL_STATUS = "/api/pda/transfer/updateFullStatus.action";
 
-
     /**
      * 条码信息采集
      */
@@ -1399,8 +1399,6 @@ public class GloableParams {
         GloableParams.ADDRESS_GET_UN_UP_PRODBYINNO = uriHead + GloableParams.ADDRESSTAIL_GET_UN_UP_PRODBYINNO;
         GloableParams.ADDRESS_UPDATE_FULL_STATUS = uriHead + GloableParams.ADDRESSTAIL_UPDATE_FULL_STATUS;
 
-
-
     }
 
 }

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

@@ -215,7 +215,9 @@ public interface Constants {
         String FLAG_IQC_IN_CALLER = "flag_iqc_in_caller";
         String FLAG_IQC_IN_SLIPABLE = "flag_iqc_in_slipable";
 
-        String FLAG_INNO = "flag_inno";     //出库单
+
+        String FLAG_INNO = "flag_inno";     //入库单
+        String FLAG_INID = "flag_inid";     //入库单ID
         String FLAG_UNUPCOUNT = "flag_unupcount";   //未上架物料
         String FLAG_UNUPCOUNT_VALUE = "flag_unupcount_value";   //未上架物料的json值
 

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

@@ -16,7 +16,7 @@
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1.5"
+            android:layout_weight="2.0"
             android:gravity="start"
             android:text="入库单："
             android:textSize="14sp"/>
@@ -25,7 +25,7 @@
             android:id="@+id/tv_rukudan_value"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="3.5"
+            android:layout_weight="3.0"
             android:gravity="start"
             android:singleLine="true"
             android:textSize="14sp"/>
@@ -49,8 +49,6 @@
 
     <android.support.v7.widget.RecyclerView
         android:layout_marginTop="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
         android:id="@+id/rv_data"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -1,208 +1,318 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ndroid="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:ndroid="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:padding="@dimen/root_layout_padding">
 
     <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        >
-
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <RadioGroup
-                android:id="@+id/rg_change"
-                android:layout_marginTop="@dimen/dp_10"
-                android:orientation="horizontal"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:gravity="center">
-                <RadioButton
-                    android:id="@+id/rb_zhuanchu"
-                    android:text="单盘"
-                    android:layout_gravity="center"
-                    android:layout_width="wrap_content"
+                android:orientation="vertical">
+
+                <RadioGroup
+                    android:id="@+id/rg_change"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginRight="50dp">
-                </RadioButton>
-                <RadioButton
-                    android:id="@+id/rb_chexiao"
-                    android:text="非单盘"
-                    android:checked="true"
                     android:layout_gravity="center"
-                    android:layout_width="wrap_content"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/rb_zhuanchu"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="50dp"
+                        android:text="单盘"></RadioButton>
+
+                    <RadioButton
+                        android:id="@+id/rb_chexiao"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="50dp"
+                        android:checked="true"
+                        android:text="非单盘"></RadioButton>
+                </RadioGroup>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="50dp">
-                </RadioButton>
-            </RadioGroup>
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="110dp"
+                        android:layout_height="match_parent"
+                        android:background="@color/gray_light"
+                        android:gravity="center"
+                        android:padding="6dp"
+                        android:text="条码"
+                        android:textColor="@color/body_text_1"
+                        android:textSize="16sp" />
+
+                    <com.uas.uas_mes_stw.view.ClearableEditText
+                        android:id="@+id/barcode_info_collect_barcode_et"
+                        style="@style/EditTextStyle"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:hint="@string/please_collect_barcode"
+                        android:imeOptions="actionSend"
+                        android:textColor="@color/black" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/material_in_collect_location_tv"
+                        android:layout_width="110dp"
+                        android:layout_height="match_parent"
+                        android:background="@color/gray_light"
+                        android:gravity="center"
+                        android:padding="10dp"
+                        android:text="仓位"
+                        android:textColor="@color/body_text_1"
+                        android:textSize="16sp" />
+
+                    <com.uas.uas_mes_stw.view.ClearableEditText
+                        android:id="@+id/material_in_collect_location_et"
+                        style="@style/EditTextStyle"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:hint="请输入仓位"
+                        android:lines="1"
+                        android:maxLines="1"
+                        android:singleLine="true"
+                        android:textColor="@color/black" />
+                </LinearLayout>
+            </LinearLayout>
 
             <LinearLayout
-                android:layout_marginTop="@dimen/dp_10"
-                android:orientation="horizontal"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:layout_width="110dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/gray_light"
-                    android:gravity="center"
-                    android:padding="6dp"
-                    android:text="条码"
-                    android:textColor="@color/body_text_1"
-                    android:textSize="16sp" />
-                <com.uas.uas_mes_stw.view.ClearableEditText
-                    android:id="@+id/barcode_info_collect_barcode_et"
-                    style="@style/EditTextStyle"
-                    android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/barcode_info_collect_confirm_btn"
+                    style="@style/ButtonStyle"
+                    android:layout_marginTop="16dp"
+                    android:layout_weight="1"
+                    android:text="上架" />
+
+                <Button
+                    android:id="@+id/btn_kill"
+                    style="@style/ButtonStyle"
+                    android:layout_marginTop="16dp"
                     android:layout_weight="1"
-                    android:hint="@string/please_collect_barcode"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:imeOptions="actionSend"
-                    android:textColor="@color/black" />
+                    android:text="结束上架" />
+
             </LinearLayout>
+
             <LinearLayout
-                android:layout_marginTop="5dp"
-                android:orientation="horizontal"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacing_big"
+                android:background="@drawable/shape_msg_block"
+                android:orientation="vertical"
+                android:padding="10dp">
+
                 <TextView
-                    android:id="@+id/material_in_collect_location_tv"
-                    android:layout_width="110dp"
-                    android:layout_height="match_parent"
-                    android:background="@color/gray_light"
-                    android:gravity="center"
-                    android:padding="10dp"
-                    android:text="仓位"
-                    android:textColor="@color/body_text_1"
-                    android:textSize="16sp"  />
-
-                <com.uas.uas_mes_stw.view.ClearableEditText
-                    android:id="@+id/material_in_collect_location_et"
-                    style="@style/EditTextStyle"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:hint="请输入仓位"
-                    android:lines="1"
-                    android:maxLines="1"
-                    android:textColor="@color/black"
-                    android:singleLine="true"/>
-            </LinearLayout>
-        </LinearLayout>
+                    android:id="@+id/barcode_info_collect_result_tv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"
+                    tools:text="采集成功，条码：786528238；数量：2；料号：1209837；名称规格：瓶子"
+                    tools:visibility="visible" />
 
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <Button
-                android:id="@+id/barcode_info_collect_confirm_btn"
-                style="@style/ButtonStyle"
-                android:layout_marginTop="16dp"
-                android:text="上架"
-                android:layout_weight="1"/>
-            <Button
-                android:id="@+id/btn_kill"
-                style="@style/ButtonStyle"
-                android:layout_marginTop="16dp"
-                android:text="结束上架"
-                android:layout_weight="1"/>
+                <TextView
+                    android:id="@+id/tv_newtext2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/green"
+                    android:visibility="gone"
+                    tools:text="采集成功，条码：786528238；数量：2；料号：1209837；名称规格：瓶子"
+                    tools:visibility="visible" />
 
-        </LinearLayout>
+                <TextView
+                    android:id="@+id/tv_newtext1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/green"
+                    android:visibility="gone"
+                    tools:text="采集成功，条码：786528238；数量：2；料号：1209837；名称规格：瓶子"
+                    tools:visibility="visible" />
 
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/spacing_big"
-            android:background="@drawable/shape_msg_block"
-            android:padding="10dp">
-            <TextView
-                android:id="@+id/barcode_info_collect_result_tv"
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_store_info"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:background="@drawable/shape_msg_block"
+                android:orientation="vertical"
+                android:padding="10dp"
                 android:visibility="gone"
-                tools:visibility="visible"
-                tools:text="采集成功，条码：786528238；数量：2；料号：1209837；名称规格：瓶子" />
+                tools:visibility="visible">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="入库单: " />
+
+                    <TextView
+                        android:id="@+id/tv_rukudan_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="已上架物料: " />
 
-            <TextView
-                android:id="@+id/tv_newtext1"
+                    <TextView
+                        android:id="@+id/tv_yishangjiawuliao_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="" />
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_weishangjia"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="未上架物料: "
+                        android:textColor="@color/blue" />
+
+                    <TextView
+                        android:id="@+id/tv_weishangjiawuliao_value"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text=""
+                        android:textColor="@color/blue" />
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <RelativeLayout
+                android:id="@+id/rl_muqiancangwei"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
                 android:visibility="gone"
-                tools:visibility="visible"
-                android:textColor="@color/green"
-                tools:text="采集成功，条码：786528238；数量：2；料号：1209837；名称规格：瓶子" />
-            <TextView
-                android:id="@+id/tv_newtext2"
+                tools:visibility="visible">
+
+                <TextView
+                    android:id="@+id/tv_muqiancangwei"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="目前仓位: " />
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/rv_muqiancangwei"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@+id/tv_muqiancangwei"
+                    android:layout_marginTop="3dp" />
+
+            </RelativeLayout>
+
+
+            <RelativeLayout
+                android:id="@+id/rl_quanxuan"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
                 android:visibility="gone"
-                tools:visibility="visible"
-                android:textColor="@color/blue"
-                tools:text="采集成功，条码：786528238；数量：2；料号：1209837；名称规格：瓶子" />
-        </LinearLayout>
+                tools:visibility="visible">
 
-        <RelativeLayout
-            android:visibility="gone"
-            android:id="@+id/rl_quanxuan"
-            android:layout_marginTop="10dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            >
+                <TextView
+                    android:id="@+id/tv_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="可同时上架条码"
+                    android:textColor="@color/red"
+                    android:textStyle="bold" />
 
-            <CheckBox
-                android:id="@+id/cb_quanxuan"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="全选"
-                />
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="30dp"
+                    android:gravity="center_vertical"
+                    android:layout_below="@+id/tv_title"
+                    android:orientation="horizontal">
 
-       <!--     <TextView
-                android:id="@+id/tv_tiaoma"
-                android:layout_toEndOf="@+id/cb_quanxuan"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:text="条码号"
-                />
+                    <CheckBox
+                        android:id="@+id/cb_quanxuan"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="全选" />
 
-            <TextView
-                android:layout_toEndOf="@+id/tv_tiaoma"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:text="数量"
-                />-->
+                    <TextView
+                        android:layout_marginStart="40dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="已勾选条数: " />
 
-        </RelativeLayout>
+                    <TextView
+                        android:id="@+id/tv_yigouxuanpanshu"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="" />
 
+                </LinearLayout>
 
-        <android.support.v7.widget.RecyclerView
-            android:layout_marginTop="10dp"
-            android:id="@+id/rv_data"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            />
+            </RelativeLayout>
 
-    </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_data"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp" />
 
+        </LinearLayout>
 
+    </android.support.v4.widget.NestedScrollView>
 
 
 </LinearLayout>

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

@@ -0,0 +1,79 @@
+<?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="wrap_content"
+    android:orientation="horizontal">
+
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_weight="0.4"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        >
+
+        <TextView
+            android:id="@+id/tv_cangwei"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="仓位"
+            />
+
+        <TextView
+            android:id="@+id/tv_cangwei_value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_weight="0.3"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        >
+
+        <TextView
+            android:id="@+id/tv_rongliang"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="已放/容量"
+            />
+
+        <TextView
+            android:id="@+id/tv_rongliang_value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_weight="0.3"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        >
+
+        <TextView
+            android:id="@+id/tv_caozuo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="操作"
+            />
+
+        <TextView
+            android:id="@+id/tv_caozuo_value"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            />
+
+    </LinearLayout>
+
+
+</LinearLayout>

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

@@ -11,19 +11,23 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:padding="3dp">
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="14sp"
-            tools:text="料号: " />
+            android:text="料号: "
+            />
 
         <TextView
             android:id="@+id/tv_liaohao_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="14sp"
+            android:singleLine="true"
+            android:ellipsize="end"
             />
 
     </LinearLayout>
@@ -31,7 +35,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="5dp"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
         android:gravity="center_vertical"
@@ -52,12 +56,13 @@
             android:layout_weight="3.5"
             android:gravity="start"
             android:singleLine="true"
+            android:ellipsize="end"
             android:textSize="14sp"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="2.5"
+            android:layout_weight="1.5"
             android:gravity="start"
             android:text="规格:"
             android:textSize="14sp"/>
@@ -66,15 +71,17 @@
             android:id="@+id/tv_spe_value"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="2.5"
+            android:layout_weight="3.5"
             android:gravity="start"
+            android:singleLine="true"
+            android:ellipsize="end"
             android:textSize="14sp"/>
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="15dp"
+        android:layout_marginTop="5dp"
         android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
         android:gravity="center_vertical"
@@ -86,6 +93,7 @@
             android:layout_weight="1.5"
             android:gravity="start"
             android:text="数量："
+            android:textColor="@color/blue"
             android:textSize="14sp"/>
 
         <TextView
@@ -94,24 +102,32 @@
             android:layout_height="wrap_content"
             android:layout_weight="3.5"
             android:gravity="start"
+            android:textColor="@color/blue"
             android:singleLine="true"
+            android:ellipsize="end"
             android:textSize="14sp"/>
 
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="2.5"
+            android:layout_weight="1.5"
             android:gravity="start"
             android:text="盘数:"
+            android:textColor="@color/blue"
             android:textSize="14sp"/>
 
         <TextView
             android:id="@+id/tv_panshu_value"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="2.5"
+            android:layout_weight="3.5"
             android:gravity="start"
-            android:textSize="14sp"/>
+            android:textColor="@color/blue"
+            android:textSize="14sp"
+            android:singleLine="true"
+            android:ellipsize="end"
+            />
+
     </LinearLayout>
 
 </LinearLayout>

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

@@ -27,16 +27,5 @@
         android:text="未转收料"
         android:textSize="@dimen/app_text_size_body_2" />
 
-    <Button
-        android:visibility="gone"
-        android:id="@+id/bt_unshelved_materials"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:background="@color/transparent"
-        android:text="未上架物料"
-        android:textSize="@dimen/app_text_size_body_2" />
-
 
 </LinearLayout>

build.gradle

@@ -54,8 +54,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 34,
-            versionName      : "v1.2.6"
+            versionCode      : 38,
+            versionName      : "v1.3.0"
     ]
 
     depsVersion = [