出入库列表添加采集状态字段

app/src/main/java/com/uas/pda_wms/bean/JLTStorageInBean.java

@@ -24,6 +24,7 @@ public class JLTStorageInBean {
     private String PI_WHNAME;
     private String PI_STATUS;
     private String PI_SOURCETYPE;//单据来源，如果是PDA新增，不允许合并入库
+    private String PI_PDASTATUS;
     private boolean isSelect = false;
     private boolean isSpread = false;
     private boolean isInventory = true;//是否启用条码库存
@@ -133,6 +134,14 @@ public class JLTStorageInBean {
         this.PI_SOURCETYPE = PI_SOURCETYPE;
     }
 
+    public String getPI_PDASTATUS() {
+        return PI_PDASTATUS;
+    }
+
+    public void setPI_PDASTATUS(String PI_PDASTATUS) {
+        this.PI_PDASTATUS = PI_PDASTATUS;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

app/src/main/java/com/uas/pda_wms/fragment/JltStorageInFilterListFragment.java

@@ -63,7 +63,7 @@ public class JltStorageInFilterListFragment extends BaseFragment implements JLTS
     private SmartTable mSmartTable;
     private Column<Boolean> mCheckColumn;
     private Column<Long> mPosColumn;
-    private Column<String> mNumColumn, mClassColumn, mStateColumn, mWhcodeColumn,
+    private Column<String> mNumColumn, mClassColumn, mPdaStatusColumn, mStateColumn, mWhcodeColumn,
             mWhcodeDesColumn, mSupplierColumn, mSourceColumn;
     private TableData<JLTStorageInBean> mTableData;
     private RefreshLayout mRefreshLayout;
@@ -126,6 +126,7 @@ public class JltStorageInFilterListFragment extends BaseFragment implements JLTS
         mNumColumn = new Column<String>("单号", "PI_INOUTNO");
         mNumColumn.setFixed(true);
         mClassColumn = new Column<String>("类型", "PI_CLASS");
+        mPdaStatusColumn = new Column<String>("采集状态", "PI_PDASTATUS");
         mSupplierColumn = new Column<String>("供应商", "PI_TITLE");
         mWhcodeColumn = new Column<String>("仓库编号", "PI_WHCODE");
         mWhcodeDesColumn = new Column<String>("仓库名称", "PI_WHNAME");
@@ -248,6 +249,7 @@ public class JltStorageInFilterListFragment extends BaseFragment implements JLTS
 
         mNumColumn.setOnColumnItemClickListener(this);
         mClassColumn.setOnColumnItemClickListener(this);
+        mPdaStatusColumn.setOnColumnItemClickListener(this);
         mSupplierColumn.setOnColumnItemClickListener(this);
         mWhcodeColumn.setOnColumnItemClickListener(this);
         mWhcodeDesColumn.setOnColumnItemClickListener(this);
@@ -462,6 +464,7 @@ public class JltStorageInFilterListFragment extends BaseFragment implements JLTS
                                     jltStorageInBean.setPI_WHNAME(FastjsonUtil.getText(listObject, "PI_WHNAME"));
                                     jltStorageInBean.setPI_STATUS(FastjsonUtil.getText(listObject, "PI_STATUS"));
                                     jltStorageInBean.setPI_SOURCETYPE(FastjsonUtil.getText(listObject, "PI_SOURCETYPE"));
+                                    jltStorageInBean.setPI_PDASTATUS(FastjsonUtil.getText(listObject, "PI_PDASTATUS"));
                                     jltStorageInBean.setSpread(false);
                                     jltStorageInBean.setSelect(false);
                                     jltStorageInBean.setInventory(mIsInventory);
@@ -495,10 +498,10 @@ public class JltStorageInFilterListFragment extends BaseFragment implements JLTS
     private void setFilterTableData(List<JLTStorageInBean> filterTableData) {
         if (mIsPermit) {
             mTableData = new TableData<JLTStorageInBean>("入库单列表", filterTableData,
-                    mCheckColumn, mNumColumn, mClassColumn, mSupplierColumn, mSourceColumn, mWhcodeDesColumn);
+                    mCheckColumn, mNumColumn, mClassColumn, mPdaStatusColumn, mSupplierColumn, mSourceColumn, mWhcodeDesColumn);
         } else {
             mTableData = new TableData<JLTStorageInBean>("入库单列表", filterTableData,
-                    mCheckColumn, mNumColumn, mClassColumn, mSupplierColumn, mWhcodeDesColumn);
+                    mCheckColumn, mNumColumn, mClassColumn, mPdaStatusColumn, mSupplierColumn, mWhcodeDesColumn);
         }
         mSmartTable.setTableData(mTableData);
         mSmartTable.postDelayed(new Runnable() {

app/src/main/java/com/uas/pda_wms/fragment/StorageOutListFragment.java

@@ -46,7 +46,7 @@ public class StorageOutListFragment extends BaseFragment implements JltStorageIn
     private String mSupplier = "", mWhcode = "", mStartDate = "", mEndDate = "", mPriorityMode;
     private boolean mIsInventory;
     private SmartTable mSmartTable;
-    private Column<String> mNumColumn, mClassColumn, mWhcodeColumn,
+    private Column<String> mNumColumn, mClassColumn, mPdaStatusColumn, mWhcodeColumn,
             mSupplierColumn, mSourceColumn, mWhcodeDesColumn;
     private TableData<JLTStorageInBean> mTableData;
     private RefreshLayout mRefreshLayout;
@@ -94,6 +94,7 @@ public class StorageOutListFragment extends BaseFragment implements JltStorageIn
         mNumColumn = new Column<String>("单号", "PI_INOUTNO");
         mNumColumn.setFixed(true);
         mClassColumn = new Column<String>("类型", "PI_CLASS");
+        mPdaStatusColumn = new Column<String>("拣货状态", "PI_PDASTATUS");
         mSupplierColumn = new Column<String>("客户", "PI_TITLE");
         mWhcodeColumn = new Column<String>("仓库编号", "PI_WHCODE");
         mWhcodeDesColumn = new Column<String>("仓库名称", "PI_WHNAME");
@@ -147,6 +148,7 @@ public class StorageOutListFragment extends BaseFragment implements JltStorageIn
 
         mNumColumn.setOnColumnItemClickListener(this);
         mClassColumn.setOnColumnItemClickListener(this);
+        mPdaStatusColumn.setOnColumnItemClickListener(this);
         mSupplierColumn.setOnColumnItemClickListener(this);
         mWhcodeColumn.setOnColumnItemClickListener(this);
         mWhcodeDesColumn.setOnColumnItemClickListener(this);
@@ -243,6 +245,7 @@ public class StorageOutListFragment extends BaseFragment implements JltStorageIn
                                     jltStorageInBean.setPI_WHCODE(FastjsonUtil.getText(listObject, "PI_WHCODE"));
                                     jltStorageInBean.setPI_WHNAME(FastjsonUtil.getText(listObject, "PI_WHNAME"));
                                     jltStorageInBean.setPI_STATUS(FastjsonUtil.getText(listObject, "PI_STATUS"));
+                                    jltStorageInBean.setPI_PDASTATUS(FastjsonUtil.getText(listObject, "PI_PDASTATUS"));
                                     jltStorageInBean.setSpread(false);
                                     jltStorageInBean.setSelect(false);
                                     jltStorageInBean.setPriorityMode(mPriorityMode);
@@ -301,7 +304,7 @@ public class StorageOutListFragment extends BaseFragment implements JltStorageIn
 
     private void setFilterTableData(List<JLTStorageInBean> filterTableData) {
         mTableData = new TableData<JLTStorageInBean>("出库单列表", filterTableData,
-                mNumColumn, mClassColumn, mSupplierColumn, mWhcodeDesColumn);
+                mNumColumn, mClassColumn,mPdaStatusColumn, mSupplierColumn, mWhcodeDesColumn);
         mSmartTable.setTableData(mTableData);
         mSmartTable.postDelayed(new Runnable() {
             @Override