出库采集界面调整

app/src/main/java/com/uas/saiej/adapter/StockTaskMultipleAdapter.java

@@ -63,8 +63,8 @@ public class StockTaskMultipleAdapter extends BaseAdapter {
     private void initializeViews(StockTaskMultipleBean object, final ViewHolder holder) {
         holder.stockTaskMultipleOrispeccode.setText(object.getPR_ORISPECCODE());
         holder.stockTaskMultipleProdcode.setText(object.getPD_PRODCODE());
-        holder.stockTaskMultipleWaitNum.setText(CommonUtil.doubleFormat(object.getPD_RESTQTY()));
-        holder.stockTaskMultipleSum.setText(CommonUtil.doubleFormat(object.getPD_OUTQTY()));
+        holder.stockTaskMultipleWaitNum.setText(object.getPD_RESTQTY());
+        holder.stockTaskMultipleSum.setText(object.getPD_OUTQTY());
         holder.stockTaskMultipleZxbzs.setText(CommonUtil.doubleFormat(object.getBAR_REMAIN()));
         holder.stockTaskMultipleBatchcode.setText(object.getPD_BATCHCODE());
         holder.stockTaskMultipleLocation.setText(object.getBAR_LOCATION());

app/src/main/java/com/uas/saiej/bean/StockTaskMultipleBean.java

@@ -25,8 +25,8 @@ public class StockTaskMultipleBean {
     private String PD_PRODCODE;
     private String PR_DETAIL;
     private String PR_SPEC;
-    private double PD_OUTQTY;
-    private double PD_RESTQTY;
+    private String PD_OUTQTY;
+    private String PD_RESTQTY;
     private double PR_ZXBZS;
     private String BAR_LOCATION;
     private String PD_BATCHCODE;
@@ -85,19 +85,19 @@ public class StockTaskMultipleBean {
         this.PR_SPEC = PR_SPEC;
     }
 
-    public double getPD_OUTQTY() {
+    public String getPD_OUTQTY() {
         return PD_OUTQTY;
     }
 
-    public void setPD_OUTQTY(double PD_OUTQTY) {
+    public void setPD_OUTQTY(String PD_OUTQTY) {
         this.PD_OUTQTY = PD_OUTQTY;
     }
 
-    public double getPD_RESTQTY() {
+    public String getPD_RESTQTY() {
         return PD_RESTQTY;
     }
 
-    public void setPD_RESTQTY(double PD_RESTQTY) {
+    public void setPD_RESTQTY(String PD_RESTQTY) {
         this.PD_RESTQTY = PD_RESTQTY;
     }
 

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

@@ -53,7 +53,6 @@ import com.android.volley.toolbox.JsonObjectRequest;
 import com.android.volley.toolbox.StringRequest;
 import com.bin.david.form.core.SmartTable;
 import com.bin.david.form.data.column.Column;
-import com.bin.david.form.data.format.IFormat;
 import com.bin.david.form.data.table.TableData;
 import com.uas.saiej.R;
 import com.uas.saiej.activity.FunctionActivity;
@@ -244,7 +243,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 }
                             }
                         } else {
-                            mCollectResultTextView.setVisibility(View.VISIBLE);
+                            line_caiji.setVisibility(View.VISIBLE);
                             mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
                             mCollectResultTextView.setText(null);
                             JSONArray listArray = dataObject.optJSONArray("nolist");
@@ -357,9 +356,9 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                     if (materialInformationBean.getPD_BATCHCODE() != null) {
                                         materialInfo = materialInfo + "; 批号：" + materialInformationBean.getPD_BATCHCODE();
                                     }
-                                    mMaterialInforTextView.setText(materialInfo);
                                 }
                             } else {
+                                mMaterialInforTextView.setVisibility(View.VISIBLE);
                                 mMaterialInforTextView.setText("该出库单已经完成备料");
                             }
                         }
@@ -437,11 +436,13 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
 
     private SmartTable mSmartTable;
     private Column<String> mProdcodeColumn, mOutqtyColumn,mTypeColumn;
-    private Column<Double> mPdaqtyColumn, mDetailColumn;
+    private Column<String> mPdaqtyColumn, mDetailColumn;
     private TableData<StockTaskMultipleBean> mTableData;
     private TextView mNumTextView;
     private CheckBox mCheckBox;
     private List<StockTaskMultipleBean> mStockTaskMultipleBeans;
+    private LinearLayout line_caiji;
+    private TextView iocout_collect_text;
 
     @Override
     protected int getLayout() {
@@ -476,6 +477,9 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         special_check = root.findViewById(R.id.special_check);
         et_client_code = root.findViewById(R.id.et_client_code);
 
+        line_caiji = root.findViewById(R.id.line_caiji);
+        iocout_collect_text = root.findViewById(R.id.iocout_collect_text);
+
         mNumTextView = root.findViewById(R.id.stock_data_summary_num_tv);
         mCheckBox = root.findViewById(R.id.stock_data_summary_cb);
         mSmartTable = root.findViewById(R.id.stock_data_summary_st);
@@ -483,18 +487,9 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         mTypeColumn = new Column<String>("  规格  ", "PR_SPEC");
         mProdcodeColumn = new Column<String>("物料编号", "PD_PRODCODE");
         mOutqtyColumn = new Column<String>("名称", "PR_DETAIL");
-        mPdaqtyColumn = new Column<Double>("出库数量", "PD_OUTQTY", new IFormat<Double>() {
-            @Override
-            public String format(Double aDouble) {
-                return CommonUtil.doubleFormat(aDouble);
-            }
-        });
-        mDetailColumn = new Column<Double>("已采集数量", "PD_RESTQTY", new IFormat<Double>() {
-            @Override
-            public String format(Double aDouble) {
-                return CommonUtil.doubleFormat(aDouble);
-            }
-        });
+
+        mPdaqtyColumn = new Column<String>("出库数量", "PD_OUTQTY");
+        mDetailColumn = new Column<String>("已采集数量", "PD_RESTQTY");
 
 
 
@@ -719,6 +714,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             getNextMaterialInfo();
         } else {
             CommonUtil.toastNoRepeat(mActivity, getString(R.string.net_not_connect));
+            mMaterialInforTextView.setVisibility(View.VISIBLE);
             mMaterialInforTextView.setText(getString(R.string.net_not_connect));
         }
 
@@ -773,8 +769,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 StockTaskMultipleBean stockTaskMultipleBean = new StockTaskMultipleBean();
                                 stockTaskMultipleBean.setPD_PRODCODE(FastjsonUtil.getText(dataObject, "PD_PRODCODE"));
                                 stockTaskMultipleBean.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
-                                stockTaskMultipleBean.setPD_OUTQTY(FastjsonUtil.getDouble(dataObject, "PD_OUTQTY"));
-                                stockTaskMultipleBean.setPD_RESTQTY(FastjsonUtil.getDouble(dataObject, "PD_PDAQTY"));
+                                stockTaskMultipleBean.setPD_OUTQTY(FastjsonUtil.getText(dataObject, "PD_OUTQTY"));
+                                stockTaskMultipleBean.setPD_RESTQTY(FastjsonUtil.getText(dataObject, "PD_PDAQTY"));
                                 //新增型号
                                 stockTaskMultipleBean.setPR_SPEC(FastjsonUtil.getText(dataObject,"PR_SPEC"));
 
@@ -847,10 +843,10 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                             if (materialInformationBean.getData().getPD_BATCHCODE() != null) {
                                 materialInfo = materialInfo + "; 批号：" + materialInformationBean.getData().getPD_BATCHCODE();
                             }
-                            if (mMaterialInforTextView != null)
-                                mMaterialInforTextView.setText(materialInfo);
+
                         } else {
                             if (mMaterialInforTextView != null)
+                                mMaterialInforTextView.setVisibility(View.VISIBLE);
                                 mMaterialInforTextView.setText("该出库单当前的仓库已经完成备料");
                         }
                     }
@@ -861,6 +857,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                         progressDialog.dismiss();
                         String errorMsg = CommonUtil.showErrorToast(volleyError);
                         if (mMaterialInforTextView != null)
+                            mMaterialInforTextView.setVisibility(View.VISIBLE);
                             mMaterialInforTextView.setText(errorMsg);
                     }
                 }) {
@@ -1039,13 +1036,13 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                             }
                         }
                     } else {
-                        mCollectResultTextView.setVisibility(View.VISIBLE);
+                        line_caiji.setVisibility(View.VISIBLE);
                         mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
                         mCollectResultTextView.setText(null);
                         JSONArray listArray = dataObject.optJSONArray("nolist");
                         if (mCollectType.equals("byBarcode") || mCollectType.equals("byBatchcode")) {
-                            String barcodeResult = "采集成功；" + JsonUtils.optStringNotNull(dataObject, "finishno")
-                                    + "\n条码：" + JsonUtils.optStringNotNull(messageObject, "BAR_CODE")
+                                String strings="采集成功" + JsonUtils.optStringNotNull(dataObject, "finishno");
+                            String barcodeResult = "条码：" + JsonUtils.optStringNotNull(messageObject, "BAR_CODE")
                                     + "；数量：" + CommonUtil.doubleFormat(messageObject.optDouble("BAR_REMAIN"))
                                     + "；批号：" + JsonUtils.optStringNotNull(messageObject, "BAR_BATCHCODE")
                                     + "；料号：" + JsonUtils.optStringNotNull(messageObject, "BAR_PRODCODE")
@@ -1053,16 +1050,19 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                     + "  " + JsonUtils.optStringNotNull(messageObject, "PR_SPEC")
                                     + "；仓位：" + JsonUtils.optStringNotNull(messageObject, "BAR_LOCATION");
 
-                            if (listArray != null && listArray.length() > 0) {
-                                for (int i = 0; i < listArray.length(); i++) {
-                                    JSONObject listObject = listArray.optJSONObject(i);
-                                    barcodeResult = barcodeResult
-                                            + "\n单号：" + JsonUtils.optStringNotNull(listObject, "PI_INOUTNO")
-                                            + ";条码号：" + JsonUtils.optStringNotNull(listObject, "BAR_CODE")
-                                            + ";数量：" + CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "BAR_REMAIN"));
-                                }
-                            }
-
+//                            if (listArray != null && listArray.length() > 0) {
+//                                for (int i = 0; i < listArray.length(); i++) {
+//                                    JSONObject listObject = listArray.optJSONObject(i);
+//                                    barcodeResult = barcodeResult
+//                                            + "\n单号：" + JsonUtils.optStringNotNull(listObject, "PI_INOUTNO");
+////                                            + ";条码号：" + JsonUtils.optStringNotNull(listObject, "BAR_CODE")
+////                                            + ";数量：" + CommonUtil.doubleFormat(JsonUtils.optDoubleNotNull(listObject, "BAR_REMAIN"));
+//                                }
+//                            }
+                            mMaterialInforTextView.setVisibility(View.GONE);
+                            iocout_collect_text.setVisibility(View.VISIBLE);
+                            iocout_collect_text.setText(strings);
+                            iocout_collect_text.setTextColor(getResources().getColor(R.color.green));
                             mCollectResultTextView.setText(barcodeResult);
                             mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
 
@@ -1151,9 +1151,10 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 if (materialInformationBean.getPD_BATCHCODE() != null) {
                                     materialInfo = materialInfo + "; 批号：" + materialInformationBean.getPD_BATCHCODE();
                                 }
-                                mMaterialInforTextView.setText(materialInfo);
+
                             }
                         } else {
+                            mMaterialInforTextView.setVisibility(View.VISIBLE);
                             mMaterialInforTextView.setText("该出库单已经完成备料");
                         }
                     }
@@ -1174,13 +1175,15 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                     mCollectTypeRadioGroup.setEnabled(true);
                     CommonUtil.editTextGetFocus(etBarCode);
                     String errorToast = CommonUtil.showErrorToast(volleyError, true);
-                    mCollectResultTextView.setVisibility(View.VISIBLE);
+                    line_caiji.setVisibility(View.VISIBLE);
+                    iocout_collect_text.setVisibility(View.GONE);
                     mCollectResultTextView.setTextColor(getResources().getColor(R.color.red));
                     mCollectResultTextView.setText(errorToast);
                 }
                 etBarCode.setText(null);
                 et_client_code.setText(null);
                 et_client_code.requestFocus();
+                mMaterialInforTextView.setVisibility(View.GONE);
 
             }
         }) {
@@ -1810,7 +1813,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                             }
                         }
                     } else {
-                        mCollectResultTextView.setVisibility(View.VISIBLE);
+                        line_caiji.setVisibility(View.VISIBLE);
                         mCollectResultTextView.setTextColor(getResources().getColor(R.color.green));
                         mCollectResultTextView.setText(null);
                         JSONArray listArray = dataObject.optJSONArray("nolist");
@@ -1925,9 +1928,9 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                                 if (materialInformationBean.getPD_BATCHCODE() != null) {
                                     materialInfo = materialInfo + "; 批号：" + materialInformationBean.getPD_BATCHCODE();
                                 }
-                                mMaterialInforTextView.setText(materialInfo);
                             }
                         } else {
+                            mMaterialInforTextView.setVisibility(View.VISIBLE);
                             mMaterialInforTextView.setText("该出库单已经完成备料");
                         }
                     }

app/src/main/java/com/uas/saiej/fragment/MaterialOutStockTaskMultipleFragment.java

@@ -208,8 +208,8 @@ public class MaterialOutStockTaskMultipleFragment extends BaseFragment {
                                         stockTaskItemBean.setPD_PRODCODE(JsonUtils.optStringNotNull(dataObject, "PD_PRODCODE"));
                                         stockTaskItemBean.setPR_DETAIL(JsonUtils.optStringNotNull(dataObject, "PR_DETAIL"));
                                         stockTaskItemBean.setPR_SPEC(JsonUtils.optStringNotNull(dataObject, "PR_SPEC"));
-                                        stockTaskItemBean.setPD_OUTQTY(JsonUtils.optDoubleNotNull(dataObject, "PD_OUTQTY"));
-                                        stockTaskItemBean.setPD_RESTQTY(JsonUtils.optDoubleNotNull(dataObject, "PD_RESTQTY"));
+                                        stockTaskItemBean.setPD_OUTQTY(JsonUtils.optStringNotNull(dataObject, "PD_OUTQTY"));
+                                        stockTaskItemBean.setPD_RESTQTY(JsonUtils.optStringNotNull(dataObject, "PD_RESTQTY"));
                                         stockTaskItemBean.setPR_ZXBZS(JsonUtils.optDoubleNotNull(dataObject, "PR_ZXBZS"));
                                         stockTaskItemBean.setBAR_LOCATION(JsonUtils.optStringNotNull(dataObject, "BAR_LOCATION"));
                                         stockTaskItemBean.setBA_HASBARCODE((int) JsonUtils.optLongNotNull(dataObject, "BA_HASBARCODE"));

app/src/main/java/com/uas/saiej/fragment/StockDataSummaryFragment.java

@@ -12,7 +12,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.android.volley.Request;
 import com.bin.david.form.core.SmartTable;
 import com.bin.david.form.data.column.Column;
-import com.bin.david.form.data.format.IFormat;
 import com.bin.david.form.data.table.TableData;
 import com.uas.saiej.R;
 import com.uas.saiej.bean.StockTaskMultipleBean;
@@ -33,7 +32,7 @@ import java.util.List;
 public class StockDataSummaryFragment extends BaseFragment {
     private SmartTable mSmartTable;
     private Column<String> mProdcodeColumn, mOutqtyColumn,mTypeColumn;
-    private Column<Double> mPdaqtyColumn, mDetailColumn;
+    private Column<String> mPdaqtyColumn, mDetailColumn;
     private TableData<StockTaskMultipleBean> mTableData;
     private TextView mNumTextView;
     private CheckBox mCheckBox;
@@ -63,18 +62,12 @@ public class StockDataSummaryFragment extends BaseFragment {
         mTypeColumn = new Column<String>("  规格  ", "PR_SPEC");
         mProdcodeColumn = new Column<String>("物料编号", "PD_PRODCODE");
         mOutqtyColumn = new Column<String>("名称", "PR_DETAIL");
-        mPdaqtyColumn = new Column<Double>("出库数量", "PD_OUTQTY", new IFormat<Double>() {
-            @Override
-            public String format(Double aDouble) {
-                return CommonUtil.doubleFormat(aDouble);
-            }
-        });
-        mDetailColumn = new Column<Double>("已采集数量", "PD_RESTQTY", new IFormat<Double>() {
-            @Override
-            public String format(Double aDouble) {
-                return CommonUtil.doubleFormat(aDouble);
-            }
-        });
+
+
+        mPdaqtyColumn = new Column<String>("出库数量", "PD_OUTQTY");
+        mDetailColumn = new Column<String>("已采集数量", "PD_RESTQTY");
+
+
     }
 
     @Override
@@ -132,8 +125,8 @@ public class StockDataSummaryFragment extends BaseFragment {
                                 StockTaskMultipleBean stockTaskMultipleBean = new StockTaskMultipleBean();
                                 stockTaskMultipleBean.setPD_PRODCODE(FastjsonUtil.getText(dataObject, "PD_PRODCODE"));
                                 stockTaskMultipleBean.setPR_DETAIL(FastjsonUtil.getText(dataObject, "PR_DETAIL"));
-                                stockTaskMultipleBean.setPD_OUTQTY(FastjsonUtil.getDouble(dataObject, "PD_OUTQTY"));
-                                stockTaskMultipleBean.setPD_RESTQTY(FastjsonUtil.getDouble(dataObject, "PD_PDAQTY"));
+                                stockTaskMultipleBean.setPD_OUTQTY(FastjsonUtil.getText(dataObject, "PD_OUTQTY"));
+                                stockTaskMultipleBean.setPD_RESTQTY(FastjsonUtil.getText(dataObject, "PD_PDAQTY"));
                                 //新增型号
                                 stockTaskMultipleBean.setPR_SPEC(FastjsonUtil.getText(dataObject,"PR_SPEC"));
 

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

@@ -183,9 +183,8 @@
                             style="@style/tl_tv_style"
                             android:layout_height="match_parent"
                             android:background="@color/gray_light"
-                            android:drawableLeft="@drawable/switch_model"
                             android:drawablePadding="5dp"
-                            android:gravity="center_vertical"
+                            android:gravity="center"
                             android:padding="10dp"
                             android:text="条码"
                             android:textColor="@color/body_text_1"
@@ -359,19 +358,33 @@
                             android:layout_marginLeft="3dp" />
                     </TableRow>
                 </TableLayout>
-
-                <TextView
-                    android:id="@+id/iocout_collect_result"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                <LinearLayout
+                    android:visibility="gone"
+                    android:id="@+id/line_caiji"
                     android:layout_marginTop="@dimen/spacing_big"
-                    android:background="@drawable/shape_msg_block"
                     android:padding="10dp"
-                    android:visibility="gone"
-                    tools:text="boxResultboxResultboxResultboxResult"
-                    tools:visibility="visible"/>
+                    android:orientation="vertical"
+                    android:background="@drawable/shape_msg_block"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:id="@+id/iocout_collect_text"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        tools:text="采集"
+                        android:textStyle="bold"
+                        tools:visibility="visible"/>
+                    <TextView
+                        android:id="@+id/iocout_collect_result"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        tools:text="boxResultboxResultboxResultboxResult"
+                        tools:visibility="visible"/>
+
 
+                </LinearLayout>
                 <TextView
+                    android:visibility="gone"
                     android:id="@+id/iocout_next_material_information"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"