修复盘点作业页面问题,增加收料表格内容, 修改条码库存打印, 修改条码数量打印, 拆批合批打印功能

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

@@ -3,11 +3,13 @@ package com.uas.jc_wms.adapter;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.uas.jc_wms.R;
@@ -65,6 +67,19 @@ public class StorageRechargeAdapter extends BaseAdapter {
         holder.listStorageRechargeProdcodeTv.setText(object.getProdcode());
         holder.listStorageRechargeQuantityTv.setText(object.getQuantity() + "");
         holder.listStorageRechargeSpecTv.setText(object.getDetail() + "    " + object.getSpec());
+        if (!TextUtils.isEmpty(object.getISNEED())) {
+            if (object.getISNEED().equals("是")) {
+                holder.ll_is_the_material_urgent.setVisibility(View.VISIBLE);
+                holder.tv_material_urgent.setTextColor(context.getResources().getColor(R.color.red));
+                holder.tv_is_the_material_urgent.setTextColor(context.getResources().getColor(R.color.red));
+                holder.tv_is_the_material_urgent.setText(object.getISNEED());
+            }else {
+                holder.ll_is_the_material_urgent.setVisibility(View.VISIBLE);
+                holder.tv_is_the_material_urgent.setText(object.getISNEED());
+            }
+        }else {
+            holder.ll_is_the_material_urgent.setVisibility(View.GONE);
+        }
 
         holder.quantityModifyTv.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -97,6 +112,9 @@ public class StorageRechargeAdapter extends BaseAdapter {
         private TextView listStorageRechargeQuantityTv;
         private TextView listStorageRechargeSpecTv;
         private TextView quantityModifyTv;
+        private TextView tv_material_urgent;
+        private TextView tv_is_the_material_urgent;
+        private LinearLayout ll_is_the_material_urgent;
 
         public ViewHolder(View view) {
             listStorageRechargeOrdercodeTv = (TextView) view.findViewById(R.id.list_storage_recharge_ordercode_tv);
@@ -105,6 +123,9 @@ public class StorageRechargeAdapter extends BaseAdapter {
             listStorageRechargeQuantityTv = (TextView) view.findViewById(R.id.list_storage_recharge_quantity_tv);
             listStorageRechargeSpecTv = (TextView) view.findViewById(R.id.list_storage_recharge_spec_tv);
             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);
+            ll_is_the_material_urgent = (LinearLayout) view.findViewById(R.id.ll_is_the_material_urgent);
         }
     }
 

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

@@ -68,6 +68,7 @@ public class StorageRechargeInspectionAdapter extends BaseAdapter {
         holder.listStorageInspectionVendnameTv.setText(object.getVendname());
         holder.listStorageInspectionRecorderTv.setText(object.getRecorder());
         holder.listStorageInspectionStateTv.setText(object.getStates());
+        holder.tv_time_date.setText(object.getAN_INDATE());
     }
 
     protected class ViewHolder {
@@ -76,6 +77,7 @@ public class StorageRechargeInspectionAdapter extends BaseAdapter {
         private TextView listStorageInspectionRecorderTv;
         private TextView listStorageInspectionStateTv;
         private TextView codeCaptionTv;
+        private TextView tv_time_date;
 
         public ViewHolder(View view) {
             listStorageInspectionCodeTv = (TextView) view.findViewById(R.id.list_storage_recharge_inspection_code_tv);
@@ -83,6 +85,7 @@ public class StorageRechargeInspectionAdapter extends BaseAdapter {
             listStorageInspectionRecorderTv = (TextView) view.findViewById(R.id.list_storage_recharge_inspection_recorder_tv);
             listStorageInspectionStateTv = (TextView) view.findViewById(R.id.list_storage_recharge_inspection_state_tv);
             codeCaptionTv = (TextView) view.findViewById(R.id.list_storage_recharge_inspection_code_caption);
+            tv_time_date = (TextView) view.findViewById(R.id.tv_time_date);
         }
     }
 }

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

@@ -0,0 +1,157 @@
+package com.uas.jc_wms.bean;
+
+/**
+ * Created by sw on 2024-12-10
+ */
+public class PrintStye {
+    //{
+    //	"success": true,
+    //	"data": {
+    //		"data": {
+    //			"BAR_STATUS": 1,
+    //			"BAR_CODE": "OS241208000017",
+    //			"BAR_REMAIN": 490,
+    //			"BAR_PRODCODE": "512013000653",
+    //			"BAR_ID": 1183332,
+    //			"PR_DETAIL": "接线端子",
+    //			"BAR_WHCODE": null,
+    //			"BAR_LOCATION": null,
+    //			"BAR_BATCHCODE": null,
+    //			"PR_ISMSD": null,
+    //			"PS_MSDLEVEL": "0"
+    //		}
+    //	}
+    //}
+    private boolean success;
+    private DataBeanX data;
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public DataBeanX getData() {
+        return data;
+    }
+
+    public void setData(DataBeanX data) {
+        this.data = data;
+    }
+
+    public static class DataBeanX {
+        private DataBean data;
+
+        public DataBean getData() {
+            return data;
+        }
+
+        public void setData(DataBean data) {
+            this.data = data;
+        }
+
+        public static class DataBean {
+            private int BAR_STATUS;
+            private String BAR_CODE;
+            private int BAR_REMAIN;
+            private String BAR_PRODCODE;
+            private int BAR_ID;
+            private String PR_DETAIL;
+            private Object BAR_WHCODE;
+            private Object BAR_LOCATION;
+            private Object BAR_BATCHCODE;
+            private Object PR_ISMSD;
+            private String PS_MSDLEVEL;
+
+            public int getBAR_STATUS() {
+                return BAR_STATUS;
+            }
+
+            public void setBAR_STATUS(int BAR_STATUS) {
+                this.BAR_STATUS = BAR_STATUS;
+            }
+
+            public String getBAR_CODE() {
+                return BAR_CODE;
+            }
+
+            public void setBAR_CODE(String BAR_CODE) {
+                this.BAR_CODE = BAR_CODE;
+            }
+
+            public int getBAR_REMAIN() {
+                return BAR_REMAIN;
+            }
+
+            public void setBAR_REMAIN(int BAR_REMAIN) {
+                this.BAR_REMAIN = BAR_REMAIN;
+            }
+
+            public String getBAR_PRODCODE() {
+                return BAR_PRODCODE;
+            }
+
+            public void setBAR_PRODCODE(String BAR_PRODCODE) {
+                this.BAR_PRODCODE = BAR_PRODCODE;
+            }
+
+            public int getBAR_ID() {
+                return BAR_ID;
+            }
+
+            public void setBAR_ID(int BAR_ID) {
+                this.BAR_ID = BAR_ID;
+            }
+
+            public String getPR_DETAIL() {
+                return PR_DETAIL;
+            }
+
+            public void setPR_DETAIL(String PR_DETAIL) {
+                this.PR_DETAIL = PR_DETAIL;
+            }
+
+            public Object getBAR_WHCODE() {
+                return BAR_WHCODE;
+            }
+
+            public void setBAR_WHCODE(Object BAR_WHCODE) {
+                this.BAR_WHCODE = BAR_WHCODE;
+            }
+
+            public Object getBAR_LOCATION() {
+                return BAR_LOCATION;
+            }
+
+            public void setBAR_LOCATION(Object BAR_LOCATION) {
+                this.BAR_LOCATION = BAR_LOCATION;
+            }
+
+            public Object getBAR_BATCHCODE() {
+                return BAR_BATCHCODE;
+            }
+
+            public void setBAR_BATCHCODE(Object BAR_BATCHCODE) {
+                this.BAR_BATCHCODE = BAR_BATCHCODE;
+            }
+
+            public Object getPR_ISMSD() {
+                return PR_ISMSD;
+            }
+
+            public void setPR_ISMSD(Object PR_ISMSD) {
+                this.PR_ISMSD = PR_ISMSD;
+            }
+
+            public String getPS_MSDLEVEL() {
+                return PS_MSDLEVEL;
+            }
+
+            public void setPS_MSDLEVEL(String PS_MSDLEVEL) {
+                this.PS_MSDLEVEL = PS_MSDLEVEL;
+            }
+        }
+    }
+}

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

@@ -18,6 +18,15 @@ public class StorageRechargeInspectionBean implements Serializable {
     private String mVendname;
     private String mDetailJson;
     private boolean isSlipable;
+    private String AN_INDATE;
+
+    public String getAN_INDATE() {
+        return AN_INDATE;
+    }
+
+    public void setAN_INDATE(String AN_INDATE) {
+        this.AN_INDATE = AN_INDATE;
+    }
 
     public long getId() {
         return mId;

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

@@ -14,6 +14,15 @@ public class StorageRechargeListBean {
     private double mQuantity;
     private String mSpec;
     private String mDetail;
+    private String ISNEED;
+
+    public String getISNEED() {
+        return ISNEED;
+    }
+
+    public void setISNEED(String ISNEED) {
+        this.ISNEED = ISNEED;
+    }
 
     public long getAndId() {
         return mAndId;

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

@@ -64,6 +64,7 @@ import com.uas.jc_wms.bean.IOCOutMakeMaterialOperMsd;
 import com.uas.jc_wms.bean.IOCOutmakeMaterialSplitBean;
 import com.uas.jc_wms.bean.MaterialInformationBean;
 import com.uas.jc_wms.bean.SubmitNotParam;
+import com.uas.jc_wms.bean.WHBreakingBatchBreakingBtnClickEvent;
 import com.uas.jc_wms.bean.WHBreakingBatchBreakingBtnClickEventNew;
 import com.uas.jc_wms.database.DBManager;
 import com.uas.jc_wms.global.GloableParams;
@@ -134,6 +135,7 @@ public class IOCOutMakeMaterialOperNew extends BaseFragment implements View.OnCl
     private StringRequest stringRequestPost;
     private String mProdOutType;
     private List<WHBreakingBatchBreakingBtnClickEventNew.DataBean> messages = new ArrayList<>();
+    private List<WHBreakingBatchBreakingBtnClickEvent.DataBean> messagesOld = new ArrayList<>();
 
     private int mCollectModel = 1;//采集模式：1代表在线，0代表离线
     private String mBarRemain, mRestqty;
@@ -425,7 +427,7 @@ public class IOCOutMakeMaterialOperNew extends BaseFragment implements View.OnCl
     private Spinner mTypeSpinner;
     private TextView mMaterialInforTextView;
     private TextView mCollectResultTextView;
-    private Button btn_oneprint;
+    private Button btn_oneprint, bt_inventory_barcode_printing;
     private com.alibaba.fastjson.JSONArray listArray;
 
     private RecyclerView rv_line_ip_port_data;
@@ -476,6 +478,7 @@ public class IOCOutMakeMaterialOperNew extends BaseFragment implements View.OnCl
         mMaterialInforTextView = mActivity.findViewById(R.id.iocout_next_material_information);
         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);
 
         mDbManager = new DBManager(getActivity().getApplicationContext());
         mOkHttpClient = new OkHttpClient.Builder()
@@ -598,6 +601,12 @@ public class IOCOutMakeMaterialOperNew extends BaseFragment implements View.OnCl
                 }
             }
         });
+        bt_inventory_barcode_printing.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getWhcode();
+            }
+        });
     }
 
     /**
@@ -1319,7 +1328,6 @@ public class IOCOutMakeMaterialOperNew extends BaseFragment implements View.OnCl
                         closeListPopupWindow();
                         //弹出拨入仓
                         getRepairStep("");
-                        //getWhcode(0);
                     }
                 });
 
@@ -1476,35 +1484,88 @@ public class IOCOutMakeMaterialOperNew extends BaseFragment implements View.OnCl
         }
     }
 
-    //    private void getWhcode() {
-    //        View mPopView = View.inflate(mActivity, R.layout.pop_whcode_dlert_dialog, null);
-    //        ClearableEditText cet_whcode = (ClearableEditText) mPopView.findViewById(R.id.cet_whcode);
-    //        Button bt_ok = (Button) mPopView.findViewById(R.id.bt_ok);
-    //        AlertDialog mWarehouseDialog = new AlertDialog.Builder(mActivity)
-    //                .setView(mPopView)
-    //                .create();
-    //        mWarehouseDialog.show();
-    //
-    //        bt_ok.setOnClickListener(new View.OnClickListener() {
-    //            @Override
-    //            public void onClick(View v) {
-    //                mWarehouseDialog.cancel();
-    //                VolleyRequest.getInstance().stringRequest(mStringRequest,
-    //                        new HttpParams.Builder()
-    //                                .url(GloableParams.ADDRESS_BARCODE_SPLITTING)
-    //                                .method(Request.Method.GET)
-    //                                .addParam("id", pi_id)
-    //                                .addParam("whcode", cet_whcode.getText().toString().trim())
-    //                                .tag(TAG + "_barcodeSplitting")
-    //                                .flag(BarcodeSplitting).build(),
-    //                        30 * 1000, IOCOutMakeMaterialOperNew.this);
-    //            }
-    //        });
-    //    }
+    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 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();
+//                                Gson gson = new Gson();
+//                                PrintStye printStye = gson.fromJson(o.toString(), PrintStye.class);
+//                                if (printStye.getData() == null || printStye.getData().getData() == null){
+//                                    return;
+//                                }
+//                                PrintStye.DataBeanX.DataBean data = printStye.getData().getData();
+//                                String json = gson.toJson(data);
+//                                com.alibaba.fastjson.JSONObject resultObject = JSON.parseObject(json);
+//                                listArray.add(new com.alibaba.fastjson.JSONObject(resultObject));
+
+                                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);
+                    }
+                });
+    }
 
     private void getRepairStep(String trim) {
-//        String pi_class = "完工入库单";
-//        String pi_type = "良品";
+        //        String pi_class = "完工入库单";
+        //        String pi_type = "良品";
         String pi_class = "";
         String pi_type = "";
         progressDialog.show();

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

@@ -262,8 +262,8 @@ public class InventoryCollectFragment extends BaseFragment implements View.OnCli
                                                     CommonUtil.toastNoRepeat(getActivity(), "请输入正确的数字");
                                                     return;
                                                 }
-                                                if (quantity <= 0) {
-                                                    CommonUtil.toastNoRepeat(getActivity(), "数量必须大于0");
+                                                if (quantity < 0) {
+                                                    CommonUtil.toastNoRepeat(getActivity(), "数量不能小于0");
                                                     return;
                                                 }
                                                 VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()

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

@@ -30,13 +30,10 @@ import com.android.volley.Request;
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.StringRequest;
-import com.google.gson.Gson;
 import com.uas.jc_wms.R;
 import com.uas.jc_wms.activity.FunctionActivity;
 import com.uas.jc_wms.application.PdaApplication;
-import com.uas.jc_wms.bean.CodePrinBean;
 import com.uas.jc_wms.bean.PrintDataBean;
-import com.uas.jc_wms.bean.WHBreakingBatchBreakingBtnClickEvent;
 import com.uas.jc_wms.global.GloableParams;
 import com.uas.jc_wms.tools.SharedPreUtil;
 import com.uas.jc_wms.tools.VolleyUtil;
@@ -251,15 +248,18 @@ public class ModifyBarcodeQuantityFragment extends BaseFragment {
     protected void initPopupWindow(String s) {
         JSONArray listArray = new JSONArray();
         try {
-            Gson gson = new Gson();
-            CodePrinBean codePrinBean = gson.fromJson(s, CodePrinBean.class);
-            if (codePrinBean.getData() == null){
-                return;
-            }
-            CodePrinBean.DataBean data = codePrinBean.getData();
-            String json = gson.toJson(data);
-            com.alibaba.fastjson.JSONObject resultObject = JSON.parseObject(json);
-            listArray.add(new com.alibaba.fastjson.JSONObject(resultObject));
+//            Gson gson = new Gson();
+//            CodePrinBean codePrinBean = gson.fromJson(s, CodePrinBean.class);
+//            if (codePrinBean.getData() == null){
+//                return;
+//            }
+//            CodePrinBean.DataBean data = codePrinBean.getData();
+//            String json = gson.toJson(data);
+//            com.alibaba.fastjson.JSONObject resultObject = JSON.parseObject(json);
+//            listArray.add(new com.alibaba.fastjson.JSONObject(resultObject));
+
+            JSONObject jsonObject = new JSONObject(s);
+            listArray.add(JSON.parseObject(jsonObject.getString("data")));
             messages.clear();
             for (int i = 0; i < listArray.size(); i++) {
                 com.alibaba.fastjson.JSONObject barcodeObject = listArray.getJSONObject(i);

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

@@ -511,6 +511,7 @@ public class StorageRechargeFragment extends BaseFragment implements View.OnClic
                         storageRechargeListBean.setQuantity(FastjsonUtil.getDouble(detailObject, "AND_INQTY"));
                         storageRechargeListBean.setDetail(FastjsonUtil.getText(detailObject, "PR_DETAIL"));
                         storageRechargeListBean.setSpec(FastjsonUtil.getText(detailObject, "PR_SPEC"));
+                        storageRechargeListBean.setISNEED(FastjsonUtil.getText(detailObject, "ISNEED"));
                         mStorageRechargeListBeans.add(storageRechargeListBean);
                     }
                 }

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

@@ -210,6 +210,7 @@ public class StorageRechargeListFragment extends BaseFragment implements HttpCal
                                 storageRechargeInspectionBean.setRecorder(FastjsonUtil.getText(mainObject, "AN_RECORDER"));
                                 storageRechargeInspectionBean.setVendcode(FastjsonUtil.getText(mainObject, "AN_VENDCODE"));
                                 storageRechargeInspectionBean.setVendname(FastjsonUtil.getText(mainObject, "AN_VENDNAME"));
+                                storageRechargeInspectionBean.setAN_INDATE(FastjsonUtil.getText(mainObject, "AN_INDATE"));
                                 storageRechargeInspectionBean.setDetailJson(FastjsonUtil.getText(dataObject, "detail"));
                                 storageRechargeInspectionBean.setSlipable(FastjsonUtil.getBoolean(dataObject, "ifShowButton"));
 

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

@@ -43,9 +43,7 @@ import com.android.volley.toolbox.Volley;
 import com.google.gson.Gson;
 import com.uas.jc_wms.R;
 import com.uas.jc_wms.activity.FunctionActivity;
-import com.uas.jc_wms.bean.CodePrinBean;
 import com.uas.jc_wms.bean.PrintDataBean;
-import com.uas.jc_wms.bean.WHBreakingBatchBreakingBtnClickEvent;
 import com.uas.jc_wms.bean.WHBreakingBatchGetBarcodeData;
 import com.uas.jc_wms.bean.WHCombineBatchFragmentCombineBtnClickEvent;
 import com.uas.jc_wms.global.GloableParams;
@@ -559,15 +557,18 @@ public class WHCombineBatchFragment extends BaseFragment implements View.OnClick
     protected void initPrintPopupWindow(String s) {
         JSONArray listArray = new JSONArray();
         try {
-            Gson gson = new Gson();
-            CodePrinBean codePrinBean = gson.fromJson(s, CodePrinBean.class);
-            if (codePrinBean.getData() == null){
-                return;
-            }
-            CodePrinBean.DataBean data = codePrinBean.getData();
-            String json = gson.toJson(data);
-            com.alibaba.fastjson.JSONObject resultObject = JSON.parseObject(json);
-            listArray.add(new com.alibaba.fastjson.JSONObject(resultObject));
+//            Gson gson = new Gson();
+//            CodePrinBean codePrinBean = gson.fromJson(s, CodePrinBean.class);
+//            if (codePrinBean.getData() == null){
+//                return;
+//            }
+//            CodePrinBean.DataBean data = codePrinBean.getData();
+//            String json = gson.toJson(data);
+//            com.alibaba.fastjson.JSONObject resultObject = JSON.parseObject(json);
+//            listArray.add(new com.alibaba.fastjson.JSONObject(resultObject));
+
+            JSONObject jsonObject = new JSONObject(s);
+            listArray.add(JSON.parseObject(jsonObject.getString("data")));
             messages.clear();
             for (int i = 0; i < listArray.size(); i++) {
                 com.alibaba.fastjson.JSONObject barcodeObject = listArray.getJSONObject(i);

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

@@ -265,6 +265,7 @@ public class GloableParams {
 
     public static String ADDRESS_GET_BARCODE_DATA;
     public static String ADDRESS_GET_PRE_MATERIAL_LIST;
+    public static String ADDRESS_GET_INVENTORY_BARCODE_DATA;     //库存条码打印
 
     //连接服务器请求地址
     private static final String ADDRESSTAIL_CONNECT_SERVER = "/api/pda/getAllMasters.action";
@@ -746,6 +747,10 @@ public class GloableParams {
 
     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";
+
+
 
 
     /***********************************************************************************************/
@@ -1185,6 +1190,9 @@ public class GloableParams {
         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;
+
+
 
 
     }

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

@@ -11,12 +11,29 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
-        <Button
-            android:id="@+id/btn_oneprint"
-            android:layout_width="wrap_content"
+
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="打印">
-        </Button>
+            >
+
+            <Button
+                android:id="@+id/btn_oneprint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/text_btn_print"
+                />
+
+            <Button
+                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"
+                />
+
+        </RelativeLayout>
+
         <!--no use-->
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -126,5 +126,32 @@
             android:layout_weight="1"
             android:textSize="14sp"
             tools:text="名称+规格" />
+
+        <LinearLayout
+            android:id="@+id/ll_is_the_material_urgent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_weight="1"
+            android:visibility="gone"
+            >
+
+            <TextView
+                android:id="@+id/tv_material_urgent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/Is_the_material_urgent"
+                android:textSize="14sp"
+                />
+
+            <TextView
+                android:id="@+id/tv_is_the_material_urgent"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textSize="14sp"
+                tools:text="" />
+
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>

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

@@ -26,10 +26,29 @@
             android:id="@+id/list_storage_recharge_inspection_code_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="3"
+            android:layout_weight="2"
+            android:textColor="@color/black"
+            android:textSize="14sp"
+            tools:text="2018-01-21" />
+
+        <TextView
+            android:id="@+id/tv_date"
+            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_time_date"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
             android:textColor="@color/black"
             android:textSize="14sp"
             tools:text="2018-01-21" />
+
     </LinearLayout>
 
     <LinearLayout

app/src/main/res/layout/pop_whcode_dlert_dialog.xml → app/src/main/res/layout/pop_inventory_barcode_dialog.xml

@@ -5,18 +5,26 @@
     android:layout_height="wrap_content"
     android:layout_margin="10dp"
     android:orientation="vertical"
+    android:padding="10dp"
     >
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/string_barcode"
+        android:textSize="16sp"
+        android:layout_marginBottom="10dp"
+        />
 
     <com.uas.jc_wms.view.ClearableEditText
-        android:id="@+id/cet_whcode"
+        android:id="@+id/cet_barcode"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="10dp"
         android:background="@drawable/bg_line_edittext"
         android:focusable="true"
         android:selectAllOnFocus="true"
-        android:hint="请输入仓库编号"
+        android:hint="@string/Please_enter_barcode"
         android:imeOptions="actionSend"
         android:textColor="@color/black"
         android:textSize="14sp"

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

@@ -432,5 +432,8 @@
     </string-array>
 
     <string name="List_of_outbound_orders">出库单列表</string>
+    <string name="Inventory_barcode_printing">库存条码打印</string>
+    <string name="Please_enter_barcode">请输入条码</string>
+    <string name="Is_the_material_urgent">是否急料:</string>
 
 </resources>

build.gradle

@@ -55,13 +55,13 @@ ext {
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
-            versionCode      : 37,
-            versionName      : "v2.5.1"
+            versionCode      : 42,
+            versionName      : "v2.5.6"
     ]
 
     depsVersion = [
             junitVersion                        : "4.12",
-            appcompatV7Version                  : "28.0.0",
+            appcompatV7Version                  : "28.0.0", 
             stethoVersion                       : "1.5.0",
             fastjsonVersion                     : "1.2.39",
             xUtilsVersion                       : "2.6.14",