条码入库修复缺失数据问题, 去除单据入库, 完工品入库, 抽查校验功能, 收料增加免检提示, 条码入库增加储位和库存总数

app/src/main/java/com/uas/jc_wms/activity/IndexActivity.java

@@ -97,7 +97,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
-
                     }
 
                     @Override
@@ -119,7 +118,6 @@ public class IndexActivity extends BaseActivity implements AdapterView.OnItemCli
                 new int[]{R.id.griditem_img, R.id.griditem_name});
         menuGridView.setAdapter(adapter);
 
-
         View view = View.inflate(this, R.layout.pop_exit_application, null);
         mCancelTextView = (TextView) view.findViewById(R.id.pop_exit_cancel_tv);
         mMinimizeTextView = (TextView) view.findViewById(R.id.pop_exit_minimize_tv);

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

@@ -10,6 +10,24 @@ public class MaintainitemBean {
     private String MA_PROJECT;
     private int BAN_QTY;
     private boolean isChecked;
+    private String PR_LOCATION;      //储位
+    private String ONHAND;      //库存总数
+
+    public String getPR_LOCATION() {
+        return PR_LOCATION;
+    }
+
+    public void setPR_LOCATION(String PR_LOCATION) {
+        this.PR_LOCATION = PR_LOCATION;
+    }
+
+    public String getONHAND() {
+        return ONHAND;
+    }
+
+    public void setONHAND(String ONHAND) {
+        this.ONHAND = ONHAND;
+    }
 
     public String getMA_PROJECT() {
         return MA_PROJECT;

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

@@ -255,6 +255,8 @@ public class BarcodeInCollectFragment extends BaseFragment {
             bean.setBAN_QTY(data.getInteger("BAN_QTY"));
             bean.setBAN_PRODCODE(data.getString("BAN_PRODCODE"));
             bean.setMA_PROJECT(data.getString("MA_PROJECT"));
+            bean.setPR_LOCATION(data.getString("PR_LOCATION"));
+            bean.setONHAND(data.getString("ONHAND"));
             bean.setChecked(false);
             mFeededList.add(bean);
         }
@@ -505,6 +507,10 @@ public class BarcodeInCollectFragment extends BaseFragment {
             ((ListItemViewHolder) holder).tv_data2.setText(String.valueOf(mList.get(i).getBAN_PRODCODE()));
             ((ListItemViewHolder) holder).tv_data3.setText(String.valueOf(mList.get(i).getPR_DETAIL()));
             ((ListItemViewHolder) holder).tv_data4.setText(String.valueOf(mList.get(i).getPR_SPEC()));
+
+            ((ListItemViewHolder) holder).tv_chuwei.setText(String.valueOf(mList.get(i).getPR_LOCATION()));
+            ((ListItemViewHolder) holder).tv_kucunzhongshu.setText(String.valueOf(mList.get(i).getONHAND()));
+
             ((ListItemViewHolder) holder).tv_data5.setText(String.valueOf(mList.get(i).getBAN_QTY()));
             ((ListItemViewHolder) holder).tv_data6.setText(String.valueOf(mList.get(i).getMA_PROJECT()));
 
@@ -589,8 +595,11 @@ public class BarcodeInCollectFragment extends BaseFragment {
             TextView tv_data2;
             TextView tv_data3;
             TextView tv_data4;
+            TextView tv_chuwei;
+            TextView tv_kucunzhongshu;
             TextView tv_data5;
             TextView tv_data6;
+
             LinearLayout ll_layout;
 
             ListItemViewHolder(View view) {
@@ -599,9 +608,12 @@ public class BarcodeInCollectFragment extends BaseFragment {
                 this.tv_data2 = (TextView) view.findViewById(R.id.tv_data2);
                 this.tv_data3 = (TextView) view.findViewById(R.id.tv_data3);
                 this.tv_data4 = (TextView) view.findViewById(R.id.tv_data4);
+                this.tv_chuwei = (TextView) view.findViewById(R.id.tv_chuwei);
+                this.tv_kucunzhongshu = (TextView) view.findViewById(R.id.tv_kucunzhongshu);
                 this.checkBox = (CheckBox) view.findViewById(R.id.select_checkbox);
                 this.tv_data5 = (TextView) view.findViewById(R.id.tv_data5);
                 this.tv_data6 = (TextView) view.findViewById(R.id.tv_data6);
+
                 this.ll_layout = (LinearLayout) view.findViewById(R.id.ll_layout);
             }
         }

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

@@ -37,6 +37,7 @@ 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.MyLog;
 import com.uas.jc_wms.util.VolleyRequest;
 import com.uas.jc_wms.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
@@ -66,7 +67,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
     private LinearLayout mDataLinearLayout;
     private ListView mDataListView;
     private ScrollView mErrorScrollView;
-    private TextView mErrorTextView, mHeaderBarcodeTextView, mHeaderReceiptTextView,
+    private TextView mErrorTextView, tv_is_mianjian,mHeaderBarcodeTextView, mHeaderReceiptTextView,
             mHeaderSupplierTextView, mHeaderStateTextView,tv_total;
     private List<StorageRechargeListBean> mStorageRechargeListBeans;
     private StorageRechargeAdapter mStorageRechargeAdapter;
@@ -99,6 +100,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
 
 
         View headerView = View.inflate(mActivity, R.layout.header_storage_recharge_list, null);
+        tv_is_mianjian = (TextView) headerView.findViewById(R.id.tv_is_mianjian);
         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);
@@ -361,10 +363,8 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
         if (TextUtils.isEmpty(barcode)) {
             return;
         }
-
         hideAllViews();
         progressDialog.show();
-
         VolleyRequest.getInstance().stringRequest(mStringRequest,
                 new HttpParams.Builder()
                         .url(GloableParams.ADDRESS_RECHARGE_GETDATA_BARCODE + "?bar_code=" + barcode)
@@ -388,6 +388,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
 
     @Override
     public void onSuccess(int flag, Object o) throws Exception {
+        MyLog.e("aaa", "数据flag:" + flag + ",数据o:" + o.toString());
         switch (flag) {
             case FLAG_GET_BARCODE:
                 mBarcodeEditText.setText("");
@@ -473,7 +474,6 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
             default:
                 break;
         }
-
     }
 
     private void analysisTurnVerify(String result) {
@@ -523,6 +523,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
         Log.d("rechargeBarcode", result);
         JSONObject resultObject = JSON.parseObject(result);
         JSONObject dataObject = resultObject.getJSONObject("data");
+        boolean pr_acceptmethod_b = false;      //是否为免检产品
         if (dataObject != null) {
             mHeaderBarcodeTextView.setText(FastjsonUtil.getText(dataObject, "barcode"));
             JSONObject mainObject = dataObject.getJSONObject("main");
@@ -550,6 +551,12 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
 
                         total += FastjsonUtil.getDouble(detailObject, "AND_INQTY");
                         mStorageRechargeListBeans.add(storageRechargeListBean);
+
+                        // 1是不检验  其它都是检验
+                        String pr_acceptmethod = FastjsonUtil.getText(detailObject, "pr_acceptmethod");
+                        if (!TextUtils.isEmpty(pr_acceptmethod) && pr_acceptmethod.equals("1")) {
+                            pr_acceptmethod_b = true;
+                        }
                     }
                 }
                 tv_total.setText(String.valueOf(total));
@@ -568,6 +575,11 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
 //                    mChangeButton.setVisibility(View.VISIBLE);
 //                }
 //            }
+            if (pr_acceptmethod_b) {    //是否有免检物料
+                tv_is_mianjian.setVisibility(View.VISIBLE);
+            }else {
+                tv_is_mianjian.setVisibility(View.GONE);
+            }
             mErrorScrollView.setVisibility(View.GONE);
             mDataLinearLayout.setVisibility(View.VISIBLE);
         }

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

@@ -567,7 +567,7 @@ public class GloableParams {
     private static final String ADDRESSTAIL_OUTFUZZYSEARCH = "/api/pda/outMaterial/fuzzySearch.action";
     private static final String ADDRESSTAIL_OUTFUZZYSEARCH2 = "/api/pda/outMaterial/fuzzySearchCheck.action";
     private static final String ADDRESSTAIL_OUTGETPRODOUT = "/api/pda/outMaterial/getProdOut.action";
-    private static final String ADDRESSTAIL_OUTGETPRODOUT2= "/api/pda/outMaterial/getProdInOut.action";
+    private static final String ADDRESSTAIL_OUTGETPRODOUT2 = "/api/pda/outMaterial/getProdInOut.action";
     private static final String ADDRESSTAIL_OUT_GET_PRODOUT_STATUS = "/api/pda/outMaterial/getProdOutStatus.action";
     private static final String ADDRESSTAIL_CLEARGET = "/api/pda/common/clearGet.action";
     // 仓库管理:出库管理，页面二：材料出库采集页面
@@ -609,12 +609,12 @@ public class GloableParams {
     private static final String ADDRESSTAIL_RECEIVING_BARCODEPARSE2 = "/api/pda/receiving/barcodeParse2.action";
     //入库条码解析
     private static final String ADDRESSTAIL_JLT_RECEIVING_BARCODEPARSE = "/api/pda/receiving/barcodeParse.action";
-    private static final String ADDRESSTAIL_INVENTORYBINDING="/api/pda/receiving/stocksaveBarcode2Confirm.action";
+    private static final String ADDRESSTAIL_INVENTORYBINDING = "/api/pda/receiving/stocksaveBarcode2Confirm.action";
     private static final String ADDRESSTAIL_RECEIVING_INVENTORYBINDING2 = "/api/pda/receiving/stocksaveBarcode2.action";
     //单据过账
     private static final String ADDRESSTAIL_PDAIO_CONFIRMPOST = "/api/pdaio/pdaioIn/confirmPost.action";
     //入库待采提示
-    private static final String ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT="/api/pda/receiving/getNeedList2.action";
+    private static final String ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT = "/api/pda/receiving/getNeedList2.action";
     //入库待采集列表
     private static final String ADDRESSTAIL_JLT_RECEIVING_GETNEEDLIST = "/api/pda/receiving/getNeedList.action";
     private static final String ADDRESSTAIL_JLT_RECEIVING_GETCOLLECTLISTBYBOX = "/api/pda/receiving/getCollectListByBox.action";
@@ -622,10 +622,10 @@ public class GloableParams {
     private static final String ADDRESSTAIL_RECEIVING_NEWBAOCODEIO = "/api/pda/receiving/newBaocodeio.action";
     private static final String ADDRESSTAIL_PDAIOOUT_DELELTEPREBIOBYID = "/api/pdaio/pdaioOut/deleltePreBioById.action";
     //入库扫描已采集列表长按删除
-    private static final String ADDRESSTAIL_PDAIO_GET_lOGINDELETE="/api/pda/receiving/deleteAllBarDetails.action";
+    private static final String ADDRESSTAIL_PDAIO_GET_lOGINDELETE = "/api/pda/receiving/deleteAllBarDetails.action";
 
     //入库扫描保存
-    private static final String ADDRESSTAIL_PDAIO_PUT_SAVEBARCODE2CONFIRM="/api/pda/receiving/saveBarcode2Confirm.action";
+    private static final String ADDRESSTAIL_PDAIO_PUT_SAVEBARCODE2CONFIRM = "/api/pda/receiving/saveBarcode2Confirm.action";
     //入库采集
     private static final String ADDRESSTAIL_RECEIVING_SAVEBARCODE2 = "/api/pda/receiving/saveBarcode2.action";
     //校验外箱号
@@ -645,7 +645,7 @@ public class GloableParams {
     private static final String ADDRESSTAIL_MAKEOUTWARHOUSE = "/api/pda/receiving/makeOutWarhouse.action";
     //    新增出库单
     private static String ADDRESSTAIL_ADD_OUTBOUNDLIST = "/api/pda/outMaterial/saveBarcodeio.action";
-//    private static String ADDRESSTAIL_ADD_OUTBOUNDLIST = "/api/pda/outMaterial/checkBarcode.action";
+    //    private static String ADDRESSTAIL_ADD_OUTBOUNDLIST = "/api/pda/outMaterial/checkBarcode.action";
     //出货单明细
     private static String ADDRESSTAIL_DETAIL_OUTBOUNDLISTS = "/api/pda/outMaterial/getProdinout.action";
     private static String ADDRESSTAIL_DETAIL_OUTBOUNDLIST = "/api/pda/outMaterial/genProdiodetail.action";
@@ -754,8 +754,6 @@ public class GloableParams {
     private static final String ADDRESSTAIL_DELETE_AND_INQTY = "/api/pda/acceptNToVerify/deleteAndInqty.action";
 
 
-
-
     /***********************************************************************************************/
     /*界面文字和图片资源,控制后续数据一致*/
     //主界面
@@ -770,11 +768,20 @@ public class GloableParams {
     public static final String GRIDNAME_STORAGE_MANAGER = "仓库管理";
     public static final String GRIDNAME_SETTING = "设置";
     public static final String GRIDNAME_WORK_ORDER_MATERIAL_VERIFICATION = "工单物料核对";
-    public static String[] indexMainGridNames = {GRIDNAME_IN_STORAGE, GRIDNAME_OUT_STORAGE,
-            GRIDNAME_STORAGE_MANAGER, GRIDNAME_SETTING,GRIDNAME_WORK_ORDER_MATERIAL_VERIFICATION};
-    public static int[] indexMainGridImgs = {R.drawable.ic_storage_in,
-            R.drawable.ic_storage_out, R.drawable.mainmenu_storehousemanager,
-            R.drawable.mainmenu_usersetting,R.drawable.iv_hed};
+    public static String[] indexMainGridNames = {
+            GRIDNAME_IN_STORAGE,
+            GRIDNAME_OUT_STORAGE,
+            GRIDNAME_STORAGE_MANAGER,
+            GRIDNAME_SETTING,
+            GRIDNAME_WORK_ORDER_MATERIAL_VERIFICATION
+    };
+    public static int[] indexMainGridImgs = {
+            R.drawable.ic_storage_in,
+            R.drawable.ic_storage_out,
+            R.drawable.mainmenu_storehousemanager,
+            R.drawable.mainmenu_usersetting,
+            R.drawable.iv_hed
+    };
     //INDEX:出入库管理Index
     public static final String GRIDNAME_CODEBAR_COLLECT = "入库";
     public static final String GRIDNAME_CODEBAR_VERIFY = "出库";
@@ -804,31 +811,31 @@ 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 GRIDNAME_BOM_CHECK = "BOM校验";
+    //    public static final String GRIDNAME_BOM_CHECK = "BOM校验";
     public static final String MENU_STORAGE_STOCK_INFO_COLLECT = "库存条码绑定";
     public static final String GRIDNAME_FINISHED_PRODUCT_STORAGE = "成品入库";
     public static final String GRIDNAME_FINISHED_PRODUCT_OUTBOUND = "成品出库";
-//    public static final String GRIDNAME_EQUIPMENT_CYCLECOUNT_OUTBOUND = "设备周期盘点";
-//    public static final String WORK_ORDER_MATERIAL_CHECK= "工单物料核对";
+    //    public static final String GRIDNAME_EQUIPMENT_CYCLECOUNT_OUTBOUND = "设备周期盘点";
+    //    public static final String WORK_ORDER_MATERIAL_CHECK= "工单物料核对";
     public static final String[] storageGridNames = {GRIDNAME_GOOD_SEARCH, GRIDNAME_BATCH_OPRATION,
             GRIDNAME_STORAGE_TRANSFER, GRIDNAME_MODIFY_QUANTITY, GRIDNAME_WORK_INVENTORY,
-//            GRIDNAME_BOM_CHECK,
+            //            GRIDNAME_BOM_CHECK,
             MENU_STORAGE_STOCK_INFO_COLLECT,
             GRIDNAME_FINISHED_PRODUCT_STORAGE,
             GRIDNAME_FINISHED_PRODUCT_OUTBOUND,
-//            GRIDNAME_EQUIPMENT_CYCLECOUNT_OUTBOUND,
-//            WORK_ORDER_MATERIAL_CHECK
+            //            GRIDNAME_EQUIPMENT_CYCLECOUNT_OUTBOUND,
+            //            WORK_ORDER_MATERIAL_CHECK
     };
     public static final int[] storageGridImgs = {R.drawable.storage_good_search,
             R.drawable.storage_bach_operation, R.drawable.storage_transfer,
             R.drawable.storage_work_inventory,
             R.drawable.ic_modify_quantity,
-//            R.drawable.storage_msd_manager,
+            //            R.drawable.storage_msd_manager,
             R.drawable.storage_transfer,
             R.drawable.ic_finished_product_storage,
             R.drawable.ic_finished_product_outbound,
-//            R.drawable.equipment,
-//            R.drawable.iv_hed
+            //            R.drawable.equipment,
+            //            R.drawable.iv_hed
     };
     //DETAIL:搜索备料单号，下拉列表
     public static final String SPINNER_PREPARE_SEARCH = "搜索备料单号";
@@ -868,25 +875,25 @@ public class GloableParams {
     public static final String MENU_STORAGE_RECHARGE = "收料";
     public static final String MENU_STORAGE_INSPECTION = "送检";
     public static final String MENU_STORAGE_IQC_STORAGE_IN = "IQC入库";
-//    public static final String MENU_STORAGE_MATERIAL_STORAGE_IN = "单据入库";
+    //    public static final String MENU_STORAGE_MATERIAL_STORAGE_IN = "单据入库";
     //    public static final String MENU_STORAGE_PRODUCT_CHECK = "成品检验";
-//    public static final String MENU_STORAGE_PRODUCT_STORAGE_IN = "完工品入库";
-//    public static final String MENU_STORAGE_RANDOM_CHECK = "抽查校验";
+    //    public static final String MENU_STORAGE_PRODUCT_STORAGE_IN = "完工品入库";
+    //    public static final String MENU_STORAGE_RANDOM_CHECK = "抽查校验";
     public static final String MENU_STORAGE_BARCODE_IN = "条码入库";
     public static final String MENU_STORAGE_BARCODE_INFO_COLLECT = "条码信息采集";
 
     public static final String[] storageInMenuNames = {
             MENU_STORAGE_RECHARGE, MENU_STORAGE_INSPECTION, MENU_STORAGE_IQC_STORAGE_IN,
-//            MENU_STORAGE_MATERIAL_STORAGE_IN,
-//            MENU_STORAGE_PRODUCT_STORAGE_IN,
-//            MENU_STORAGE_RANDOM_CHECK,
+            //            MENU_STORAGE_MATERIAL_STORAGE_IN,
+            //            MENU_STORAGE_PRODUCT_STORAGE_IN,
+            //            MENU_STORAGE_RANDOM_CHECK,
             MENU_STORAGE_BARCODE_IN,
             MENU_STORAGE_BARCODE_INFO_COLLECT};
     public static final int[] storageInMenuImgs = {
             R.drawable.ic_storage_recharge, R.drawable.ic_storage_inspection, R.drawable.ic_storage_iqc,
-//            R.drawable.ic_storage_material_in,
-//            R.drawable.ic_storage_finish_in,
-//            R.drawable.ic_storage_random_check,
+            //            R.drawable.ic_storage_material_in,
+            //            R.drawable.ic_storage_finish_in,
+            //            R.drawable.ic_storage_random_check,
             R.drawable.ic_storage_barcode_in,
             R.drawable.ic_barcode_info_collect};
 
@@ -912,17 +919,17 @@ public class GloableParams {
     public static final String LISTNAME_WH_CHECKCONTENT_ORDERFINISH = "订单完工品核查";
     public static final String[] mmindexListName = {
             LISTNAME_WH_CHECKCONTENT_MAKEMATERIAL,
-        LISTNAME_WH_CHECKCONTENT_BARCODE,
-//            LISTNAME_WH_CHECKCONTENT_PACKAGE,
-//        LISTNAME_WH_CHECKCONTENT_MAKEFINISH,
-//        LISTNAME_WH_CHECKCONTENT_ORDERFINISH
+            LISTNAME_WH_CHECKCONTENT_BARCODE,
+            //            LISTNAME_WH_CHECKCONTENT_PACKAGE,
+            //        LISTNAME_WH_CHECKCONTENT_MAKEFINISH,
+            //        LISTNAME_WH_CHECKCONTENT_ORDERFINISH
     };
     public static final int[] mmindexListImg = {
             R.drawable.ic_menu_head,
             R.drawable.ic_menu_head,
-//            R.drawable.ic_menu_head,
-//            R.drawable.ic_menu_head,
-//            R.drawable.ic_menu_head
+            //            R.drawable.ic_menu_head,
+            //            R.drawable.ic_menu_head,
+            //            R.drawable.ic_menu_head
     };
     //INDEX:setting Index
 
@@ -1160,8 +1167,8 @@ public class GloableParams {
         GloableParams.ADDRESS_OUTMATERIAL_GETPREMATERIALLIST = uriHead + GloableParams.ADDRESSTAIL_OUTMATERIAL_GETPREMATERIALLIST;
         GloableParams.ADDRESS_RECEIVING_BARCODEPARSE2 = uriHead + GloableParams.ADDRESSTAIL_RECEIVING_BARCODEPARSE2;
         GloableParams.ADDRESS_JLT_RECEIVING_BARCODEPARSE = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_BARCODEPARSE;
-        GloableParams.ADDRESS_INVENTORYBINDING= uriHead + GloableParams.ADDRESSTAIL_INVENTORYBINDING;
-        GloableParams.ADDRESS_INVENTORYBINDING2= uriHead + GloableParams.ADDRESSTAIL_RECEIVING_INVENTORYBINDING2;
+        GloableParams.ADDRESS_INVENTORYBINDING = uriHead + GloableParams.ADDRESSTAIL_INVENTORYBINDING;
+        GloableParams.ADDRESS_INVENTORYBINDING2 = uriHead + GloableParams.ADDRESSTAIL_RECEIVING_INVENTORYBINDING2;
         GloableParams.ADDRESS_PDAIO_CONFIRMPOST = uriHead + GloableParams.ADDRESSTAIL_PDAIO_CONFIRMPOST;
         GloableParams.ADDRESS_PUTMATERIAL_TOADOPTPROMPT = uriHead + GloableParams.ADDRESSTAIL_PDAIO_GET_TOADOPTPROMPT;
         GloableParams.ADDRESS_JLT_RECEIVING_GETNEEDLIST = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_GETNEEDLIST;
@@ -1176,16 +1183,16 @@ public class GloableParams {
         GloableParams.ADDRESS_JLT_RECEIVING_DELETEOUTBOX = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_DELETEOUTBOX;
         GloableParams.ADDRESS_JLT_RECEIVING_GETOUTBOXDATA = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_GETOUTBOXDATA;
         GloableParams.ADDRESS_JLT_RECEIVING_GETINDATALIST = uriHead + GloableParams.ADDRESSTAIL_JLT_RECEIVING_GETINDATALIST;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_DELIVERYORDERDETAIL= uriHead + GloableParams.ADDRESSTAIL_DELIVERYORDERDETAIL;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKECOLLECTBOXLIST= uriHead + GloableParams.ADDRESSTAIL_MAKECOLLECTBOXLIST;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKEINWARHOUSE= uriHead + GloableParams.ADDRESSTAIL_MAKEINWARHOUSE;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_OUTBOUNDLIST= uriHead + GloableParams.ADDRESSTAIL_OUTBOUNDLIST;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKEOUTWARHOUSE= uriHead + GloableParams.ADDRESSTAIL_MAKEOUTWARHOUSE;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_ADD_OUTBOUNDLIST= uriHead + GloableParams.ADDRESSTAIL_ADD_OUTBOUNDLIST;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_DETAIL_OUTBOUNDLISTS= uriHead + GloableParams.ADDRESSTAIL_DETAIL_OUTBOUNDLISTS;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_DETAIL_OUTBOUNDLIST= uriHead + GloableParams.ADDRESSTAIL_DETAIL_OUTBOUNDLIST;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_SAVE_OUTBOUNDLIST= uriHead + GloableParams.ADDRESSTAIL_SAVVE_OUTBOUNDLIST;
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_SAVE_GETBARCODEINFODEVICE= uriHead + GloableParams.ADDRESSTAIL_BARSTOCK_GETBARCODEINFODEVICE;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_DELIVERYORDERDETAIL = uriHead + GloableParams.ADDRESSTAIL_DELIVERYORDERDETAIL;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKECOLLECTBOXLIST = uriHead + GloableParams.ADDRESSTAIL_MAKECOLLECTBOXLIST;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKEINWARHOUSE = uriHead + GloableParams.ADDRESSTAIL_MAKEINWARHOUSE;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_OUTBOUNDLIST = uriHead + GloableParams.ADDRESSTAIL_OUTBOUNDLIST;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_MAKEOUTWARHOUSE = uriHead + GloableParams.ADDRESSTAIL_MAKEOUTWARHOUSE;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_ADD_OUTBOUNDLIST = uriHead + GloableParams.ADDRESSTAIL_ADD_OUTBOUNDLIST;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_DETAIL_OUTBOUNDLISTS = uriHead + GloableParams.ADDRESSTAIL_DETAIL_OUTBOUNDLISTS;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_DETAIL_OUTBOUNDLIST = uriHead + GloableParams.ADDRESSTAIL_DETAIL_OUTBOUNDLIST;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_SAVE_OUTBOUNDLIST = uriHead + GloableParams.ADDRESSTAIL_SAVVE_OUTBOUNDLIST;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_SAVE_GETBARCODEINFODEVICE = uriHead + GloableParams.ADDRESSTAIL_BARSTOCK_GETBARCODEINFODEVICE;
 
         GloableParams.ADDRESS_PDAIO_IN_GETWHCODE = uriHead + GloableParams.ADDRESSTAIL_PDAIO_IN_GETWHCODE;
         GloableParams.ADDRESS_OUTMATERIAL_NEWPRODINOUT = uriHead + GloableParams.ADDRESSTAIL_COUNTING_NEWPRODINOUT;
@@ -1193,8 +1200,8 @@ public class GloableParams {
         GloableParams.ADDRESS_BARCODE_SPLITTING = uriHead + GloableParams.ADDRESSTAIL_BARCODE_SPLITTING;
         GloableParams.ADDRESS_BARCODE_ENTER = uriHead + GloableParams.ADDRESSTAIL_BARCODE_ENTER;
 
-        GloableParams.ADDRESS_DOCUMENTLIBRARY_AUTIQC= uriHead + GloableParams.ADDRESSTAIL_RECHARGE_AUTIQC;
-        GloableParams.ADDRESS_TURNPURCBARCODE= uriHead + GloableParams.ADDRESSTAIL_IQC_GETLIST_TURNPURCBARCODE;
+        GloableParams.ADDRESS_DOCUMENTLIBRARY_AUTIQC = uriHead + GloableParams.ADDRESSTAIL_RECHARGE_AUTIQC;
+        GloableParams.ADDRESS_TURNPURCBARCODE = uriHead + GloableParams.ADDRESSTAIL_IQC_GETLIST_TURNPURCBARCODE;
 
         GloableParams.ADDRESS_GET_BARCODE_DATA = uriHead + GloableParams.ADDRESSTAIL_GET_BARCODE_DATA;
         GloableParams.ADDRESS_GET_PRE_MATERIAL_LIST = uriHead + GloableParams.ADDRESSTAIL_GET_PRE_MATERIAL_LIST;
@@ -1203,7 +1210,5 @@ public class GloableParams {
         GloableParams.ADDRESS_DELETE_AND_INQTY = uriHead + GloableParams.ADDRESSTAIL_DELETE_AND_INQTY;
 
 
-
-
     }
 }

app/src/main/java/com/uas/jc_wms/util/MyLog.java

@@ -0,0 +1,161 @@
+package com.uas.jc_wms.util;
+
+import android.annotation.SuppressLint;
+import android.util.Log;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 带日志文件输入，又可控开关的日志调试
+ */
+@SuppressLint("SimpleDateFormat")
+public class MyLog {
+	public static Boolean MYLOG_SWITCH = true; // 日志文件总开关
+	private static Boolean MYLOG_WRITE_TO_FILE = true;// 日志写入文件开关
+	private static char MYLOG_TYPE = 'v';// 输入日志类型，w代表只输出告警信息等，v代表输出所有信息
+	@SuppressLint("SdCardPath")
+	private static String MYLOG_PATH_SDCARD_DIR1 = "/sdcard/MSShow";    // 日志文件在sdcard中的路径
+	private static String MYLOG_PATH_SDCARD_DIR2 = "/Log";
+	private static String MYLOG_PATH_SDCARD_DIR = MYLOG_PATH_SDCARD_DIR1+MYLOG_PATH_SDCARD_DIR2;
+	private static String MYLOGFILEName = "Log.txt";// 本类输出的日志文件名称
+
+	@SuppressLint("SimpleDateFormat")
+	private static SimpleDateFormat myLogSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");// 日志的输出格式
+
+	private static boolean isDebug = true;		//普通log的开关
+	private static String TAG = "英唐" +"-----------";
+
+	public static void e(String msg){
+		if(isDebug){
+			Log.e(TAG, msg);
+		}
+	}
+
+	public static void w(String msg){
+		if(isDebug){
+			Log.w(TAG, msg);
+		}
+	}
+
+	public static void d(String msg){
+		if(isDebug){
+			Log.d(TAG, msg);
+		}
+	}
+
+	public static void i(String msg){
+		if(isDebug){
+			Log.i(TAG, msg);
+		}
+	}
+
+	public static void w(String tag, Object msg) { // 警告信息
+		log(tag, msg.toString(), 'w');
+	}
+
+	public static void e(String tag, Object msg) { // 错误信息
+		log(tag, msg.toString(), 'e');
+	}
+
+	public static void d(String tag, Object msg) {// 调试信息
+		log(tag, msg.toString(), 'd');
+	}
+
+	public static void i(String tag, Object msg) {//
+		log(tag, msg.toString(), 'i');
+	}
+
+	public static void v(String tag, Object msg) {
+		log(tag, msg.toString(), 'v');
+	}
+
+	public static void w(String tag, String text) {
+		log(tag, text, 'w');
+	}
+
+	public static void e(String tag, String text) {
+		log(tag, text, 'e');
+	}
+
+	public static void d(String tag, String text) {
+		log(tag, text, 'd');
+	}
+
+	public static void i(String tag, String text) {
+		log(tag, text, 'i');
+	}
+
+	public static void v(String tag, String text) {
+		log(tag, text, 'v');
+	}
+
+	/**
+	 * 根据tag, msg和等级，输出日志
+	 */
+	private static void log(String tag, String msg, char level) {
+		msg = "\r\n"+msg;
+		if (MYLOG_SWITCH) {
+			if ('e' == level && ('e' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) { // 输出错误信息
+				Log.e(tag, msg);
+			} else if ('w' == level && ('w' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+				Log.w(tag, msg);
+			} else if ('d' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+				Log.d(tag, msg);
+			} else if ('i' == level && ('d' == MYLOG_TYPE || 'v' == MYLOG_TYPE)) {
+				Log.i(tag, msg);
+			} else {
+				Log.v(tag, msg);
+			}
+			if (MYLOG_WRITE_TO_FILE) {
+				writeLogtoFile(String.valueOf(level), tag, msg);
+			}
+		}
+	}
+
+	/**
+	 * 打开日志文件并写入日志
+	 * **/
+	private static void writeLogtoFile(String mylogtype, String tag, String text) {// 新建或打开日志文件
+		isExist(MYLOG_PATH_SDCARD_DIR1);
+		isExist(MYLOG_PATH_SDCARD_DIR);
+		Date nowtime = new Date();
+//		String needWriteFiel = logfile.format(nowtime);
+		String needWriteMessage = myLogSdf.format(nowtime) + "    " + mylogtype
+				+ "    " + tag + "    " + text;
+		File file = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
+		try {
+			FileWriter filerWriter = new FileWriter(file, true);// 后面这个参数代表是不是要接上文件中原来的数据，不进行覆盖
+			BufferedWriter bufWriter = new BufferedWriter(filerWriter);
+			bufWriter.write(needWriteMessage);
+			bufWriter.newLine();
+			bufWriter.close();
+			filerWriter.close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 删除制定的日志文件
+	 * */
+	public static void delFile() {// 删除日志文件
+		File file = new File(MYLOG_PATH_SDCARD_DIR, MYLOGFILEName);
+		if (file.exists()) {
+			file.delete();
+		}
+	}
+
+	public static void isExist(String path) {
+		File file = new File(path);
+		// 判断文件夹是否存在,如果不存在则创建文件夹
+		if (!file.exists()) {
+			file.mkdir();
+		}
+
+	}
+}

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

@@ -6,6 +6,19 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
+
+    <TextView
+        android:id="@+id/tv_is_mianjian"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="12dp"
+        android:layout_weight="1"
+        android:text="此单有免检物料"
+        android:textSize="14sp"
+        android:textColor="@color/red"
+        />
+
     <LinearLayout
         android:id="@+id/header_storage_recharge_barcode_ll"
         android:layout_width="match_parent"

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

@@ -4,7 +4,9 @@
     android:id="@+id/ll_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:layout_margin="5dp"
+    >
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -108,6 +110,48 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="start"
+                    android:text="储位: "/>
+
+                <TextView
+                    android:id="@+id/tv_chuwei"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:gravity="start"
+                    android:text=""/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="start"
+                    android:text="库存总数: "/>
+
+                <TextView
+                    android:id="@+id/tv_kucunzhongshu"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:gravity="start"
+                    android:text=""/>
+
+            </LinearLayout>
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

build.gradle

@@ -55,8 +55,8 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 54,
-            versionName      : "v2.6.8"
+            versionCode      : 55,
+            versionName      : "v2.6.9"
     ]
 
     depsVersion = [