出库单列表增加显示数据

新增出库单页面修改部分接口传参调试
界面优化，重新梳理界面按钮逻辑并修改

app/src/main/java/com/uas/uas_mes_zb_p/bean/OutBoundListAddDalieBean.java

@@ -21,11 +21,19 @@ public class OutBoundListAddDalieBean {
 
     private String PI_STATUSCODE;
 
+    private String PI_WHCODE;
+    private String PI_WHNAME;
+    private String PI_PURPOSE;
+    private String PI_PURPOSENAME;
+    private String PI_EMNAME;
+    private String PD_BARCODEQTY;
+
+
     public OutBoundListAddDalieBean(){
 
     }
 
-    public OutBoundListAddDalieBean(String PI_INOUTNO,String PD_PRODCODE, String PR_DETAIL, String PD_OUTQTY, String PD_PDNO, String PD_ORDERCODE, String PI_DEPARTMENTCODE, String PI_DEPARTMENTNAME, String PI_EMCODE, String PI_CCCODE, String PI_CCNAME,String PI_INVOSTATUSCODE,String PI_STATUSCODE) {
+    public OutBoundListAddDalieBean(String PI_INOUTNO,String PD_PRODCODE, String PR_DETAIL, String PD_OUTQTY, String PD_PDNO, String PD_ORDERCODE, String PI_DEPARTMENTCODE, String PI_DEPARTMENTNAME, String PI_EMCODE, String PI_CCCODE, String PI_CCNAME,String PI_INVOSTATUSCODE,String PI_STATUSCODE,String PI_EMNAME,String PD_BARCODEQTY) {
         this.PD_PRODCODE = PD_PRODCODE;
         this.PR_DETAIL = PR_DETAIL;
         this.PD_OUTQTY = PD_OUTQTY;
@@ -39,7 +47,57 @@ public class OutBoundListAddDalieBean {
         this.PI_INOUTNO=PI_INOUTNO;
         this.PI_INVOSTATUSCODE=PI_INVOSTATUSCODE;
         this.PI_STATUSCODE=PI_STATUSCODE;
+        this.PI_EMNAME=PI_EMNAME;
+        this.PD_BARCODEQTY=PD_BARCODEQTY;
+
+    }
+
+    public String getPD_BARCODEQTY() {
+        return PD_BARCODEQTY;
+    }
+
+    public void setPD_BARCODEQTY(String PD_BARCODEQTY) {
+        this.PD_BARCODEQTY = PD_BARCODEQTY;
+    }
+
+    public String getPI_EMNAME() {
+        return PI_EMNAME;
+    }
+
+    public void setPI_EMNAME(String PI_EMNAME) {
+        this.PI_EMNAME = PI_EMNAME;
+    }
+
+    public String getPI_WHCODE() {
+        return PI_WHCODE;
+    }
+
+    public void setPI_WHCODE(String PI_WHCODE) {
+        this.PI_WHCODE = PI_WHCODE;
+    }
+
+    public String getPI_WHNAME() {
+        return PI_WHNAME;
+    }
+
+    public void setPI_WHNAME(String PI_WHNAME) {
+        this.PI_WHNAME = PI_WHNAME;
+    }
+
+    public String getPI_PURPOSE() {
+        return PI_PURPOSE;
+    }
+
+    public void setPI_PURPOSE(String PI_PURPOSE) {
+        this.PI_PURPOSE = PI_PURPOSE;
+    }
+
+    public String getPI_PURPOSENAME() {
+        return PI_PURPOSENAME;
+    }
 
+    public void setPI_PURPOSENAME(String PI_PURPOSENAME) {
+        this.PI_PURPOSENAME = PI_PURPOSENAME;
     }
 
     public String getPI_STATUSCODE() {

app/src/main/java/com/uas/uas_mes_zb_p/bean/OutboundListBean.java

@@ -11,10 +11,12 @@ public class OutboundListBean {
     private String PI_STATUSCODE;
     private String PI_WHCODE;
     private String RN;
+    private String PI_INVOSTATUSCODE;
+    private String PI_INVOSTATUS;
     public OutboundListBean(){
     }
 
-    public OutboundListBean(String PI_INOUTNO, String PI_ID, String PI_CLASS, String PI_STATUS, String PI_STATUSCODE, String PI_WHCODE, String RN) {
+    public OutboundListBean(String PI_INOUTNO, String PI_ID, String PI_CLASS, String PI_STATUS, String PI_STATUSCODE, String PI_WHCODE, String RN,String PI_INVOSTATUSCODE,String PI_INVOSTATUS) {
         this.PI_INOUTNO = PI_INOUTNO;
         this.PI_ID = PI_ID;
         this.PI_CLASS = PI_CLASS;
@@ -22,6 +24,24 @@ public class OutboundListBean {
         this.PI_STATUSCODE = PI_STATUSCODE;
         this.PI_WHCODE = PI_WHCODE;
         this.RN = RN;
+        this.PI_INVOSTATUSCODE=PI_INVOSTATUSCODE;
+        this.PI_INVOSTATUS=PI_INVOSTATUS;
+    }
+
+    public String getPI_INVOSTATUS() {
+        return PI_INVOSTATUS;
+    }
+
+    public void setPI_INVOSTATUS(String PI_INVOSTATUS) {
+        this.PI_INVOSTATUS = PI_INVOSTATUS;
+    }
+
+    public String getPI_INVOSTATUSCODE() {
+        return PI_INVOSTATUSCODE;
+    }
+
+    public void setPI_INVOSTATUSCODE(String PI_INVOSTATUSCODE) {
+        this.PI_INVOSTATUSCODE = PI_INVOSTATUSCODE;
     }
 
     public String getPI_INOUTNO() {

app/src/main/java/com/uas/uas_mes_zb_p/fragment/OutboundLis_Two_fragment.java

@@ -8,7 +8,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.WindowManager;
@@ -21,7 +20,6 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.bin.david.form.core.SmartTable;
@@ -151,8 +149,8 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
         va_classColumn = new Column<String>("单号", "PI_INOUTNO");
         va_classColumn.setFixed(true);
         va_codeColumn = new Column<String>("单据类型", "PI_CLASS");
-        va_statusColumn = new Column<String>("单据状态", "PI_STATUS");
-        va_vendnameColumn = new Column<String>("状态码", "PI_STATUSCODE");
+        va_statusColumn = new Column<String>("单据状态", "PI_INVOSTATUS");
+        va_vendnameColumn = new Column<String>("过账状态", "PI_STATUS");
         va_vendcodeColumn = new Column<String>("仓库编号", "PI_WHCODE");
 
 
@@ -182,71 +180,6 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
 
 //        ceshiData();
     }
-    public void ceshiData(){
-        JSONObject jsonObject = new JSONObject();
-        JSONArray jsonArray = new JSONArray();
-        JSONObject object_1 = new JSONObject();
-        JSONObject object_2 = new JSONObject();
-        JSONObject object_3 = new JSONObject();
-        try {
-            object_1.put("PI_INOUTNO", "YS22100035");
-            object_1.put("PI_CLASS", 51381942);
-            object_1.put("PI_STATUS", "在录入");
-            object_1.put("PI_STATUSCODE", "采购验收单");
-            object_1.put("PI_WHCODE", "POSTED");
-            object_1.put("PI_ID", "");
-
-            object_2.put("PI_INOUTNO", "YS22100035");
-            object_2.put("PI_CLASS", 51381942);
-            object_2.put("PI_STATUS", "已提交");
-            object_2.put("PI_STATUSCODE", "采购验收单");
-            object_2.put("PI_WHCODE", "POSTED");
-            object_2.put("PI_ID", "");
-
-            object_3.put("PI_INOUTNO", "YS22100035");
-            object_3.put("PI_CLASS", 51381942);
-            object_3.put("PI_STATUS", "已审核");
-            object_3.put("PI_STATUSCODE", "采购验收单");
-            object_3.put("PI_WHCODE", "POSTED");
-            object_3.put("PI_ID", "");
-
-            jsonArray.add(object_1);
-            jsonArray.add(object_2);
-            jsonArray.add(object_3);
-
-            jsonObject.put("data", jsonArray);
-            Log.e("jsonObjectdata",jsonObject.toString());
-            JSONObject resultObject = JSON.parseObject(jsonObject.toString());
-            JSONArray dataArray = resultObject.getJSONArray("data");
-            List<OutboundListBean> list=new ArrayList<>();
-            if (dataArray != null && dataArray.size() > 0) {
-                for (int i = 0; i < dataArray.size(); i++) {
-                    JSONObject dataObject = dataArray.getJSONObject(i);
-                    if (dataObject != null) {
-                        OutboundListBean jltStorageInBeans = new OutboundListBean();
-
-                        jltStorageInBeans.setPI_INOUTNO(FastjsonUtil.getText(dataObject, "PI_INOUTNO"));
-                        jltStorageInBeans.setPI_CLASS(FastjsonUtil.getText(dataObject, "PI_CLASS"));
-                        jltStorageInBeans.setPI_STATUS(FastjsonUtil.getText(dataObject, "PI_STATUS"));
-                        jltStorageInBeans.setPI_STATUSCODE(FastjsonUtil.getText(dataObject, "PI_STATUSCODE"));
-                        jltStorageInBeans.setPI_WHCODE(FastjsonUtil.getText(dataObject, "PI_WHCODE"));
-                        jltStorageInBeans.setPI_ID(FastjsonUtil.getText(dataObject, "PI_ID"));
-
-                        list.add(jltStorageInBeans);
-                    }
-                }
-            }
-            mFilterStorageInBeans = list;//PI_INOUTNO
-            setFilterTableData(mFilterStorageInBeans);
-
-//                        filterAllSelect();
-
-            progressDialog.dismiss();
-
-        } catch (JSONException e) {
-            e.printStackTrace();
-        }
-    }
     private void getDatalistCodes(String pi_inoutno){
         VolleyRequest.getInstance().stringRequest(new HttpParams.Builder()
                 .url(GloableParams.ADDRESS_DOCUMENTLIBRARY_OUTBOUNDLIST)
@@ -279,6 +212,10 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
                                 jltStorageInBean.setPI_STATUSCODE(FastjsonUtil.getText(dataObject, "PI_STATUSCODE"));
                                 jltStorageInBean.setPI_WHCODE(FastjsonUtil.getText(dataObject, "PI_WHCODE"));
                                 jltStorageInBean.setPI_ID(FastjsonUtil.getText(dataObject, "PI_ID"));
+                                jltStorageInBean.setPI_INVOSTATUSCODE(FastjsonUtil.getText(dataObject, "PI_INVOSTATUSCODE"));
+                                jltStorageInBean.setPI_INVOSTATUSCODE(FastjsonUtil.getText(dataObject, "PI_INVOSTATUSCODE"));
+                                jltStorageInBean.setPI_INVOSTATUS(FastjsonUtil.getText(dataObject, "PI_INVOSTATUS"));
+
                                 list.add(jltStorageInBean);
                             }
                         }
@@ -431,11 +368,17 @@ public class OutboundLis_Two_fragment extends BaseFragment implements OnColumnIt
         String pi_id = mFilterStorageInBeans.get(position).getPI_ID();
         String pi_status = mFilterStorageInBeans.get(position).getPI_STATUS();
         String pi_inoutno = mFilterStorageInBeans.get(position).getPI_INOUTNO();
+        String pi_invostatuscode = mFilterStorageInBeans.get(position).getPI_INVOSTATUSCODE();
+        String pi_statuscode = mFilterStorageInBeans.get(position).getPI_STATUSCODE();
         OutboundListAdd_Fragment outboundListAdd_fragment = new OutboundListAdd_Fragment();
         Bundle bundle = new Bundle();
         bundle.putString("pi_id", pi_id);
         bundle.putString("pi_status", pi_status);
         bundle.putString("pi_inoutno", pi_inoutno);
+        bundle.putString("pi_statuscode", pi_statuscode);
+        bundle.putString("pi_invostatuscode", pi_invostatuscode);
+
+
 
         outboundListAdd_fragment.setArguments(bundle);
         FragmentUtils.switchFragment(OutboundLis_Two_fragment.this, outboundListAdd_fragment);

app/src/main/java/com/uas/uas_mes_zb_p/fragment/OutboundListAdd_Fragment.java

@@ -37,7 +37,6 @@ import com.bin.david.form.listener.OnColumnItemClickListener;
 import com.uas.uas_mes_zb_p.R;
 import com.uas.uas_mes_zb_p.activity.CommonSeclecActivity;
 import com.uas.uas_mes_zb_p.activity.FunctionActivity;
-import com.uas.uas_mes_zb_p.bean.MessageEvents;
 import com.uas.uas_mes_zb_p.bean.OutBoundListAddDalieBean;
 import com.uas.uas_mes_zb_p.global.GloableParams;
 import com.uas.uas_mes_zb_p.listener.MyEditorActionListener;
@@ -54,8 +53,6 @@ import com.uas.uas_mes_zb_p.view.ClearableEditText;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -74,7 +71,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
     private TextView tv_documents_code;
     private static final int SCAN_BARCODE_CODE = 111;
     private int mFocusId;
-    private Column<String> va_detnoColumn,va_pucodeCoulmn,va_prodcodeColumn,va_qtyColumn,va_detailColumn;
+    private Column<String> va_detnoColumn,va_pucodeCoulmn,va_prodcodeColumn,va_qtyColumn,va_codeColumn,va_detailColumn;
     private TableData<OutBoundListAddDalieBean> mTableData;
     private List<OutBoundListAddDalieBean> mFilterStorageInBeans;
     private String va_ids;
@@ -96,6 +93,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
     private ClearableEditText edit_et;
     private ImageView outbound_search_im;
     private String bar_remain;
+    private String pi_status;
 
     @Override
     protected int getLayout() {
@@ -158,9 +156,9 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                     SharedPreUtil.saveString(mActivity,"out_editorcodes",data);
 
                     if (add_checkbos.isChecked()==true){
-                        getDatalistCodes(data);
-                    }else if (ck_special_outbound.isChecked()==true){
                         getDialogDatalistCodes(data,"");
+                    }else if (ck_special_outbound.isChecked()==true){
+                        getDatalistCodes(data);
                     }else {
                         getDatalistCodes(data);
                     }
@@ -195,6 +193,8 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
         va_pucodeCoulmn = new Column<String>("单号", "PI_INOUTNO");
         va_prodcodeColumn = new Column<String>("料号", "PD_PRODCODE");
         va_qtyColumn = new Column<String>("数量", "PD_OUTQTY");
+        va_codeColumn = new Column<String>("条码数量", "PD_BARCODEQTY");
+
         va_detailColumn = new Column<String>("名称", "PR_DETAIL");
 
         va_detnoColumn.setOnColumnItemClickListener(this);
@@ -202,7 +202,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
         va_prodcodeColumn.setOnColumnItemClickListener(this);
         va_qtyColumn.setOnColumnItemClickListener(this);
         va_detailColumn.setOnColumnItemClickListener(this);
-
+        va_codeColumn.setOnColumnItemClickListener(this);
 
 
 //        ceshiData();
@@ -236,42 +236,44 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
         Bundle bundle = getArguments();
         if (bundle != null) {
             va_ids = bundle.getString("pi_id");
-
-            String pi_status = bundle.getString("pi_status");
+            pi_status = bundle.getString("pi_status");
             String pi_inoutno = bundle.getString("pi_inoutno");
+            String pi_statuscode = bundle.getString("pi_statuscode");
+            String pi_invostatuscode = bundle.getString("pi_invostatuscode");
+
+            if (pi_statuscode.equals("POSTED")){//已过账
+                jlt_storage_in_generate_detailed_btn.setEnabled(false);//明细
+                jlt_storage_in_barcode_save_btn.setEnabled(false);//提交
+                jlt_storage_in_audit_btn.setEnabled(false);//审核
+                jlt_outbound_in_post_btn.setEnabled(false);//过账
+                storage_recharge_collect_ets.setFocusable(false);//条码框
+                outbound_search_im.setEnabled(false);//放大镜
+            }else if (pi_statuscode.equals("UNPOST")){//未过账
+                if (pi_invostatuscode.equals("ENTERING")){//在录入
+                    jlt_storage_in_generate_detailed_btn.setEnabled(true);//明细
+                    jlt_storage_in_barcode_save_btn.setEnabled(true);//提交
+                    jlt_storage_in_audit_btn.setEnabled(true);//审核
+                    jlt_outbound_in_post_btn.setEnabled(true);//过账
+                    storage_recharge_collect_ets.setFocusable(true);//条码框
+                }else if (pi_invostatuscode.equals("COMMITED")){//已提交
+                    jlt_storage_in_generate_detailed_btn.setEnabled(false);//明细
+                    jlt_storage_in_barcode_save_btn.setEnabled(false);//提交
+                    jlt_storage_in_audit_btn.setEnabled(true);//审核
+                    jlt_outbound_in_post_btn.setEnabled(true);//过账
+                    outbound_search_im.setEnabled(false);//放大镜
+                    storage_recharge_collect_ets.setFocusable(false);//条码框
+                }else if (pi_invostatuscode.equals("AUDITED")){//已审核
+                    jlt_storage_in_generate_detailed_btn.setEnabled(false);//明细
+                    jlt_storage_in_barcode_save_btn.setEnabled(false);//提交
+                    jlt_storage_in_audit_btn.setEnabled(false);//审核
+                    jlt_outbound_in_post_btn.setEnabled(true);//过账
+                    storage_recharge_collect_ets.setFocusable(false);//条码框
+                    outbound_search_im.setEnabled(false);//放大镜
+                }
+            }
+
             tv_documents_code.setText(pi_inoutno);
-            if (pi_status.equals("在录入")){
-                jlt_storage_in_generate_detailed_btn.setEnabled(true);
-                jlt_storage_in_barcode_save_btn.setEnabled(true);
-                jlt_storage_in_audit_btn.setEnabled(true);
-                jlt_outbound_in_post_btn.setEnabled(true);
-                storage_recharge_collect_ets.setFocusable(true);
-            }else if (pi_status.equals("已提交")){
-                jlt_storage_in_generate_detailed_btn.setEnabled(true);
-                jlt_storage_in_barcode_save_btn.setEnabled(true);
-                jlt_storage_in_audit_btn.setEnabled(true);
-                jlt_outbound_in_post_btn.setEnabled(true);
-                storage_recharge_collect_ets.setFocusable(false);
-            }else if (pi_status.equals("已审核")){
-                jlt_storage_in_generate_detailed_btn.setEnabled(false);
-                jlt_storage_in_barcode_save_btn.setEnabled(false);
-                jlt_storage_in_audit_btn.setEnabled(false);
-                jlt_outbound_in_post_btn.setEnabled(true);
-                storage_recharge_collect_ets.setFocusable(false);
-            } else if (pi_status.equals("未过账")){
-                jlt_storage_in_generate_detailed_btn.setEnabled(false);
-                jlt_storage_in_barcode_save_btn.setEnabled(false);
-                jlt_storage_in_audit_btn.setEnabled(false);
-                storage_recharge_collect_ets.setFocusable(false);
-                jlt_outbound_in_post_btn.setEnabled(true);
-            }else if (pi_status.equals("已过账")){
-                jlt_storage_in_generate_detailed_btn.setEnabled(false);
-                jlt_storage_in_barcode_save_btn.setEnabled(false);
-                jlt_storage_in_audit_btn.setEnabled(false);
-                jlt_outbound_in_post_btn.setEnabled(false);
-                storage_recharge_collect_ets.setFocusable(false);
 
-            }
             getDataCommitList();
         }
 
@@ -284,11 +286,21 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
      */
     private void getDatalistCodes(String data) {
         progressDialog.show();
+
+
         String ifcancel;
         if (add_checkbos.isChecked()==true){
-            ifcancel="-1";
+
+            ifcancel="true";
         }else {
-            ifcancel="0";
+
+            ifcancel="false";
+        }
+        String ifspecial;
+        if (ck_special_outbound.isChecked()==true){
+            ifspecial="true";
+        }else {
+            ifspecial="false";
         }
         String string_va_id = SharedPreUtil.getString(mActivity, Constants.STORAGEERECHADD, null);
 
@@ -302,6 +314,8 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                 .flag(0)
                 .addParam("data", data)
                 .addParam("pi_id", string_va_id)
+                .addParam("em_code", ed_picking_code.getText().toString().trim())
+                .addParam("ifspecial",ifspecial)//是否勾选了特殊出库
                 .addParam("ifcancel",ifcancel)//是否勾选了取消采集
                 .build(), new HttpCallback() {
             @Override
@@ -336,7 +350,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
         progressDialog.show();
         String out_editorcodes = SharedPreUtil.getString(mActivity, "out_editorcodes", null);
         String ifcancel;
-        if (ck_special_outbound.isChecked()==true){
+        if (add_checkbos.isChecked()==true){
             ifcancel="true";
         }else {
             ifcancel="false";
@@ -415,7 +429,6 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
 
     private void commitDataCodes(){//提交
         progressDialog.show();
-        getDatalistCodes(storage_recharge_collect_ets.getText().toString().trim());
 
 //        if (tv_delivery_code.getText().toString().trim().isEmpty()){
 //            CommonUtil.toastNoRepeat(mActivity,"请填写送货单号");
@@ -437,7 +450,6 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 getDataCommitList();
-                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
                 CommonUtil.toastNoRepeat(mActivity,"提交成功");
             }
 
@@ -466,7 +478,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             @Override
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
-
+                getDataCommitList();
             }
             @Override
             public void onFail(int flag, String failStr) throws Exception {
@@ -518,45 +530,82 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
                                 jltStorageInBean.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
                                 jltStorageInBean.setPI_INVOSTATUSCODE(FastjsonUtil.getText(dataObject, "PI_INVOSTATUSCODE"));
                                 jltStorageInBean.setPI_STATUSCODE(FastjsonUtil.getText(dataObject, "PI_STATUSCODE"));
+                                //领料人名称
+                                jltStorageInBean.setPI_EMCODE(FastjsonUtil.getText(dataObject, "PI_EMCODE"));
+                                jltStorageInBean.setPI_EMNAME(FastjsonUtil.getText(dataObject, "PI_EMNAME"));
+                                //领用部门编号名称
+                                jltStorageInBean.setPI_DEPARTMENTCODE(FastjsonUtil.getText(dataObject, "PI_DEPARTMENTCODE"));
+                                jltStorageInBean.setPI_DEPARTMENTNAME(FastjsonUtil.getText(dataObject, "PI_DEPARTMENTNAME"));
+                                //工序编号名称
+                                jltStorageInBean.setPI_CCCODE(FastjsonUtil.getText(dataObject, "PI_CCCODE"));
+                                jltStorageInBean.setPI_CCNAME(FastjsonUtil.getText(dataObject, "PI_CCNAME"));
+
+                                //拨出仓编号名称
+                                jltStorageInBean.setPI_WHCODE(FastjsonUtil.getText(dataObject, "PI_WHCODE"));
+                                jltStorageInBean.setPI_WHNAME(FastjsonUtil.getText(dataObject, "PI_WHNAME"));
+                                //拨入仓编号名称
+                                jltStorageInBean.setPI_PURPOSE(FastjsonUtil.getText(dataObject, "PI_PURPOSE"));
+                                jltStorageInBean.setPI_PURPOSENAME(FastjsonUtil.getText(dataObject, "PI_PURPOSENAME"));
+                                jltStorageInBean.setPD_BARCODEQTY(FastjsonUtil.getText(dataObject, "PD_BARCODEQTY"));
+
                                 list.add(jltStorageInBean);
                                 pi_invostatuscode = jltStorageInBean.getPI_INVOSTATUSCODE();
                                 pi_statuscode = jltStorageInBean.getPI_STATUSCODE();
+
+                                String pi_departmentcode = jltStorageInBean.getPI_DEPARTMENTCODE();
+                                String pi_departmentname = jltStorageInBean.getPI_DEPARTMENTNAME();
+                                String pi_emcode = jltStorageInBean.getPI_EMCODE();
+                                String pi_emname = jltStorageInBean.getPI_EMNAME();
+
+                                String pi_cccode = jltStorageInBean.getPI_CCCODE();
+                                String pi_ccname = jltStorageInBean.getPI_CCNAME();
+
+                                String pi_whcode = jltStorageInBean.getPI_WHCODE();
+                                String pi_whname = jltStorageInBean.getPI_WHNAME();
+
+                                String pi_purpose = jltStorageInBean.getPI_PURPOSE();
+                                String pi_purposename = jltStorageInBean.getPI_PURPOSENAME();
+                                String pi_inoutno = jltStorageInBean.getPI_INOUTNO();
+                                ed_picking_code.setText(pi_emcode);
+                                ed_picking_name.setText(pi_emname);
+                                ed_recipients_departmentr_code.setText(pi_departmentcode);
+                                ed_recipients_departmentr_name.setText(pi_departmentname);
+                                ed_process_code.setText(pi_cccode);
+                                ed_process_name.setText(pi_ccname);
+                                ed_set_a_sideastorehouse.setText(pi_whcode+"-"+pi_whname);
+                                ed_dial_a_levite.setText(pi_purpose+"-"+pi_purposename);
+                                tv_documents_code.setText(pi_inoutno);
                             }
                         }
 //                        ENTERING 在录入
 //                        COMMITED 已提交
 //                        AUDITED 已审核
-                        if (pi_invostatuscode.equals("ENTERING")){
-                            jlt_storage_in_generate_detailed_btn.setEnabled(true);
-                            jlt_storage_in_barcode_save_btn.setEnabled(true);
-                            jlt_storage_in_audit_btn.setEnabled(true);
-                            jlt_outbound_in_post_btn.setEnabled(true);
-                            storage_recharge_collect_ets.setFocusable(true);
-                        }else if (pi_invostatuscode.equals("COMMITED")){
-                            jlt_storage_in_generate_detailed_btn.setEnabled(true);
-                            jlt_storage_in_barcode_save_btn.setEnabled(true);
-                            jlt_storage_in_audit_btn.setEnabled(true);
-                            jlt_outbound_in_post_btn.setEnabled(true);
-                            storage_recharge_collect_ets.setFocusable(false);
-                        }else if (pi_invostatuscode.equals("AUDITED")){
-                            jlt_storage_in_generate_detailed_btn.setEnabled(false);
-                            jlt_storage_in_barcode_save_btn.setEnabled(false);
-                            jlt_storage_in_audit_btn.setEnabled(false);
-                            jlt_outbound_in_post_btn.setEnabled(true);
-                            storage_recharge_collect_ets.setFocusable(false);
-                        } else if (pi_statuscode.equals("UNPOST")){
-                            jlt_storage_in_generate_detailed_btn.setEnabled(false);
-                            jlt_storage_in_barcode_save_btn.setEnabled(false);
-                            jlt_storage_in_audit_btn.setEnabled(false);
-                            storage_recharge_collect_ets.setFocusable(false);
-                            jlt_outbound_in_post_btn.setEnabled(true);
-                        }else if (pi_statuscode.equals("POSTED")){
-                            jlt_storage_in_generate_detailed_btn.setEnabled(false);
-                            jlt_storage_in_barcode_save_btn.setEnabled(false);
-                            jlt_storage_in_audit_btn.setEnabled(false);
-                            jlt_outbound_in_post_btn.setEnabled(false);
-                            storage_recharge_collect_ets.setFocusable(false);
-
+                        if (pi_statuscode.equals("POSTED")){//已过账
+                            jlt_storage_in_generate_detailed_btn.setEnabled(false);//明细
+                            jlt_storage_in_barcode_save_btn.setEnabled(false);//提交
+                            jlt_storage_in_audit_btn.setEnabled(false);//审核
+                            jlt_outbound_in_post_btn.setEnabled(false);//过账
+                            storage_recharge_collect_ets.setFocusable(false);//条码框
+                        }else if (pi_statuscode.equals("UNPOST")){//未过账
+                            if (pi_invostatuscode.equals("ENTERING")){//在录入
+                                jlt_storage_in_generate_detailed_btn.setEnabled(true);//明细
+                                jlt_storage_in_barcode_save_btn.setEnabled(true);//提交
+                                jlt_storage_in_audit_btn.setEnabled(true);//审核
+                                jlt_outbound_in_post_btn.setEnabled(true);//过账
+                                storage_recharge_collect_ets.setFocusable(true);//条码框
+                            }else if (pi_invostatuscode.equals("COMMITED")){//已提交
+                                jlt_storage_in_generate_detailed_btn.setEnabled(false);//明细
+                                jlt_storage_in_barcode_save_btn.setEnabled(false);//提交
+                                jlt_storage_in_audit_btn.setEnabled(true);//审核
+                                jlt_outbound_in_post_btn.setEnabled(true);//过账
+                                storage_recharge_collect_ets.setFocusable(false);//条码框
+                            }else if (pi_invostatuscode.equals("AUDITED")){//已审核
+                                jlt_storage_in_generate_detailed_btn.setEnabled(false);//明细
+                                jlt_storage_in_barcode_save_btn.setEnabled(false);//提交
+                                jlt_storage_in_audit_btn.setEnabled(false);//审核
+                                jlt_outbound_in_post_btn.setEnabled(true);//过账
+                                storage_recharge_collect_ets.setFocusable(false);//条码框
+                            }
                         }
 
                     }
@@ -603,7 +652,6 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 getDataCommitList();
-                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
                 CommonUtil.toastNoRepeat(mActivity,"审核成功");
             }
 
@@ -633,7 +681,6 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
                 getDataCommitList();
-                EventBus.getDefault().post(new MessageEvents("提交单据后刷新列表"));
                 CommonUtil.toastNoRepeat(mActivity,"过账成功");
             }
 
@@ -706,7 +753,7 @@ public class OutboundListAdd_Fragment extends BaseFragment implements OnColumnIt
     }
     private void setFilterTableData(List<OutBoundListAddDalieBean> filterTableData) {
         mTableData = new TableData<OutBoundListAddDalieBean>("列表", filterTableData,
-                va_detnoColumn,va_pucodeCoulmn,va_prodcodeColumn,va_qtyColumn,va_detailColumn);
+                va_detnoColumn,va_pucodeCoulmn,va_prodcodeColumn,va_qtyColumn,va_codeColumn,va_detailColumn);
         mSmartTable.setTableData(mTableData);
 //        mSmartTable.requestLayout();
         mSmartTable.postDelayed(new Runnable() {

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

@@ -607,11 +607,11 @@ public class GloableParams {
     //出库单放大镜
     private static String ADDRESSTAIL_DETAIL_OUTBOUNDORDER_AMAGNIFYINGGLASS= "/common/dbfind.action";
     //提交
-    private static String ADDRESSTAIL_COMMIT_OUTBOUNDLIST="scm/reserve/submitProdInOut.action";
+    private static String ADDRESSTAIL_COMMIT_OUTBOUNDLIST="/scm/reserve/submitProdInOut.action";
     //审核
-    private static String ADDRESSTAIL_AUDIT_OUTBOUNDLIST="scm/reserve/auditProdInOut.action";
+    private static String ADDRESSTAIL_AUDIT_OUTBOUNDLIST="/scm/reserve/auditProdInOut.action";
     //过账
-    private static String ADDRESSTAIL_POST_OUTBOUNDLIST="scm/reserve/postProdInOut.action";
+    private static String ADDRESSTAIL_POST_OUTBOUNDLIST="/scm/reserve/postProdInOut.action";
 
 
     /**

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

@@ -29,7 +29,7 @@
                     android:focusable="true"
                     android:lines="1"
                     android:focusableInTouchMode="true"
-                    android:hint="请采集条码号/箱号"
+                    android:hint="请采集单号"
                     android:imeOptions="actionSend"
                     android:textColor="@color/black" />
 
@@ -295,7 +295,6 @@
                 android:layout_margin="5dp"
                 android:layout_weight="1"
                 android:text="明细"
-                android:enabled="false"
                 />
             <Button
                 android:id="@+id/jlt_storage_in_barcode_save_btn"
@@ -304,7 +303,6 @@
                 android:layout_margin="5dp"
                 android:layout_weight="1"
                 android:text="提交"
-                android:enabled="false"
                 />
             <Button
                 android:id="@+id/jlt_storage_in_audit_btn"
@@ -313,7 +311,6 @@
                 android:layout_margin="5dp"
                 android:layout_weight="1"
                 android:text="审核"
-                android:enabled="false"
                 />
             <Button
                 android:id="@+id/jlt_outbound_in_post_btn"
@@ -322,7 +319,6 @@
                 android:layout_margin="5dp"
                 android:layout_weight="1"
                 android:text="过账"
-                android:enabled="false"
                 />
 
         </LinearLayout>

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

@@ -28,7 +28,7 @@
                     android:focusable="true"
                     android:lines="1"
                     android:focusableInTouchMode="true"
-                    android:hint="请采集条码号/箱号"
+                    android:hint="请采集单号"
                     android:imeOptions="actionSend"
                     android:textColor="@color/black" />
 

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

@@ -17,7 +17,7 @@
             android:background="@null"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:hint="请采集条码号/箱号"
+            android:hint="请采集单号"
             android:imeOptions="actionSend"
             android:textColor="@color/black" />