出库采集增加物料查询功能, 物料库存核查增加库存数，物料库存核查与储位转移增加项目显示,项目入库增加项目的显示,储位转移页增加库存条码打印功能.收料页面增加总数统计, 增加库存条码打印功能, 修复盘点作业错误,修改条码数量修改页, 出库采集页, 物料库存核查页,货物核查页面修改,极测WMS条码入库页修改,极测WMS修改收料页条码展示内容

app/src/main/java/com/uas/jc_wms/adapter/StorageRechargeAdapter.java

@@ -103,6 +103,24 @@ public class StorageRechargeAdapter extends BaseAdapter {
                 });
             }
         });
+        holder.tv_delete.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final AlertDialog alertDialog = new AlertDialog.Builder(context).setTitle("是否确定删除")
+                        .setNegativeButton(R.string.cancel, null)
+                        .setPositiveButton(R.string.confirm, null).create();
+                alertDialog.show();
+                alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        if (onDeleteItem != null) {
+                            onDeleteItem.onDelete(alertDialog, position);
+                        }
+                    }
+                });
+
+            }
+        });
     }
 
     protected class ViewHolder {
@@ -114,6 +132,7 @@ public class StorageRechargeAdapter extends BaseAdapter {
         private TextView quantityModifyTv;
         private TextView tv_material_urgent;
         private TextView tv_is_the_material_urgent;
+        private TextView tv_delete;
         private LinearLayout ll_is_the_material_urgent;
 
         public ViewHolder(View view) {
@@ -125,6 +144,7 @@ public class StorageRechargeAdapter extends BaseAdapter {
             quantityModifyTv = (TextView) view.findViewById(R.id.list_storage_recharge_quantity_modify_tv);
             tv_material_urgent = (TextView) view.findViewById(R.id.tv_material_urgent);
             tv_is_the_material_urgent = (TextView) view.findViewById(R.id.tv_is_the_material_urgent);
+            tv_delete = (TextView) view.findViewById(R.id.tv_delete);
             ll_is_the_material_urgent = (LinearLayout) view.findViewById(R.id.ll_is_the_material_urgent);
         }
     }
@@ -132,4 +152,14 @@ public class StorageRechargeAdapter extends BaseAdapter {
     public interface OnQuantityModifyListener {
         void onQuantityModify(DialogInterface dialogInterface, String text, int position);
     }
+
+    private OnDeleteItem onDeleteItem;
+
+    public interface OnDeleteItem{
+        void onDelete(DialogInterface dialogInterface,int position);
+    }
+
+    public void setOnDeleteItemListener(OnDeleteItem onDeleteItem) {
+        this.onDeleteItem = onDeleteItem;
+    }
 }

app/src/main/java/com/uas/jc_wms/adapter/TransferLocationAdapter.java

@@ -57,6 +57,8 @@ public class TransferLocationAdapter extends BaseAdapter {
         TableRow trCustprodcode = view.findViewById(R.id.transfer_custprodcode_tr);
         TextView tvCustprodcode = (TextView) view.findViewById(R.id.transfer_custprodcode);
 
+        TextView tv_project = (TextView) view.findViewById(R.id.tv_project);
+
         //配置数据
         WHTransfer tmpTransfer = (WHTransfer) getItem(position);
         //获取箱号
@@ -78,6 +80,7 @@ public class TransferLocationAdapter extends BaseAdapter {
         tvBarRemain.setText(CommonUtil.doubleFormat(tmpTransfer.getBAR_REMAIN()));
 
         tvOrispeccode.setText(tmpTransfer.getPR_ORISPECCODE());
+        tv_project.setText(tmpTransfer.getMA_PROJECT());
 
         if (CommonUtil.isAJCMaster(context)) {
             trCustprodcode.setVisibility(View.VISIBLE);

app/src/main/java/com/uas/jc_wms/bean/MaintainitemBean.java

@@ -7,9 +7,18 @@ public class MaintainitemBean {
     private String BAN_BARCODE;
     private String PR_DETAIL;
     private String PR_SPEC;
+    private String MA_PROJECT;
     private int BAN_QTY;
     private boolean isChecked;
 
+    public String getMA_PROJECT() {
+        return MA_PROJECT;
+    }
+
+    public void setMA_PROJECT(String MA_PROJECT) {
+        this.MA_PROJECT = MA_PROJECT;
+    }
+
     public String getBAN_PRODCODE() {
         return BAN_PRODCODE;
     }

app/src/main/java/com/uas/jc_wms/bean/WHMakeMaterialProductNew.java

@@ -12,8 +12,43 @@ public class WHMakeMaterialProductNew {
     private String BAR_WHCODE;
     private String REMAIN;
     private String MADEDATE;
-
+    private String MA_PROJECT;
     private String PR_CODE;
+    private String STOCKQTY;
+    private String WAYQTY;
+    private String CHECKQTY;
+
+    public String getSTOCKQTY() {
+        return STOCKQTY;
+    }
+
+    public void setSTOCKQTY(String STOCKQTY) {
+        this.STOCKQTY = STOCKQTY;
+    }
+
+    public String getWAYQTY() {
+        return WAYQTY;
+    }
+
+    public void setWAYQTY(String WAYQTY) {
+        this.WAYQTY = WAYQTY;
+    }
+
+    public String getCHECKQTY() {
+        return CHECKQTY;
+    }
+
+    public void setCHECKQTY(String CHECKQTY) {
+        this.CHECKQTY = CHECKQTY;
+    }
+
+    public String getMA_PROJECT() {
+        return MA_PROJECT;
+    }
+
+    public void setMA_PROJECT(String MA_PROJECT) {
+        this.MA_PROJECT = MA_PROJECT;
+    }
 
     public String getPR_CODE() {
         return PR_CODE;

app/src/main/java/com/uas/jc_wms/bean/WHTransfer.java

@@ -26,6 +26,16 @@ public class WHTransfer {
     String PR_ORISPECCODE;
     @JSONField(name = "PC_CUSTPRODCODE")
     String PC_CUSTPRODCODE;
+    @JSONField(name = "MA_PROJECT")
+    String MA_PROJECT;
+
+    public String getMA_PROJECT() {
+        return MA_PROJECT;
+    }
+
+    public void setMA_PROJECT(String MA_PROJECT) {
+        this.MA_PROJECT = MA_PROJECT;
+    }
 
     public double getBAR_REMAIN() {
         return BAR_REMAIN;

app/src/main/java/com/uas/jc_wms/fragment/BarcodeInCollectFragment.java

@@ -254,6 +254,7 @@ public class BarcodeInCollectFragment extends BaseFragment {
             bean.setPR_SPEC(data.getString("PR_SPEC"));
             bean.setBAN_QTY(data.getInteger("BAN_QTY"));
             bean.setBAN_PRODCODE(data.getString("BAN_PRODCODE"));
+            bean.setMA_PROJECT(data.getString("MA_PROJECT"));
             bean.setChecked(false);
             mFeededList.add(bean);
         }
@@ -470,7 +471,6 @@ public class BarcodeInCollectFragment extends BaseFragment {
             return selectList;
         }
 
-
         @Override
         public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
             View itemView = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.recyclerview_item2, viewGroup, false);
@@ -506,6 +506,7 @@ public class BarcodeInCollectFragment extends BaseFragment {
             ((ListItemViewHolder) holder).tv_liaotetall.setText("物料名称：" + mList.get(i).getPR_DETAIL());
             ((ListItemViewHolder) holder).tv_liaospec.setText("物料规格：" + mList.get(i).getPR_SPEC());
             ((ListItemViewHolder) holder).tv_liaospec3.setText("数量：" + mList.get(i).getBAN_QTY());
+            ((ListItemViewHolder) holder).tv_liaospec3.setText("项目：" + mList.get(i).getMA_PROJECT());
 
             ((ListItemViewHolder) holder).checkBox.setChecked(mList.get(i).isChecked());
 

app/src/main/java/com/uas/jc_wms/fragment/IOCOutMakeMaterialOperNew.java

@@ -436,6 +436,7 @@ public class IOCOutMakeMaterialOperNew extends BaseFragment implements View.OnCl
     private PopupWindow editPW;
     private ClearableEditText edit_et;
     private String sc_name, sc_code;
+    private Button bt_material_inquiry;
 
     @Override
     protected int getLayout() {
@@ -479,6 +480,7 @@ public class IOCOutMakeMaterialOperNew extends BaseFragment implements View.OnCl
         mCollectResultTextView = mActivity.findViewById(R.id.iocout_collect_result);
         btn_oneprint = root.findViewById(R.id.btn_oneprint);
         bt_inventory_barcode_printing = root.findViewById(R.id.bt_inventory_barcode_printing);
+        bt_material_inquiry = root.findViewById(R.id.bt_material_inquiry);
 
         mDbManager = new DBManager(getActivity().getApplicationContext());
         mOkHttpClient = new OkHttpClient.Builder()
@@ -607,6 +609,13 @@ public class IOCOutMakeMaterialOperNew extends BaseFragment implements View.OnCl
                 getWhcode();
             }
         });
+
+        bt_material_inquiry.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FragmentUtils.switchFragment(IOCOutMakeMaterialOperNew.this,new NewWHCheckMakeMaterialFragment());
+            }
+        });
     }
 
     /**

app/src/main/java/com/uas/jc_wms/fragment/InventoryCollectFragment.java

@@ -738,10 +738,12 @@ public class InventoryCollectFragment extends BaseFragment implements View.OnCli
         View view = View.inflate(getActivity(), R.layout.pop_inventory_collect_menu, null);
         Button detailBtn = (Button) view.findViewById(R.id.pop_inventory_collect_menu_1);
         Button summaryBtn = (Button) view.findViewById(R.id.pop_inventory_collect_menu_2);
+        Button pop_material_out_menu_6 = (Button) view.findViewById(R.id.pop_material_out_menu_6);
 
         detailBtn.setOnClickListener(this);
         summaryBtn.setOnClickListener(this);
         detailBtn.setVisibility(View.GONE);
+        pop_material_out_menu_6.setVisibility(View.GONE);
 
         mMenuPopupWindow = new PopupWindow(view, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
         mMenuPopupWindow.setBackgroundDrawable(new BitmapDrawable());

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

@@ -63,9 +63,10 @@ public class NewWHCheckMakeMaterialFragment extends BaseFragment implements View
     private int mFocusId;
 
     private SmartTable mSmartTable;
-    private Column<String> mPR_CODE,mBAR_WHCODE,mBAR_LOCATION,mREMAIN,mMADEDATE,mPR_SPEC;
+    private Column<String> mPR_CODE,mBAR_WHCODE,mBAR_LOCATION,mREMAIN,mMADEDATE,mPR_SPEC,mMA_PROJECT;
 //    private Column<Double> mMADEDATE;
     private TableData mTableData;
+    private TextView tv_project,tv_kucunshu,tv_zaitu_number,tv_zaijian_number;
 
     @Override
     protected int getLayout() {
@@ -98,6 +99,10 @@ public class NewWHCheckMakeMaterialFragment extends BaseFragment implements View
 
         mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
         mSmartTable = root.findViewById(R.id.st_smart_table);
+        tv_project = root.findViewById(R.id.tv_project);
+        tv_kucunshu = root.findViewById(R.id.tv_kucunshu);
+        tv_zaitu_number = root.findViewById(R.id.tv_zaitu_number);
+        tv_zaijian_number = root.findViewById(R.id.tv_zaijian_number);
 
         CommonUtil.getLeftDefaultTable(mActivity, mSmartTable);
         //物料编号，规格，仓库，储位，数量，dc
@@ -107,6 +112,7 @@ public class NewWHCheckMakeMaterialFragment extends BaseFragment implements View
         mREMAIN = new Column<String>("数量", "REMAIN");
         mMADEDATE = new Column<String>("dc", "MADEDATE");
         mPR_SPEC = new Column<String>("规格", "PR_SPEC");
+        mMA_PROJECT = new Column<String>("项目", "MA_PROJECT");
     }
 
     @Override
@@ -158,13 +164,12 @@ public class NewWHCheckMakeMaterialFragment extends BaseFragment implements View
         editTextGetFocus(etProdcode);
         //->Actionbar
         ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(R.string.title_makematerial_whmm);
-
         setTableData(detailItemList);
     }
 
     private void setTableData(List<WHMakeMaterialProductNew> filterTableData) {
         mTableData = new TableData<WHMakeMaterialProductNew>("出库单列表", filterTableData,
-                mPR_CODE, mBAR_WHCODE,mBAR_LOCATION, mREMAIN,mMADEDATE, mPR_SPEC);
+                mPR_CODE, mBAR_WHCODE,mBAR_LOCATION, mREMAIN,mMADEDATE, mPR_SPEC,mMA_PROJECT);
         mSmartTable.setTableData(mTableData);
         mSmartTable.postDelayed(new Runnable() {
             @Override
@@ -323,6 +328,10 @@ public class NewWHCheckMakeMaterialFragment extends BaseFragment implements View
         //信息区域显示
         tvPrDetail.setText("" + strDetail);
         tvPrSpec.setText("" + strSpec);
+        tv_project.setText(detailItemList.get(0).getMA_PROJECT());
+        tv_kucunshu.setText(detailItemList.get(0).getSTOCKQTY());
+        tv_zaitu_number.setText(detailItemList.get(0).getWAYQTY());
+        tv_zaijian_number.setText(detailItemList.get(0).getCHECKQTY());
 
         //table数据源修改
         adapter.notifyDataSetChanged();

app/src/main/java/com/uas/jc_wms/fragment/StorageRechargeDetailFragment.java

@@ -44,7 +44,7 @@ public class StorageRechargeDetailFragment extends BaseFragment implements HttpC
     private ListView mListView;
     private Button mTransferButton;
     private LinearLayout mHeaderBarcodeLinearlayout;
-    private TextView mHeaderReceiptTextView, mHeaderSupplierTextView, mHeaderStateTextView;
+    private TextView mHeaderReceiptTextView, mHeaderSupplierTextView, mHeaderStateTextView,tv_total;
     private List<StorageRechargeListBean> mStorageRechargeListBeans;
     private StorageRechargeAdapter mStorageRechargeAdapter;
     private StringRequest mStringRequest;
@@ -82,6 +82,7 @@ public class StorageRechargeDetailFragment extends BaseFragment implements HttpC
         mHeaderReceiptTextView = (TextView) headerView.findViewById(R.id.header_storage_recharge_receipt_tv);
         mHeaderSupplierTextView = (TextView) headerView.findViewById(R.id.header_storage_recharge_supplier_tv);
         mHeaderStateTextView = (TextView) headerView.findViewById(R.id.header_storage_recharge_state_tv);
+        tv_total = (TextView) headerView.findViewById(R.id.tv_total);
         mListView.addHeaderView(headerView);
 
         mStorageRechargeListBeans = new ArrayList<>();
@@ -116,6 +117,84 @@ public class StorageRechargeDetailFragment extends BaseFragment implements HttpC
                 }
             }
         });
+
+        mStorageRechargeAdapter.setOnQuantityModifyListener(new StorageRechargeAdapter.OnQuantityModifyListener() {
+            @Override
+            public void onQuantityModify(final DialogInterface dialogInterface, String text, final int position) {
+                double quantity = -1;
+                try {
+                    quantity = Double.parseDouble(text);
+                } catch (Exception e) {
+                    CommonUtil.toastNoRepeat(mActivity, "请输入正确的数字");
+                    //                    dialogInterface.dismiss();
+                    return;
+                }
+
+                if (quantity <= 0) {
+                    CommonUtil.toastNoRepeat(mActivity, "数量必须大于0");
+                    //                    dialogInterface.dismiss();
+                    return;
+                }
+
+                progressDialog.show();
+                final double finalQuantity = quantity;
+                VolleyRequest.getInstance().stringRequest(mStringRequest,
+                        new HttpParams.Builder()
+                                .url(GloableParams.ADDRESS_RECHARGE_UPDATEANDINQTY)
+                                .method(Request.Method.POST)
+                                .tag(TAG + "ADDRESS_RECHARGE_UPDATEANDINQTY")
+                                .addParam("and_id", mStorageRechargeListBeans.get(position).getAndId() + "")
+                                .addParam("qty", quantity + "")
+                                .build(), new HttpCallback() {
+                            @Override
+                            public void onSuccess(int flag, Object o) throws Exception {
+                                progressDialog.dismiss();
+                                dialogInterface.dismiss();
+
+                                mStorageRechargeListBeans.get(position).setQuantity(finalQuantity);
+
+                                mStorageRechargeAdapter.notifyDataSetChanged();
+                            }
+
+                            @Override
+                            public void onFail(int flag, String failStr) throws Exception {
+                                progressDialog.dismiss();
+                                dialogInterface.dismiss();
+                                CommonUtil.toastNoRepeat(mActivity, failStr);
+                            }
+                        });
+            }
+
+        });
+
+        mStorageRechargeAdapter.setOnDeleteItemListener(new StorageRechargeAdapter.OnDeleteItem() {
+            @Override
+            public void onDelete(DialogInterface dialogInterface, int position) {
+                progressDialog.show();
+                VolleyRequest.getInstance().stringRequest(mStringRequest,
+                        new HttpParams.Builder()
+                                .url(GloableParams.ADDRESS_DELETE_AND_INQTY)
+                                .method(Request.Method.POST)
+                                .tag(TAG + "ADDRESS_DELETE_AND_INQTY")
+                                .addParam("and_id", mStorageRechargeListBeans.get(position).getAndId() + "")
+                                .build(), new HttpCallback() {
+                            @Override
+                            public void onSuccess(int flag, Object o) throws Exception {
+                                progressDialog.dismiss();
+                                dialogInterface.dismiss();
+                                mStorageRechargeListBeans.remove(position);
+                                mStorageRechargeAdapter.notifyDataSetChanged();
+                            }
+
+                            @Override
+                            public void onFail(int flag, String failStr) throws Exception {
+                                progressDialog.dismiss();
+                                dialogInterface.dismiss();
+                                CommonUtil.toastNoRepeat(mActivity, failStr);
+                            }
+                        });
+            }
+        });
     }
 
     @Override
@@ -128,21 +207,24 @@ public class StorageRechargeDetailFragment extends BaseFragment implements HttpC
         if (detailJson != null && FastjsonUtil.validate(detailJson)) {
             try {
                 JSONArray detailArray = JSON.parseArray(detailJson);
+                long total = 0;
                 for (int i = 0; i < detailArray.size(); i++) {
                     JSONObject detailObject = detailArray.getJSONObject(i);
                     if (detailObject != null) {
                         StorageRechargeListBean storageRechargeListBean = new StorageRechargeListBean();
                         storageRechargeListBean.setProdcode(FastjsonUtil.getText(detailObject, "AND_PRODCODE"));
                         storageRechargeListBean.setOrdercode(FastjsonUtil.getText(detailObject, "AND_ORDERCODE"));
-                        storageRechargeListBean.setOrderNo(FastjsonUtil.getLong(detailObject, "AND_ORDERDETNO"));
+//                        storageRechargeListBean.setOrderNo(FastjsonUtil.getLong(detailObject, "AND_ORDERDETNO"));
+                        storageRechargeListBean.setOrderNo(FastjsonUtil.getLong(detailObject, "AND_DETNO"));
                         storageRechargeListBean.setQuantity(FastjsonUtil.getDouble(detailObject, "AND_INQTY"));
                         storageRechargeListBean.setDetail(FastjsonUtil.getText(detailObject, "PR_DETAIL"));
                         storageRechargeListBean.setSpec(FastjsonUtil.getText(detailObject, "PR_SPEC"));
 
+                        total += FastjsonUtil.getDouble(detailObject, "AND_INQTY");
                         mStorageRechargeListBeans.add(storageRechargeListBean);
                     }
                 }
-
+                tv_total.setText(String.valueOf(total));
                 mStorageRechargeAdapter.notifyDataSetChanged();
             } catch (Exception e) {
 

app/src/main/java/com/uas/jc_wms/fragment/StorageRechargeFragment.java

@@ -66,7 +66,8 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
     private LinearLayout mDataLinearLayout;
     private ListView mDataListView;
     private ScrollView mErrorScrollView;
-    private TextView mErrorTextView, mHeaderBarcodeTextView, mHeaderReceiptTextView, mHeaderSupplierTextView, mHeaderStateTextView;
+    private TextView mErrorTextView, mHeaderBarcodeTextView, mHeaderReceiptTextView,
+            mHeaderSupplierTextView, mHeaderStateTextView,tv_total;
     private List<StorageRechargeListBean> mStorageRechargeListBeans;
     private StorageRechargeAdapter mStorageRechargeAdapter;
     private int mMainId = 0;
@@ -96,11 +97,13 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
         mErrorScrollView = (ScrollView) root.findViewById(R.id.storage_recharge_error_sv);
         mChangeButton = (Button) root.findViewById(R.id.storage_recharge_purchase_change_btn);
 
+
         View headerView = View.inflate(mActivity, R.layout.header_storage_recharge_list, null);
         mHeaderBarcodeTextView = (TextView) headerView.findViewById(R.id.header_storage_recharge_barcode_tv);
         mHeaderReceiptTextView = (TextView) headerView.findViewById(R.id.header_storage_recharge_receipt_tv);
         mHeaderSupplierTextView = (TextView) headerView.findViewById(R.id.header_storage_recharge_supplier_tv);
         mHeaderStateTextView = (TextView) headerView.findViewById(R.id.header_storage_recharge_state_tv);
+        tv_total = (TextView) headerView.findViewById(R.id.tv_total);
         mDataListView.addHeaderView(headerView);
 
         mStorageRechargeListBeans = new ArrayList<>();
@@ -230,6 +233,37 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                             }
                         });
             }
+
+        });
+
+        mStorageRechargeAdapter.setOnDeleteItemListener(new StorageRechargeAdapter.OnDeleteItem() {
+            @Override
+            public void onDelete(DialogInterface dialogInterface, int position) {
+                progressDialog.show();
+                VolleyRequest.getInstance().stringRequest(mStringRequest,
+                        new HttpParams.Builder()
+                                .url(GloableParams.ADDRESS_DELETE_AND_INQTY)
+                                .method(Request.Method.POST)
+                                .tag(TAG + "updateandinqty")
+                                .flag(FLAG_UPDATEANDINQTY)
+                                .addParam("and_id", mStorageRechargeListBeans.get(position).getAndId() + "")
+                                .build(), new HttpCallback() {
+                            @Override
+                            public void onSuccess(int flag, Object o) throws Exception {
+                                progressDialog.dismiss();
+                                dialogInterface.dismiss();
+                                mStorageRechargeListBeans.remove(position);
+                                mStorageRechargeAdapter.notifyDataSetChanged();
+                            }
+
+                            @Override
+                            public void onFail(int flag, String failStr) throws Exception {
+                                progressDialog.dismiss();
+                                dialogInterface.dismiss();
+                                CommonUtil.toastNoRepeat(mActivity, failStr);
+                            }
+                        });
+            }
         });
     }
 
@@ -499,6 +533,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                 mHeaderStateTextView.setText(FastjsonUtil.getText(mainObject, "AN_STATUS"));
             }
             JSONArray detailArray = dataObject.getJSONArray("detail");
+            long total = 0;
             if (detailArray != null) {
                 for (int i = 0; i < detailArray.size(); i++) {
                     JSONObject detailObject = detailArray.getJSONObject(i);
@@ -512,9 +547,12 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                         storageRechargeListBean.setDetail(FastjsonUtil.getText(detailObject, "PR_DETAIL"));
                         storageRechargeListBean.setSpec(FastjsonUtil.getText(detailObject, "PR_SPEC"));
                         storageRechargeListBean.setISNEED(FastjsonUtil.getText(detailObject, "ISNEED"));
+
+                        total += FastjsonUtil.getDouble(detailObject, "AND_INQTY");
                         mStorageRechargeListBeans.add(storageRechargeListBean);
                     }
                 }
+                tv_total.setText(String.valueOf(total));
                 mStorageRechargeAdapter.notifyDataSetChanged();
             }
             String type = FastjsonUtil.getText(dataObject, "type");

app/src/main/java/com/uas/jc_wms/fragment/WHTransferLocationFragment.java

@@ -1,30 +1,52 @@
 package com.uas.jc_wms.fragment;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.PopupWindow;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.android.volley.Request;
+import com.android.volley.toolbox.StringRequest;
 import com.uas.jc_wms.R;
 import com.uas.jc_wms.activity.FunctionActivity;
 import com.uas.jc_wms.adapter.TransferLocationAdapter;
+import com.uas.jc_wms.bean.WHBreakingBatchBreakingBtnClickEventNew;
 import com.uas.jc_wms.bean.WHTransfer;
 import com.uas.jc_wms.global.GloableParams;
 import com.uas.jc_wms.tools.GsonUtil;
+import com.uas.jc_wms.tools.SharedPreUtil;
 import com.uas.jc_wms.tools.VolleyUtil;
 import com.uas.jc_wms.util.CameraUtil;
 import com.uas.jc_wms.util.CommonUtil;
+import com.uas.jc_wms.util.Constants;
+import com.uas.jc_wms.util.FastjsonUtil;
+import com.uas.jc_wms.util.FragmentUtils;
+import com.uas.jc_wms.util.HttpCallback;
+import com.uas.jc_wms.util.HttpParams;
 import com.uas.jc_wms.util.LogUtil;
+import com.uas.jc_wms.util.PrintUtils;
+import com.uas.jc_wms.util.VollyRequest;
 import com.uas.jc_wms.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
@@ -61,6 +83,13 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
     private ListView lvData;
     private ImageView mScanImageView;
     private int mFocusId;
+    private Button bt_inventory_barcode_printing;
+    private PopupWindow splitPop;
+    private List<WHBreakingBatchBreakingBtnClickEventNew.DataBean> messages = new ArrayList<>();
+    private boolean isConnected = false;
+    private String mOldAddress = "";
+    private int mPrintDpi = 203;
+    private boolean isPrinting = false;
 
     @Override
     protected int getLayout() {
@@ -80,6 +109,7 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
         lvData = (ListView) root.findViewById(R.id.lv_data);
 
         mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
+        bt_inventory_barcode_printing = root.findViewById(R.id.bt_inventory_barcode_printing);
 
         //回调接口
         VolleyUtil.getVolleyUtil().setOnVolleyFinishListener(this);
@@ -90,6 +120,10 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
         //List
         adapter = new TransferLocationAdapter(gridData, getActivity());
         lvData.setAdapter(adapter);
+
+        isConnected = (SharedPreUtil.getInt(mActivity, "printConnect", 0) == 1);
+        mOldAddress = SharedPreUtil.getString(mActivity, "printAddress", "");
+        mPrintDpi = SharedPreUtil.getInt(mActivity, "printDpi", 203);
     }
 
     @Override
@@ -144,6 +178,174 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
                 }
             }
         });
+        bt_inventory_barcode_printing.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getWhcode();
+            }
+        });
+    }
+
+    private void getWhcode() {
+        View mPopView = View.inflate(mActivity, R.layout.pop_inventory_barcode_dialog, null);
+        ClearableEditText cet_barcode = (ClearableEditText) mPopView.findViewById(R.id.cet_barcode);
+        Button bt_ok = (Button) mPopView.findViewById(R.id.bt_ok);
+        AlertDialog mWarehouseDialog = new AlertDialog.Builder(mActivity)
+                .setView(mPopView)
+                .create();
+        mWarehouseDialog.show();
+
+        cet_barcode.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)) {
+                    if (!TextUtils.isEmpty(cet_barcode.getText().toString().trim())) {
+                        getInvertoryBarcode(cet_barcode.getText().toString().trim());
+                    }
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        bt_ok.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mWarehouseDialog.cancel();
+                getInvertoryBarcode(cet_barcode.getText().toString().trim());
+            }
+        });
+    }
+
+    private StringRequest mStringRequest;
+    private void getInvertoryBarcode(String barcode) {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(mStringRequest,
+                new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_GET_INVENTORY_BARCODE_DATA)
+                        .method(Request.Method.GET)
+                        .tag(TAG + "getInvertoryBarcode")
+                        .addParam("code", barcode)
+                        .flag(0)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        Boolean isSuccess = FastjsonUtil.getBoolean(o.toString(), "success");
+                        com.alibaba.fastjson.JSONObject data = FastjsonUtil.getJSONObject(o.toString(), "data");
+                        //                        com.alibaba.fastjson.JSONArray dataArray = FastjsonUtil.getJSONArray(data.toString(), "data");
+                        if (isSuccess) {
+                            try {
+                                com.alibaba.fastjson.JSONArray listArray = new com.alibaba.fastjson.JSONArray();
+                                String data1 = data.getString("data");
+                                listArray.add(JSON.parseObject(data1));
+                                initBreakPopupWindow(listArray);
+                            }catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                    }
+                });
+    }
+
+    protected void initBreakPopupWindow(com.alibaba.fastjson.JSONArray listArray) {
+        messages.clear();
+        for (int i = 0; i < listArray.size(); i++) {
+            try {
+                com.alibaba.fastjson.JSONObject barcodeObject = listArray.getJSONObject(i);
+                if (barcodeObject != null) {
+                    WHBreakingBatchBreakingBtnClickEventNew.DataBean dataBean = new WHBreakingBatchBreakingBtnClickEventNew.DataBean();
+                    dataBean.setBAR_CODE(barcodeObject.getString("BAR_CODE"));
+                    dataBean.setBAR_REMAIN(barcodeObject.getString("BAR_REMAIN"));//RESTQTY
+                    messages.add(dataBean);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        View popView = LayoutInflater.from(getActivity()).inflate(R.layout.popupwindow_whbreaking_batch, null);
+        ListView listView = (ListView) popView.findViewById(R.id.list_view);
+        Button btnPrintf = (Button) popView.findViewById(R.id.btn_print);
+        Button btnPrintfSet = (Button) popView.findViewById(R.id.btn_print_setting);
+        Button btnClose = (Button) popView.findViewById(R.id.btn_close);
+        Button btnBack = (Button) popView.findViewById(R.id.btn_back);
+
+        btnBack.setVisibility(View.GONE);
+        btnClose.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeSplitPopupWindow();
+            }
+        });
+        btnPrintf.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (isConnected) {
+                    progressDialog.show();
+                    printEvent(listArray);
+                } else {
+                    closeSplitPopupWindow();
+                    BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                    Bundle bundle = new Bundle();
+                    bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, listArray.toString());
+                    blueToothPrintFragment.setArguments(bundle);
+                    FragmentUtils.switchFragment(WHTransferLocationFragment.this, blueToothPrintFragment);
+                }
+            }
+        });
+
+        btnPrintfSet.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                closeSplitPopupWindow();
+                BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, listArray.toString());
+                blueToothPrintFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(WHTransferLocationFragment.this, blueToothPrintFragment);
+            }
+        });
+
+        MyAdapter adapter = new MyAdapter(getActivity(), R.layout.item_list_whbreakingbatchfragment, messages);
+        listView.setAdapter(adapter);
+        //当只有一条数据的时候可以加上
+        /*
+        if (messages.size()>1){
+            btnBack.setVisibility(View.GONE);
+        }*/
+        // PopupWindow实例化，参数的意思是 view,长（不包括状态栏），高（不包括状态栏），是否聚焦
+        splitPop = new PopupWindow(popView, LinearLayout.LayoutParams.WRAP_CONTENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        splitPop.setAnimationStyle(R.style.MenuAnimationFade);
+        splitPop.setBackgroundDrawable(new BitmapDrawable());
+        // 弹出窗口显示内容视图,默认以锚定视图的左下角为起点，这里为点击按钮
+        splitPop.showAtLocation(getActivity().getWindow().getDecorView(), Gravity.CENTER, 0, 0);
+        splitPop.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closeSplitPopupWindow();
+                //                confirmEvent();
+            }
+        });
+        CommonUtil.setBackgroundAlpha(mActivity, 0.5f);
+    }
+
+    private void closeSplitPopupWindow() {
+        if (splitPop != null) {
+            splitPop.dismiss();
+            splitPop = null;
+            CommonUtil.setBackgroundAlpha(mActivity, 1f);
+        }
     }
 
     @Override
@@ -253,7 +455,6 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
         VolleyUtil.getVolleyUtil().requestLocaTransfer(getActivity(), GloableParams.ADDRESS_WHTRANSFER, VolleyUtil.METHOD_POST, requestType, strNewLocation, jsonString);
     }
 
-
     //Volley响应成功
     private void disposeVolleySuccess(String result) {
         switch (requestType) {
@@ -265,7 +466,6 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
                 disposeVolleyTransfer(result);
                 break;
         }
-
     }
 
     //Volley响应成功：请求转移数据
@@ -436,4 +636,70 @@ public class WHTransferLocationFragment extends BaseFragment implements Compound
         }
         progressDialog.dismiss();
     }
+
+    private void printEvent(com.alibaba.fastjson.JSONArray printArray) {
+        if (isPrinting) {
+            CommonUtil.toastNoRepeat(mActivity, "正在打印中，请勿重复操作");
+            return;
+        }
+        isPrinting = true;
+        if (printArray != null && printArray.size() > 0) {
+            boolean isFail = false;
+            for (int i = 0; i < printArray.size(); i++) {
+                try {
+                    com.alibaba.fastjson.JSONObject printObject = printArray.getJSONObject(i);
+                    int printResult = PrintUtils.printBar(mActivity, printObject.toString(), mPrintDpi, null);
+                    if (printResult <= 0) {
+                        isFail = true;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            closeSplitPopupWindow();
+            progressDialog.dismiss();
+            if (isFail) {
+                isConnected = false;
+                SharedPreUtil.saveInt(mActivity, "printConnect", 0);
+                CommonUtil.toastNoRepeat(mActivity, "打印失败，请重新连接打印机");
+
+                BlueToothPrintFragment blueToothPrintFragment = new BlueToothPrintFragment();
+
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.KEY.BARCODE_PRINT_ARRAY, printArray.toString());
+                blueToothPrintFragment.setArguments(bundle);
+                FragmentUtils.switchFragment(WHTransferLocationFragment.this, blueToothPrintFragment);
+            } else {
+                CommonUtil.toastNoRepeat(mActivity, "打印成功");
+            }
+        } else {
+            CommonUtil.toastNoRepeat(mActivity, "打印失败，条码数据为空");
+        }
+        isPrinting = false;
+    }
+
+    private class MyAdapter extends ArrayAdapter<WHBreakingBatchBreakingBtnClickEventNew.DataBean> {
+        private int resourceId;
+
+        public MyAdapter(Context context, int resource, List<WHBreakingBatchBreakingBtnClickEventNew.DataBean> objects) {
+            super(context, resource, objects);
+            resourceId = resource;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            //WHBreakingBatchBreakingBtnClickEventNew.Message target = getItem(position);
+            WHBreakingBatchBreakingBtnClickEventNew.DataBean person = getItem(position);
+            convertView = LayoutInflater.from(getContext()).inflate(resourceId,
+                    null);
+            TextView tv_bar_code = (TextView) convertView.findViewById(R.id.tv_bar_code);
+            TextView tv_bar_remain = (TextView) convertView.findViewById(R.id.tv_bar_remain);
+            // tv_bar_code.setText(target.bar_code);
+            // tv_bar_remain.setText(target.bar_remain);
+            tv_bar_code.setText(person.getBAR_CODE());
+            tv_bar_remain.setText(person.getBAR_REMAIN());
+            return convertView;
+        }
+
+    }
 }

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

@@ -267,6 +267,8 @@ public class GloableParams {
     public static String ADDRESS_GET_PRE_MATERIAL_LIST;
     public static String ADDRESS_GET_INVENTORY_BARCODE_DATA;     //库存条码打印
 
+    public static String ADDRESS_DELETE_AND_INQTY;     //收料通知单-删除
+
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
     //登录页面请求地址
@@ -744,12 +746,13 @@ public class GloableParams {
 
     //修改数量弹窗
     private static final String ADDRESSTAIL_GET_BARCODE_DATA = "/api/pda/outMaterial/getBarcodeData.action";
-
     private static final String ADDRESSTAIL_GET_PRE_MATERIAL_LIST = "/api/pda/outMaterial/getStockMaterialList.action";
-
     //库存条码打印
     private static final String ADDRESSTAIL_GET_INVENTORY_BARCODE_DATA = "/api/pda/batch/getBarcodeData.action";
 
+    //收料通知单-删除
+    private static final String ADDRESSTAIL_DELETE_AND_INQTY = "/api/pda/acceptNToVerify/deleteAndInqty.action";
+
 
 
 
@@ -1190,10 +1193,10 @@ public class GloableParams {
 
         GloableParams.ADDRESS_GET_BARCODE_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_BARCODE_DATA;
         GloableParams.ADDRESS_GET_PRE_MATERIAL_LIST = uriHead + GloableParams.ADDRESSTAIL_GET_PRE_MATERIAL_LIST;
-
-
         GloableParams.ADDRESS_GET_INVENTORY_BARCODE_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_INVENTORY_BARCODE_DATA;
 
+        GloableParams.ADDRESS_DELETE_AND_INQTY = uriHead + GloableParams.ADDRESSTAIL_DELETE_AND_INQTY;
+
 
 
 

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

@@ -24,6 +24,15 @@
                 android:text="@string/text_btn_print"
                 />
 
+            <Button
+                android:id="@+id/bt_material_inquiry"
+                android:layout_toEndOf="@+id/btn_oneprint"
+                android:layout_marginStart="10sp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="物料查询"
+                />
+
             <Button
                 android:layout_alignParentEnd="true"
                 android:id="@+id/bt_inventory_barcode_printing"

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

@@ -66,6 +66,138 @@
         </TableRow>
     </TableLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="8dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:text="项目"
+            android:textSize="18sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="3dp"
+            />
+
+        <TextView
+            android:id="@+id/tv_project"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:text=""
+            android:textSize="18sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="3dp"
+            android:textColor="@color/text_search"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="8dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:text="库存数"
+            android:textSize="18sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="3dp"
+            />
+
+        <TextView
+            android:id="@+id/tv_kucunshu"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:text=""
+            android:textSize="18sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="3dp"
+            android:textColor="@color/text_search"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="8dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:text="在途数量"
+            android:textSize="18sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="3dp"
+            />
+
+        <TextView
+            android:id="@+id/tv_zaitu_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:text=""
+            android:textSize="18sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="3dp"
+            android:textColor="@color/text_search"
+            />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="8dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:text="在检数量"
+            android:textSize="18sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="3dp"
+            />
+
+        <TextView
+            android:id="@+id/tv_zaijian_number"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:text=""
+            android:textSize="18sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="3dp"
+            android:textColor="@color/text_search"
+            />
+
+    </LinearLayout>
+
     <com.bin.david.form.core.SmartTable
         android:id="@+id/st_smart_table"
         android:layout_marginStart="10dp"

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

@@ -4,8 +4,21 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical">
+
+
+    <Button
+        android:layout_marginTop="10dp"
+        android:layout_alignParentEnd="true"
+        android:id="@+id/bt_inventory_barcode_printing"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/Inventory_barcode_printing"
+        android:layout_marginStart="10dp"
+        />
+
     <!--1：RadioButton 外箱号/条码号-->
     <RadioGroup
+        android:layout_marginTop="10dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:checkedButton="@+id/rb_barcode"

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

@@ -109,5 +109,26 @@
             android:textColor="@color/black"
             android:textSize="14sp"
             tools:text="2018-01-21" />
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:layout_weight="1"
+            android:text="总数："
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tv_total"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="4dp"
+            android:layout_weight="3"
+            android:textColor="@color/black"
+            android:textSize="14sp"
+            tools:text="" />
     </LinearLayout>
+
+
+
 </LinearLayout>

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

@@ -13,40 +13,38 @@
         android:padding="4dp">
 
         <TextView
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_weight="1"
-            android:text="PO号:"
+            android:text="序号:"
             android:textSize="14sp" />
 
         <TextView
-            android:id="@+id/list_storage_recharge_ordercode_tv"
+            android:id="@+id/list_storage_recharge_orderno_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
-            android:layout_weight="3"
+            android:layout_weight="1"
             android:textSize="14sp"
-            tools:text="MP32009240" />
+            tools:text="1" />
 
         <TextView
-            android:visibility="invisible"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_weight="1"
-            android:text="序号:"
+            android:text="PO号:"
             android:textSize="14sp" />
 
         <TextView
-            android:visibility="invisible"
-            android:id="@+id/list_storage_recharge_orderno_tv"
+            android:id="@+id/list_storage_recharge_ordercode_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
+            android:layout_marginStart="8dp"
             android:layout_weight="1"
             android:textSize="14sp"
-            tools:text="1" />
+            tools:text="MP32009240" />
+
+
     </LinearLayout>
 
     <LinearLayout
@@ -68,39 +66,50 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_weight="1.3"
+            android:layout_weight="1"
             android:textSize="14sp"
             tools:text="ZWLDK23723447479" />
 
-        <LinearLayout
-            android:layout_width="0dp"
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="4dp"
+        android:layout_marginStart="8dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
-            android:layout_weight="1">
+            android:text="@string/bar_remain"
+            android:textSize="14sp"
+            />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/bar_remain"
-                android:textSize="14sp"
-                />
+        <TextView
+            android:id="@+id/list_storage_recharge_quantity_tv"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textSize="14sp"
+            tools:text="4390" />
 
-            <TextView
-                android:id="@+id/list_storage_recharge_quantity_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:textSize="14sp"
-                tools:text="4390" />
+        <TextView
+            android:id="@+id/list_storage_recharge_quantity_modify_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+           android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
+            android:text="修改"
+            android:textColor="@color/text_blue" />
 
-            <TextView
-                android:id="@+id/list_storage_recharge_quantity_modify_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingRight="10dp"
-                android:text="修改"
-                android:textColor="@color/text_blue" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/tv_delete"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:text="删除"
+            android:textColor="@color/text_blue" />
 
     </LinearLayout>
 

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

@@ -96,4 +96,36 @@
             android:id="@+id/transfer_spec"
             style="@style/CardContentTextStyle" />
     </TableRow>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="8dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:text="项目："
+            android:textSize="18sp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="3dp"
+            />
+
+        <TextView
+            android:id="@+id/tv_project"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:text=""
+            android:textSize="18sp"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="3dp"
+            android:layout_marginEnd="3dp"
+            android:textColor="@color/text_search"
+            />
+
+    </LinearLayout>
 </TableLayout>

app/src/main/res/values/strings.xml

@@ -435,5 +435,6 @@
     <string name="Inventory_barcode_printing">库存条码打印</string>
     <string name="Please_enter_barcode">请输入条码</string>
     <string name="Is_the_material_urgent">是否急料:</string>
+    <string name="Material_inquiry">物料查询</string>
 
 </resources>

build.gradle

@@ -55,8 +55,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 45,
-            versionName      : "v2.5.9"
+            versionCode      : 53,
+            versionName      : "v2.6.7"
     ]
 
     depsVersion = [