凯尔高备份

app/src/main/java/com/uas/keg_storage/adapter/StorageStockTaskAdapter.java

@@ -59,7 +59,8 @@ public class StorageStockTaskAdapter extends BaseAdapter {
         holder.mWhcodeTv.setText(object.getPD_WHCODE());
         holder.mBrandTv.setText(object.getPD_BRAND());
         holder.mSpecTv.setText(object.getPR_DETAIL() + "    " + object.getPR_SPEC());
-        holder.mPdnoTv.setText(object.getPD_PDNO()+"");
+        holder.mPdnoTv.setText(object.getPD_PDNO() + "");
+        holder.mLocationTv.setText(object.getBI_LOCATION());
     }
 
     protected class ViewHolder {
@@ -70,6 +71,7 @@ public class StorageStockTaskAdapter extends BaseAdapter {
         private TextView mBrandTv;
         private TextView mSpecTv;
         private TextView mPdnoTv;
+        private TextView mLocationTv;
 
         public ViewHolder(View view) {
             mProdcodeTv = (TextView) view.findViewById(R.id.list_storage_stock_task_prodcode_tv);
@@ -79,6 +81,7 @@ public class StorageStockTaskAdapter extends BaseAdapter {
             mBrandTv = (TextView) view.findViewById(R.id.list_storage_stock_task_brand_tv);
             mSpecTv = (TextView) view.findViewById(R.id.list_storage_stock_task_spec_tv);
             mPdnoTv = (TextView) view.findViewById(R.id.list_storage_stock_task_pdno_tv);
+            mLocationTv = view.findViewById(R.id.list_storage_stock_task_location_tv);
         }
     }
 }

app/src/main/java/com/uas/keg_storage/bean/StorageStockTaskBean.java

@@ -29,6 +29,7 @@ public class StorageStockTaskBean {
     private String PD_WHCODE;
     private String PD_WHNAME;
     private String PD_PDNO;
+    private String BI_LOCATION;
     private int RN;
 
     public String getPD_PRODCODE() {
@@ -103,6 +104,14 @@ public class StorageStockTaskBean {
         this.PD_PDNO = PD_PDNO;
     }
 
+    public String getBI_LOCATION() {
+        return BI_LOCATION;
+    }
+
+    public void setBI_LOCATION(String BI_LOCATION) {
+        this.BI_LOCATION = BI_LOCATION;
+    }
+
     public int getRN() {
         return RN;
     }

app/src/main/java/com/uas/keg_storage/fragment/BarcodeInfoBindFragment.java

@@ -0,0 +1,277 @@
+package com.uas.keg_storage.fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.android.volley.Request;
+import com.uas.keg_storage.R;
+import com.uas.keg_storage.activity.FunctionActivity;
+import com.uas.keg_storage.global.GloableParams;
+import com.uas.keg_storage.listener.MyEditorActionListener;
+import com.uas.keg_storage.util.CameraUtil;
+import com.uas.keg_storage.util.CommonUtil;
+import com.uas.keg_storage.util.FastjsonUtil;
+import com.uas.keg_storage.util.HttpCallback;
+import com.uas.keg_storage.util.HttpParams;
+import com.uas.keg_storage.util.VollyRequest;
+import com.uas.keg_storage.view.ClearableEditText;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.uuzuche.lib_zxing.activity.CodeUtils;
+
+public class BarcodeInfoBindFragment extends BaseFragment {
+    private static final int SCAN_BARCODE_CODE = 116;
+    private ClearableEditText mBarcodeCet, mDcCet,
+            mLotnoCet, mLocationCet;
+    private TextView mResultTv;
+    private Button mConfirmButton;
+    private ImageView mScanImageView;
+    private int mFocusId;
+
+    @Override
+    protected int getLayout() {
+        return R.layout.fragment_barcode_info_bind;
+    }
+
+    @Override
+    protected void initViews() {
+        FunctionActivity.setTitle("条码信息绑定");
+        ((FunctionActivity) mActivity).setScanIvVisible(true);
+
+        mBarcodeCet = root.findViewById(R.id.barcode_info_bind_barcode_cet);
+        mDcCet = root.findViewById(R.id.barcode_info_bind_dc_cet);
+        mLotnoCet = root.findViewById(R.id.barcode_info_bind_lotno_cet);
+        mLocationCet = root.findViewById(R.id.barcode_info_bind_location_cet);
+        mResultTv = root.findViewById(R.id.barcode_info_bind_result_tv);
+        mConfirmButton = root.findViewById(R.id.barcode_info_bind_confirm_btn);
+        mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
+
+        mBarcodeCet.requestFocus();
+    }
+
+    @Override
+    protected void initEvents() {
+        mScanImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (CameraUtil.hasCamera()) {
+                    if (root.findFocus() != null) {
+                        mFocusId = root.findFocus().getId();
+                        Intent intent = new Intent();
+                        intent.setClass(mActivity, CaptureActivity.class);
+                        startActivityForResult(intent, SCAN_BARCODE_CODE);
+                    }
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+            }
+        });
+
+        CommonUtil.setEditorActionListener(mBarcodeCet, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                if (TextUtils.isEmpty(text)) {
+                    return;
+                }
+                barcodeParse(text);
+            }
+        });
+
+        mBarcodeCet.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                String barcode = mBarcodeCet.getText().toString().trim();
+                if (!TextUtils.isEmpty(barcode)) {
+                    barcodeParse(barcode);
+                }
+            }
+        });
+
+        mConfirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String barcode = mBarcodeCet.getText().toString().trim();
+                String dc = mDcCet.getText().toString().trim();
+                String lotno = mLotnoCet.getText().toString().trim();
+                String location = mLocationCet.getText().toString().trim();
+
+                if (TextUtils.isEmpty(barcode)) {
+                    CommonUtil.toastNoRepeat(mActivity, "请采集条码");
+                    return;
+                }
+                if (TextUtils.isEmpty(dc) && TextUtils.isEmpty(lotno) && TextUtils.isEmpty(location)) {
+                    CommonUtil.toastNoRepeat(mActivity, "请采集您要绑定的信息");
+                    return;
+                }
+
+                progressDialog.show();
+                VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                        .url(GloableParams.ADDRESS_PDAIOIN_BARCODEINFOBIND)
+                        .method(Request.Method.POST)
+                        .flag(0)
+                        .tag(TAG + "barcodeinfo")
+                        .addParam("barcode", barcode)
+                        .addParam("dc", dc)
+                        .addParam("lotno", lotno)
+                        .addParam("location", location)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        progressDialog.dismiss();
+                        reset();
+                        try {
+                            String result = o.toString();
+                            JSONObject resultObject = JSON.parseObject(result);
+                            JSONObject dataObject = resultObject.getJSONObject("data");
+                            if (dataObject != null) {
+                                mResultTv.setVisibility(View.VISIBLE);
+
+                                mResultTv.setVisibility(View.VISIBLE);
+                                mResultTv.setText("条码信息绑定成功\n条码：" + barcode
+                                        + "\nLOTNO：" + FastjsonUtil.getText(dataObject, "BAR_VENDBARCODE")
+                                        + "\nDC：" + FastjsonUtil.getText(dataObject, "BAR_MADE")
+                                        + "\n库位：" + FastjsonUtil.getText(dataObject, "BAR_LOCATION"));
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        progressDialog.dismiss();
+                        CommonUtil.toastNoRepeat(mActivity, failStr);
+                        mResultTv.setVisibility(View.VISIBLE);
+                        mResultTv.setText(failStr);
+
+                        reset();
+                    }
+                });
+            }
+        });
+    }
+
+    private void barcodeParse(String text) {
+        progressDialog.show();
+        VollyRequest.getInstance().stringRequest(new HttpParams.Builder()
+                .url(GloableParams.ADDRESS_PDAIO_IN_GETBARCODEINFORMATION)
+                .method(Request.Method.GET)
+                .tag(TAG + "barcodeinfo")
+                .flag(0)
+                .addParam("barcode", text)
+                .build(), new HttpCallback() {
+            @Override
+            public void onSuccess(int flag, Object o) throws Exception {
+                progressDialog.dismiss();
+
+                try {
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONObject dataObject = resultObject.getJSONObject("data");
+                    if (dataObject != null) {
+                        mLotnoCet.setText(FastjsonUtil.getText(dataObject, "BAR_VENDBARCODE"));
+                        mDcCet.setText(FastjsonUtil.getText(dataObject, "BAR_MADE"));
+                        mLocationCet.setText(FastjsonUtil.getText(dataObject, "BAR_LOCATION"));
+
+                        mResultTv.setVisibility(View.VISIBLE);
+                        mResultTv.setText("条码信息获取成功!\n"
+                                + "条码：" + FastjsonUtil.getText(dataObject, "BAR_CODE")
+                                + "\n规格：" + FastjsonUtil.getText(dataObject, "PR_SPEC")
+                                + "\n数量：" + FastjsonUtil.getText(dataObject, "BAR_REMAIN")
+                                + "   库位：" + FastjsonUtil.getText(dataObject, "BAR_LOCATION")
+                                + "\nLOTNO：" + FastjsonUtil.getText(dataObject, "BAR_VENDBARCODE")
+                                + "   DC：" + FastjsonUtil.getText(dataObject, "BAR_MADE")
+                                + "\n品牌：" + FastjsonUtil.getText(dataObject, "BAR_BRAND"));
+                    }
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+            }
+
+            @Override
+            public void onFail(int flag, String failStr) throws Exception {
+                progressDialog.dismiss();
+                CommonUtil.toastNoRepeat(mActivity, failStr);
+                mResultTv.setVisibility(View.VISIBLE);
+                mResultTv.setText(failStr);
+
+                mBarcodeCet.setText("");
+                mBarcodeCet.requestFocus();
+            }
+        });
+    }
+
+    private void reset() {
+        mBarcodeCet.setText("");
+        mDcCet.setText("");
+        mLotnoCet.setText("");
+        mLocationCet.setText("");
+        mBarcodeCet.requestFocus();
+    }
+
+    @Override
+    protected void initDatas() {
+
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != Activity.RESULT_OK) {
+            return;
+        }
+
+        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                if (mFocusId == R.id.barcode_info_bind_barcode_cet) {
+                    mBarcodeCet.setText(result);
+                    mBarcodeCet.setSelection(result.length());
+                } else if (mFocusId == R.id.barcode_info_bind_dc_cet) {
+                    mDcCet.setText(result);
+                    mDcCet.setSelection(result.length());
+                } else if (mFocusId == R.id.barcode_info_bind_lotno_cet) {
+                    mLotnoCet.setText(result);
+                    mLotnoCet.setSelection(result.length());
+                } else if (mFocusId == R.id.barcode_info_bind_location_cet) {
+                    mLocationCet.setText(result);
+                    mLocationCet.setSelection(result.length());
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onHiddenChanged(boolean hidden) {
+        super.onHiddenChanged(hidden);
+        if (!hidden) {
+            FunctionActivity.setTitle("条码信息绑定");
+            ((FunctionActivity) mActivity).setScanIvVisible(true);
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ((FunctionActivity) mActivity).setScanIvVisible(false);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean onFragmentBackPressed() {
+        return false;
+    }
+}

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

@@ -63,6 +63,7 @@ import com.uas.keg_storage.bean.SubmitNotParam;
 import com.uas.keg_storage.bean.WHBreakingBatchBreakingBtnClickEvent;
 import com.uas.keg_storage.database.DBManager;
 import com.uas.keg_storage.global.GloableParams;
+import com.uas.keg_storage.listener.MyEditorActionListener;
 import com.uas.keg_storage.table.TableLBARCODEIO;
 import com.uas.keg_storage.table.TableLPRODIONEEDGET;
 import com.uas.keg_storage.tools.SharedPreUtil;
@@ -112,6 +113,7 @@ import okhttp3.RequestBody;
  */
 public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClickListener, RadioGroup.OnCheckedChangeListener, StorageInAddListFragment.OnListSelectListener, MaterialOutRevocationStockFragment.OnRevocationSuccessListener, HttpCallback {
     private static final int SCAN_BARCODE_CODE = 103;
+    private static final int SCAN_BOX_CODE = 106;
     private static final int SPLIT_BARCODE_SUCCESS = 104;
     private static final int SPLIT_BARCODE_FAIL = 105;
     private static final int FLAG_CONFIRM_POST = 0x08;
@@ -165,8 +167,12 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
     TextView mCollectResultTextView;
     @Bind(R.id.iocout_make_material_oper_title_tv)
     TextView mPiTitleTextView;
+    @Bind(R.id.iocout_material_oper_box_et)
+    ClearableEditText mBoxEditText;
+    @Bind(R.id.iocout_material_oper_box_scan_iv)
+    ImageView mBoxScanIv;
 
-    private ImageView mScanImageView;
+    private ImageView mBarcodeScanIv;
 
     private JsonObjectRequest jsonRequest;
     private static final String TAG = "IOCOutMakeMaterialOper";
@@ -455,7 +461,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
         ((FunctionActivity) getActivity()).setListIconIvVisible(false);
 
-        mScanImageView = (ImageView) root.findViewById(R.id.iocout_material_oper_scan_iv);
+        mBarcodeScanIv = (ImageView) root.findViewById(R.id.iocout_material_oper_barcode_scan_iv);
         btnActionbarRight = (Button) getActivity().findViewById(R.id.btn_actionbar_more);
 
         mDbManager = new DBManager(getActivity().getApplicationContext());
@@ -512,7 +518,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         etBarCode.addTextChangedListener(watcher);
         mCollectTypeRadioGroup.setOnCheckedChangeListener(this);
         mCollectModelBtn.setOnClickListener(this);
-        mScanImageView.setOnClickListener(this);
+        mBarcodeScanIv.setOnClickListener(this);
+        mBoxScanIv.setOnClickListener(this);
 
         etBarCode.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
@@ -527,6 +534,13 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             }
         });
 
+        CommonUtil.setEditorActionListener(mBoxEditText, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                etBarCode.requestFocus();
+            }
+        });
+
         if (false) {
             mtypeNameTv.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -661,9 +675,11 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 String materialInfo =
                                         "下一采集货品\n物料：" + FastjsonUtil.getText(dataObject, "PD_PRODCODE")
                                                 + "; \n数量：" + FastjsonUtil.getText(dataObject, "NEEDREADY")
+                                                + "; \n来料供应商：" + FastjsonUtil.getText(dataObject, "VENDCODE")
                                                 + "; \n序号：" + FastjsonUtil.getText(dataObject, "PD_PDNO")
                                                 + "; \n品牌：" + FastjsonUtil.getText(dataObject, "PD_BRAND")
-                                                + "; \n仓库：" + FastjsonUtil.getText(dataObject, "PD_WHCODE");
+                                                + "; \n仓库：" + FastjsonUtil.getText(dataObject, "PD_WHCODE")
+                                                + "; \n库位：" + FastjsonUtil.getText(dataObject, "BI_LOCATION");
                                 if (mMaterialInforTextView != null) {
                                     mMaterialInforTextView.setText(materialInfo);
                                 }
@@ -704,6 +720,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         progressDialog.show();
         etBarCode.setText(null);
         mCollectTypeRadioGroup.setEnabled(false);
+        String boxNum = mBoxEditText.getText().toString().trim();
 
         VollyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
@@ -713,6 +730,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         .tag(TAG + "collectbarcode")
                         .addParam("pi_id", pi_id)
                         .addParam("barcode", barcode)
+                        .addParam("box", boxNum)
                         .build(), new HttpCallback() {
                     @Override
                     public void onSuccess(int flag, Object o) throws Exception {
@@ -741,7 +759,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                     + "；数量：" + FastjsonUtil.getText(barcodeObject, "BI_OUTQTY")
                                     + "；lotno：" + FastjsonUtil.getText(barcodeObject, "BI_LOTNO")
                                     + "；Datecode：" + FastjsonUtil.getText(barcodeObject, "BI_DATECODE")
-                                    + "；PO：" + FastjsonUtil.getText(barcodeObject, "BI_ORDERCODE");
+//                                    + "；PO：" + FastjsonUtil.getText(barcodeObject, "BI_ORDERCODE")
+                                    ;
 
                             mCollectResultTextView.setText(barcodeResult);
                             mCollectResultTextView.setVisibility(View.VISIBLE);
@@ -759,9 +778,11 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 String materialInfo =
                                         "下一采集货品\n物料：" + FastjsonUtil.getText(nextObject, "PD_PRODCODE")
                                                 + "; \n数量：" + FastjsonUtil.getText(nextObject, "NEEDREADY")
+                                                + "; \n来料供应商：" + FastjsonUtil.getText(dataObject, "VENDCODE")
                                                 + "; \n序号：" + FastjsonUtil.getText(nextObject, "PD_PDNO")
                                                 + "; \n品牌：" + FastjsonUtil.getText(nextObject, "PD_BRAND")
-                                                + "; \n仓库：" + FastjsonUtil.getText(nextObject, "PD_WHCODE");
+                                                + "; \n仓库：" + FastjsonUtil.getText(nextObject, "PD_WHCODE")
+                                                + "; \n库位：" + FastjsonUtil.getText(nextObject, "BI_LOCATION");
                                 mMaterialInforTextView.setText(materialInfo);
                             } else {
                                 mMaterialInforTextView.setText("该出库单已经完成备料");
@@ -1052,14 +1073,22 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
                 }
                 break;
-            case R.id.iocout_material_oper_scan_iv:
+            case R.id.iocout_material_oper_barcode_scan_iv:
                 if (CameraUtil.hasCamera()) {
-                    if (root.findFocus() != null) {
-                        mFocusId = root.findFocus().getId();
-                        Intent intent = new Intent();
-                        intent.setClass(mActivity, CaptureActivity.class);
-                        startActivityForResult(intent, SCAN_BARCODE_CODE);
-                    }
+                    mFocusId = root.findFocus().getId();
+                    Intent intent = new Intent();
+                    intent.setClass(mActivity, CaptureActivity.class);
+                    startActivityForResult(intent, SCAN_BARCODE_CODE);
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+                break;
+            case R.id.iocout_material_oper_box_scan_iv:
+                if (CameraUtil.hasCamera()) {
+                    mFocusId = root.findFocus().getId();
+                    Intent intent = new Intent();
+                    intent.setClass(mActivity, CaptureActivity.class);
+                    startActivityForResult(intent, SCAN_BOX_CODE);
                 } else {
                     CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
                 }
@@ -1233,15 +1262,21 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             return;
         }
 
-        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+        if (data == null) {
+            return;
+        }
+
+        if (requestCode == SCAN_BARCODE_CODE) {
             if (data.getExtras() != null) {
                 String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
-                if (mFocusId == R.id.et_bar_code) {
-                    etBarCode.setText(result);
-                    etBarCode.setSelection(result.length());
-                    confirmEvent();
-                }
+                etBarCode.setText(result);
+                etBarCode.setSelection(result.length());
+                confirmEvent();
             }
+        } else if (requestCode == SCAN_BOX_CODE) {
+            String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+            mBoxEditText.setText(result);
+            mBoxEditText.setSelection(result.length());
         }
     }
 
@@ -2000,7 +2035,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                             if (tableLPRODIONEEDGET.getLPN_PIID() == deleteLbarcodeio.getLBI_PIID()
                                                     && tableLPRODIONEEDGET.getLPN_WHCODE().equals(deleteLbarcodeio.getLBI_WHCODE())
 //                                                    && tableLPRODIONEEDGET.getLPN_PRODCODE().equals(deleteLbarcodeio.getLBI_PRODCODE())
-                                                    ) {
+                                            ) {
                                                 tableLPRODIONEEDGET.setLPN_RESTQTY(CommonUtil.doubleAddition(tableLPRODIONEEDGET.getLPN_RESTQTY(), deleteLbarcodeio.getLBI_INQTY()));
                                                 mDbManager.updateProductWaitCollect(tableLPRODIONEEDGET);
                                             }

app/src/main/java/com/uas/keg_storage/fragment/IndexWareHouseContentFragment.java

@@ -125,6 +125,11 @@ public class IndexWareHouseContentFragment extends BaseFragment implements Adapt
                     getFragmentManager().beginTransaction().addToBackStack(null)
                             .replace(R.id.container_function_fragment, fragment).commit();
                     break;
+                case GloableParams.GRIDNAME_INFO_BIND:
+                    fragment = new BarcodeInfoBindFragment();
+                    getFragmentManager().beginTransaction().addToBackStack(null)
+                            .replace(R.id.container_function_fragment, fragment).commit();
+                    break;
             }
         }
     }

app/src/main/java/com/uas/keg_storage/fragment/StorageCommonListFragment.java

@@ -145,6 +145,7 @@ public class StorageCommonListFragment extends BaseFragment {
                                         storageStockTaskBean.setPD_WHCODE(FastjsonUtil.getText(needReadyInfoObject, "PD_WHCODE"));
                                         storageStockTaskBean.setPD_WHNAME(FastjsonUtil.getText(needReadyInfoObject, "PD_WHNAME"));
                                         storageStockTaskBean.setPD_PDNO(FastjsonUtil.getText(needReadyInfoObject, "PD_PDNO"));
+                                        storageStockTaskBean.setBI_LOCATION(FastjsonUtil.getText(needReadyInfoObject, "BI_LOCATION"));
                                         storageStockTaskBean.setRN(FastjsonUtil.getInt(needReadyInfoObject, "RN"));
 
                                         mStorageStockTaskBeans.add(storageStockTaskBean);

app/src/main/java/com/uas/keg_storage/fragment/StorageInAddDetailFragment.java

@@ -56,12 +56,13 @@ public class StorageInAddDetailFragment extends BaseFragment implements View.OnC
     private static final int FLAG_SPLITE_PLATE = 25;
 
     private static final int SCAN_BARCODE_CODE = 121;
+    private static final int SCAN_LOCATION_CODE = 122;
     private static final int FLAG_CONFIRM_POST = 0x09;
 
     private TextView mTypeTv, mWhcodeTv, mSupplierTv, mInoutnoTv, mResultTv, mMaterialTv,
             mQuantityTv, mTotalTv, mPoTv, mDatecodeTv, mLotnoTv, mBrandTv;
-    private ClearableEditText mBarcodeEt;
-    private ImageView mScanIv, mSupplierIv;
+    private ClearableEditText mBarcodeEt, mLocationEt;
+    private ImageView mBarcodeScanIv, mLocationScanIv, mSupplierIv;
     private LinearLayout mMessageLl;
     private Button mCommitButton, mMenuButton, mSplitePlateButton;
     private StringRequest mStringRequest;
@@ -116,7 +117,8 @@ public class StorageInAddDetailFragment extends BaseFragment implements View.OnC
         mSupplierTv = (TextView) root.findViewById(R.id.storage_in_add_detail_supplier_tv);
         mInoutnoTv = (TextView) root.findViewById(R.id.storage_in_add_detail_inoutno_tv);
         mBarcodeEt = (ClearableEditText) root.findViewById(R.id.storage_in_add_detail_barcode_et);
-        mScanIv = (ImageView) root.findViewById(R.id.storage_in_add_detail_scan_iv);
+        mLocationEt = root.findViewById(R.id.storage_in_add_detail_location_et);
+        mBarcodeScanIv = (ImageView) root.findViewById(R.id.storage_in_add_detail_scan_iv);
         mSupplierIv = root.findViewById(R.id.storage_in_add_detail_supplier_icon);
         mResultTv = (TextView) root.findViewById(R.id.storage_in_add_detail_result_tv);
         mMaterialTv = (TextView) root.findViewById(R.id.storage_in_add_detail_material_tv);
@@ -129,8 +131,9 @@ public class StorageInAddDetailFragment extends BaseFragment implements View.OnC
         mMessageLl = root.findViewById(R.id.storage_in_add_detail_message_ll);
         mCommitButton = root.findViewById(R.id.storage_in_add_detail_commit_btn);
         mSplitePlateButton = root.findViewById(R.id.storage_in_add_detail_split_plate_btn);
+        mLocationScanIv = root.findViewById(R.id.storage_in_add_detail_location_scan_iv);
 
-        mBarcodeEt.requestFocus();
+        mLocationEt.requestFocus();
     }
 
     @Override
@@ -142,7 +145,15 @@ public class StorageInAddDetailFragment extends BaseFragment implements View.OnC
             }
         });
 
-        mScanIv.setOnClickListener(this);
+        CommonUtil.setEditorActionListener(mLocationEt, new MyEditorActionListener() {
+            @Override
+            public void MyEditorAction(String text, int actionId, KeyEvent event) {
+                mBarcodeEt.requestFocus();
+            }
+        });
+
+        mBarcodeScanIv.setOnClickListener(this);
+        mLocationScanIv.setOnClickListener(this);
         mCommitButton.setOnClickListener(this);
         mSplitePlateButton.setOnClickListener(this);
         mMenuButton.setOnClickListener(this);
@@ -151,26 +162,31 @@ public class StorageInAddDetailFragment extends BaseFragment implements View.OnC
         mSupplierIv.setOnClickListener(this);
     }
 
-    private void getBarcodeInfo(String text, boolean isRepeat) {
+    private void getBarcodeInfo(String barcode, boolean isRepeat) {
         int repeat = 0;
         if (isRepeat) {
             repeat = -1;
         }
-        if (TextUtils.isEmpty(text)) {
+        if (TextUtils.isEmpty(barcode)) {
             CommonUtil.toastNoRepeat(getActivity(), "请采集条码");
-        } else if (!text.matches(Constants.REGEX.NO_SYMBOL)) {
-            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
-        } else {
+        }
+//        else if (!barcode.matches(Constants.REGEX.NO_SYMBOL)) {
+//            CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.barcode_cannot_contain_special));
+//        }
+        else {
             if (CommonUtil.isNetWorkConnected(getActivity())) {
                 progressDialog.show();
+                String location = mLocationEt.getText().toString().trim();
                 VollyRequest.getInstance().stringRequest(mStringRequest,
                         new HttpParams.Builder()
-                                .url(GloableParams.ADDRESS_PDAIO_IN_GETBARCODEINFO
-                                        + "?inoutno=" + mPiInoutno
-                                        + "&barcode=" + CommonUtil.stringEncode(text) + "&allowRepeat=" + repeat)
+                                .url(GloableParams.ADDRESS_PDAIO_IN_GETBARCODEINFO)
                                 .method(Request.Method.GET)
                                 .flag(FLAG_BARCODE_INFO)
                                 .tag(TAG + "getbarcodeinfo")
+                                .addParam("inoutno", mPiInoutno)
+                                .addParam("barcode", barcode)
+                                .addParam("location", location)
+                                .addParam("allowRepeat", repeat + "")
                                 .build(), StorageInAddDetailFragment.this);
             } else {
                 CommonUtil.toastNoRepeat(getActivity(), getResources().getString(R.string.str_net_not_connect));
@@ -197,13 +213,18 @@ public class StorageInAddDetailFragment extends BaseFragment implements View.OnC
         switch (view.getId()) {
             case R.id.storage_in_add_detail_scan_iv:
                 if (CameraUtil.hasCamera()) {
-                    if (root.findFocus() != null) {
-                        Intent intent = new Intent();
-                        intent.setClass(mActivity, CaptureActivity.class);
-                        startActivityForResult(intent, SCAN_BARCODE_CODE);
-                    } else {
-                        CommonUtil.toastNoRepeat(mActivity, "请选择您要操作的输入框");
-                    }
+                    Intent intent = new Intent();
+                    intent.setClass(mActivity, CaptureActivity.class);
+                    startActivityForResult(intent, SCAN_BARCODE_CODE);
+                } else {
+                    CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
+                }
+                break;
+            case R.id.storage_in_add_detail_location_scan_iv:
+                if (CameraUtil.hasCamera()) {
+                    Intent intent = new Intent();
+                    intent.setClass(mActivity, CaptureActivity.class);
+                    startActivityForResult(intent, SCAN_LOCATION_CODE);
                 } else {
                     CommonUtil.toastNoRepeat(mActivity, getString(R.string.no_camera_detected));
                 }
@@ -389,7 +410,11 @@ public class StorageInAddDetailFragment extends BaseFragment implements View.OnC
             return;
         }
 
-        if (requestCode == SCAN_BARCODE_CODE && data != null) {
+        if (data == null) {
+            return;
+        }
+
+        if (requestCode == SCAN_BARCODE_CODE) {
             if (data.getExtras() != null) {
                 String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
                 mBarcodeEt.setText(result);
@@ -397,6 +422,12 @@ public class StorageInAddDetailFragment extends BaseFragment implements View.OnC
 
                 getBarcodeInfo(result, false);
             }
+        } else if (requestCode == SCAN_LOCATION_CODE) {
+            if (data.getExtras() != null) {
+                String result = data.getExtras().getString(CodeUtils.RESULT_STRING);
+                mLocationEt.setText(result);
+                mLocationEt.setSelection(result.length());
+            }
         }
     }
 

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

@@ -206,6 +206,8 @@ public class GloableParams {
     public static String ADDRESS_BARSTOCK_GETBARCODEINFO;
     public static String ADDRESS_BARSTOCK_DELETEBARCODEIO;
     public static String ADDRESS_BARSTOCK_GETPRODINOUTQTYSUM;
+    public static String ADDRESS_PDAIOIN_BARCODEINFOBIND;
+    public static String ADDRESS_PDAIO_IN_GETBARCODEINFORMATION;
 
 
     //连接服务器请求地址
@@ -217,6 +219,11 @@ public class GloableParams {
     //退出登录请求地址
     private static final String ADDRESSTAIL_LOGOUT_APPLY = "/api/pda/logout.action";
 
+    /**
+     * 条码信息绑定
+     */
+    private static final String ADDRESSTAIL_PDAIOIN_BARCODEINFOBIND = "/api/pdaio/pdaioIn/barcodeInfoBind.action";
+
     /**
      * 盘点工作
      */
@@ -523,6 +530,8 @@ public class GloableParams {
     private static final String ADDRESSTAIL_PDAIO_IN_NEWPRODINOUT = "/api/pdaio/pdaioIn/newProdinout.action";
     //获取条码信息
     private static final String ADDRESSTAIL_PDAIO_IN_GETBARCODEINFO = "/api/pdaio/pdaioIn/getBarcodeInfo.action";
+    //获取条码信息(凯尔高)
+    private static final String ADDRESSTAIL_PDAIO_IN_GETBARCODEINFORMATION = "/api/pdaio/pdaioIn/getBarcodeInforMation.action";
     //入库单确认入库
     private static final String ADDRESSTAIL_PDAIO_IN_NEWPRODIODETAIL = "/api/pdaio/pdaioIn/newProdiodetail.action";
     //删除入库单据
@@ -613,8 +622,15 @@ public class GloableParams {
     public static final String GRIDNAME_STOCK_BARCODE = "补贴库存条码";
     public static final String GRIDNAME_WORK_INVENTORY = "盘点作业";
     public static final String GRIDNAME_MODIFY_QUANTITY = "条码数量修改";
-    public static final String[] storageGridNames = {GRIDNAME_GOOD_SEARCH, GRIDNAME_BATCH_OPRATION, GRIDNAME_STORAGE_TRANSFER, GRIDNAME_MSD_MANAGER, GRIDNAME_STOCK_BARCODE, GRIDNAME_WORK_INVENTORY, GRIDNAME_MODIFY_QUANTITY};
-    public static final int[] storageGridImgs = {R.drawable.storage_good_search, R.drawable.storage_bach_operation, R.drawable.storage_transfer, R.drawable.storage_msd_manager, R.drawable.ic_stock_barcode, R.drawable.storage_work_inventory, R.drawable.ic_modify_quantity};
+    public static final String GRIDNAME_INFO_BIND = "条码信息绑定";
+    public static final String[] storageGridNames = {GRIDNAME_GOOD_SEARCH, GRIDNAME_BATCH_OPRATION,
+            GRIDNAME_STORAGE_TRANSFER, GRIDNAME_MSD_MANAGER, GRIDNAME_STOCK_BARCODE,
+            GRIDNAME_WORK_INVENTORY, GRIDNAME_MODIFY_QUANTITY, GRIDNAME_INFO_BIND};
+    public static final int[] storageGridImgs = {R.drawable.storage_good_search,
+            R.drawable.storage_bach_operation, R.drawable.storage_transfer,
+            R.drawable.storage_msd_manager, R.drawable.ic_stock_barcode,
+            R.drawable.storage_work_inventory, R.drawable.ic_modify_quantity,
+            R.drawable.ic_barcode_bind};
     //DETAIL:搜索备料单号，下拉列表
     public static final String SPINNER_PREPARE_SEARCH = "搜索备料单号";
     public static final String SPINNER_MAKECODE_SEARCH = "搜索制造单号";
@@ -890,5 +906,7 @@ public class GloableParams {
         GloableParams.ADDRESS_BARSTOCK_GETBARCODEINFO = uriHead + GloableParams.ADDRESSTAIL_BARSTOCK_GETBARCODEINFO;
         GloableParams.ADDRESS_BARSTOCK_DELETEBARCODEIO = uriHead + GloableParams.ADDRESSTAIL_BARSTOCK_DELETEBARCODEIO;
         GloableParams.ADDRESS_BARSTOCK_GETPRODINOUTQTYSUM = uriHead + GloableParams.ADDRESSTAIL_BARSTOCK_GETPRODINOUTQTYSUM;
+        GloableParams.ADDRESS_PDAIOIN_BARCODEINFOBIND = uriHead + GloableParams.ADDRESSTAIL_PDAIOIN_BARCODEINFOBIND;
+        GloableParams.ADDRESS_PDAIO_IN_GETBARCODEINFORMATION = uriHead + GloableParams.ADDRESSTAIL_PDAIO_IN_GETBARCODEINFORMATION;
     }
 }

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

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="@dimen/padding_normal">
+
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="1">
+
+
+        <TableRow
+            android:layout_marginTop="5dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="条码"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <com.uas.keg_storage.view.ClearableEditText
+                android:id="@+id/barcode_info_bind_barcode_cet"
+                style="@style/EditTextStyle"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请采集条码"
+                android:imeOptions="actionSend"
+                android:textColor="@color/black" />
+        </TableRow>
+
+
+        <TableRow
+            android:layout_marginTop="5dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="DC"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <com.uas.keg_storage.view.ClearableEditText
+                android:id="@+id/barcode_info_bind_dc_cet"
+                style="@style/EditTextStyle"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请采集生产日期"
+                android:textColor="@color/black" />
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="5dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="LOTNO"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <com.uas.keg_storage.view.ClearableEditText
+                android:id="@+id/barcode_info_bind_lotno_cet"
+                style="@style/EditTextStyle"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请采集出厂批号"
+                android:textColor="@color/black" />
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="5dp">
+
+            <TextView
+                style="@style/tl_tv_style"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="库位"
+                android:textColor="@color/body_text_1"
+                android:textSize="16sp" />
+
+            <com.uas.keg_storage.view.ClearableEditText
+                android:id="@+id/barcode_info_bind_location_cet"
+                style="@style/EditTextStyle"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:hint="请采集库位"
+                android:textColor="@color/black" />
+        </TableRow>
+    </TableLayout>
+
+    <Button
+        android:id="@+id/barcode_info_bind_confirm_btn"
+        style="@style/ButtonStyle"
+        android:text="@string/confirm" />
+
+
+    <TextView
+        android:id="@+id/barcode_info_bind_result_tv"
+        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"
+        android:visibility="gone"
+        tools:text="采集成功，条码：786528238；数量：2；料号：209837；名称规格：瓶子" />
+
+</LinearLayout>

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

@@ -1,8 +1,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:tools="http://schemas.android.com/tools"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:context="com.uas.keg_storage.fragment.IOCOutMakeMaterialOper">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.uas.keg_storage.fragment.IOCOutMakeMaterialOper">
     <!--    <include
             android:id="@+id/include_menuactionbar"
             layout="@layout/actionbar_withback" />-->
@@ -181,9 +181,51 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginTop="6dp"
+                    android:background="@drawable/bg_line_edittext">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingHorizontal="12dp"
+                        android:text="箱号" />
+
+                    <com.uas.keg_storage.view.ClearableEditText
+                        android:id="@+id/iocout_material_oper_box_et"
+                        style="@style/EditTextStyle"
+                        android:layout_weight="1"
+                        android:background="@null"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:hint="请采集外箱条码号"
+                        android:imeOptions="actionSend"
+                        android:singleLine="false"
+                        android:textColor="@color/black" />
+
+                    <ImageView
+                        android:id="@+id/iocout_material_oper_box_scan_iv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="10dp"
+                        android:clickable="false"
+                        android:src="@drawable/ic_edittext_scan" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
                     android:background="@drawable/bg_line_edittext">
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingHorizontal="12dp"
+                        android:text="条码" />
+
                     <com.uas.keg_storage.view.ClearableEditText
                         android:id="@+id/et_bar_code"
                         style="@style/EditTextStyle"
@@ -197,7 +239,7 @@
                         android:textColor="@color/black" />
 
                     <ImageView
-                        android:id="@+id/iocout_material_oper_scan_iv"
+                        android:id="@+id/iocout_material_oper_barcode_scan_iv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -217,8 +259,8 @@
                     android:id="@+id/iocout_collect_barcode_tl"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dp"
                     android:layout_marginTop="@dimen/spacing_big"
+                    android:layout_marginBottom="5dp"
                     android:background="@drawable/bg_button_enabled"
                     android:padding="10dp"
                     android:stretchColumns="1"
@@ -279,8 +321,8 @@
                     android:id="@+id/iocout_collect_box_tl"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="5dp"
                     android:layout_marginTop="@dimen/spacing_big"
+                    android:layout_marginBottom="5dp"
                     android:background="@drawable/bg_button_enabled"
                     android:padding="10dp"
                     android:stretchColumns="1"

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

@@ -167,20 +167,27 @@
                     android:layout_height="wrap_content"
                     android:background="@drawable/bg_line_edittext">
 
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:paddingHorizontal="10dp"
+                        android:text="库位" />
+
                     <com.uas.keg_storage.view.ClearableEditText
-                        android:id="@+id/storage_in_add_detail_barcode_et"
+                        android:id="@+id/storage_in_add_detail_location_et"
                         style="@style/EditTextStyle"
                         android:layout_weight="1"
                         android:background="@null"
                         android:focusable="true"
                         android:focusableInTouchMode="true"
-                        android:hint="请采集条码号"
+                        android:hint="请采集库位"
                         android:imeOptions="actionSend"
                         android:singleLine="false"
                         android:textColor="@color/black" />
 
                     <ImageView
-                        android:id="@+id/storage_in_add_detail_scan_iv"
+                        android:id="@+id/storage_in_add_detail_location_scan_iv"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
@@ -192,27 +199,36 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp">
+                    android:layout_marginTop="6dp"
+                    android:background="@drawable/bg_line_edittext">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingHorizontal="24dp"
-                        android:text="仓位"
-                        android:textColor="#333333"
-                        android:textSize="14sp" />
+                        android:layout_gravity="center_vertical"
+                        android:paddingHorizontal="10dp"
+                        android:text="条码" />
 
                     <com.uas.keg_storage.view.ClearableEditText
-                        android:id="@+id/storage_in_add_detail_location_et"
-                        style="@style/EditTextLineStyle"
+                        android:id="@+id/storage_in_add_detail_barcode_et"
+                        style="@style/EditTextStyle"
                         android:layout_weight="1"
                         android:background="@null"
                         android:focusable="true"
                         android:focusableInTouchMode="true"
-                        android:hint="请采集仓位"
+                        android:hint="请采集条码号"
                         android:imeOptions="actionSend"
                         android:singleLine="false"
                         android:textColor="@color/black" />
+
+                    <ImageView
+                        android:id="@+id/storage_in_add_detail_scan_iv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="10dp"
+                        android:clickable="false"
+                        android:src="@drawable/ic_edittext_scan" />
                 </LinearLayout>
 
                 <TextView
@@ -429,7 +445,8 @@
             style="@style/ButtonStyle"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:text="确认分板" />
+            android:text="确认分板"
+            android:visibility="gone" />
 
         <Button
             android:id="@+id/storage_in_add_detail_commit_btn"

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

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:paddingBottom="4dp"
     android:paddingLeft="8dp"
+    android:paddingTop="4dp"
     android:paddingRight="4dp"
-    android:paddingTop="4dp">
+    android:paddingBottom="4dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -187,4 +186,26 @@
             tools:text="序号" />
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="3dp">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:text="库位:"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/list_storage_stock_task_location_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:textColor="#333"
+            android:textSize="14sp"
+            tools:text="库位" />
+    </LinearLayout>
+
 </LinearLayout>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu May 09 09:35:07 CST 2019
+#Mon May 20 19:12:18 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-milestone-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip