1、在库物料移动表格增加仓位字段

2、入库待采集+已采集列表UI调整，单行展示

app/src/main/java/com/uas/jlt_storage/adapter/JLTUpperShelfBoxAdapter.java

@@ -23,6 +23,11 @@ public class JLTUpperShelfBoxAdapter extends BaseQuickAdapter<BoxBean, BaseViewH
 
     @Override
     protected void convert(BaseViewHolder helper, BoxBean item) {
+        if (item.isUpperFailed()) {
+            helper.setTextColor(R.id.item_jlt_upper_shelf_box_box_tv, mContext.getResources().getColor(R.color.red));
+        } else {
+            helper.setTextColor(R.id.item_jlt_upper_shelf_box_box_tv, mContext.getResources().getColor(R.color.value_text_color));
+        }
         helper.setText(R.id.item_jlt_upper_shelf_box_box_tv, item.getBoxCode());
         helper.setOnClickListener(R.id.item_jlt_upper_shelf_box_delete_iv, new View.OnClickListener() {
             @Override

app/src/main/java/com/uas/jlt_storage/bean/BoxBean.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 public class BoxBean {
     @JSONField(name = "BoxCode")
     private String BoxCode;
+    private boolean upperFailed;
 
     public String getBoxCode() {
         return BoxCode;
@@ -13,4 +14,12 @@ public class BoxBean {
     public void setBoxCode(String boxCode) {
         BoxCode = boxCode;
     }
+
+    public boolean isUpperFailed() {
+        return upperFailed;
+    }
+
+    public void setUpperFailed(boolean upperFailed) {
+        this.upperFailed = upperFailed;
+    }
 }

app/src/main/java/com/uas/jlt_storage/bean/JLTMaterialBean.java

@@ -22,7 +22,7 @@ public class JLTMaterialBean implements Serializable {
     private double BAR_ZXBZS;
     private String BAR_BRAND;
     private String BAR_WHCODE;
-    private String location;
+    private String BAR_LOCATION;
 
     public long getPOS() {
         return POS;
@@ -88,11 +88,11 @@ public class JLTMaterialBean implements Serializable {
         this.BAR_WHCODE = BAR_WHCODE;
     }
 
-    public String getLocation() {
-        return location;
+    public String getBAR_LOCATION() {
+        return BAR_LOCATION;
     }
 
-    public void setLocation(String location) {
-        this.location = location;
+    public void setBAR_LOCATION(String BAR_LOCATION) {
+        this.BAR_LOCATION = BAR_LOCATION;
     }
 }

app/src/main/java/com/uas/jlt_storage/fragment/JLTPickMaterialOutScanFragment.java

@@ -121,6 +121,15 @@ public class JLTPickMaterialOutScanFragment extends BaseFragment implements View
                 enclosureParse();
             }
         });
+
+        mMultipleEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) {
+                    mMultipleEditText.setText("");
+                }
+            }
+        });
     }
 
     @Override

app/src/main/java/com/uas/jlt_storage/fragment/JLTStorageInBarcodeFragment.java

@@ -79,13 +79,14 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
     private JLTBarcodeParseBean mBarcodeParseBean;
     private JLTMpqSelectAdapter mMpqSelectAdapter;
     private List<Double> mMpqList;
-    private CustomPopWindow mMpqPopWindow;
+    private CustomPopWindow mMpqPopWindow, mBrandPopWindow;
     private RecyclerView mMpqRecyclerView, mEnclosureRecyclerView;
     private View mMpqView;
     private Dialog mEnclosureDialog;
     private OnFinishListener mOnFinishListener;
     private List<WhcodeBean> mEnclosureList;
     private JLTSearchWhcodeAdapter mSearchEnclosureAdapter;
+    private boolean isMpqDiv = false;
 
     public void setOnFinishListener(OnFinishListener onFinishListener) {
         mOnFinishListener = onFinishListener;
@@ -384,7 +385,9 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
                 }
                 break;
             case R.id.pop_jlt_zxbzs_select_close_btn:
-                mMpqPopWindow.dissmiss();
+                if (mMpqPopWindow != null) {
+                    mMpqPopWindow.dissmiss();
+                }
                 break;
             case R.id.jlt_storage_in_barcode_save_btn:
                 saveBarcode(false, true);

app/src/main/java/com/uas/jlt_storage/fragment/JLTStorageInDoneListFragment.java

@@ -133,6 +133,8 @@ public class JLTStorageInDoneListFragment extends BaseFragment {
                                         jltStorageModelBean.setQuantity(FastjsonUtil.getText(modelObject,"BI_QTY"));
 
                                         jltStorageModelBeans.add(jltStorageModelBean);
+                                        jltStorageModelBeans.add(jltStorageModelBean);
+                                        jltStorageModelBeans.add(jltStorageModelBean);
                                     }
                                 }
                             }

app/src/main/java/com/uas/jlt_storage/fragment/JLTStorageMaterialMoveDetailFragment.java

@@ -190,7 +190,7 @@ public class JLTStorageMaterialMoveDetailFragment extends BaseFragment {
                 .tag(TAG + "confirmmove")
                 .addParam("qty", quantity)
                 .addParam("newLocation", location)
-                .addParam("oldLocation", mMaterialBean.getLocation())
+                .addParam("oldLocation", mMaterialBean.getBAR_LOCATION())
                 .addParam("newBoxCode", boxNum)
                 .addParam("mpn", mMaterialBean.getBAR_MPN())
                 .addParam("zxbzs", CommonUtil.doubleFormat(mMaterialBean.getBAR_ZXBZS()))
@@ -227,7 +227,7 @@ public class JLTStorageMaterialMoveDetailFragment extends BaseFragment {
                 .method(Request.Method.GET)
                 .tag(TAG + "checkbox")
                 .addParam("newLocation", location)
-                .addParam("oldLocation", mMaterialBean.getLocation())
+                .addParam("oldLocation", mMaterialBean.getBAR_LOCATION())
                 .addParam("newBoxCode", box)
                 .build(), new HttpCallback() {
             @Override

app/src/main/java/com/uas/jlt_storage/fragment/JLTStorageMaterialMoveFragment.java

@@ -52,11 +52,9 @@ public class JLTStorageMaterialMoveFragment extends BaseFragment implements OnCo
     private SmartTable mSmartTable;
     private ClearableEditText mBoxEditText;
     private TextView mConfirmTextView;
-    private RecyclerView mRecyclerView;
-    private JLTMaterialMoveAdapter mMaterialMoveAdapter;
     private List<JLTMaterialBean> mMaterialBeans;
     private TableData<JLTMaterialBean> mTableData;
-    private ArrayColumn<String> mModelColumn, mBrandColumn;
+    private ArrayColumn<String> mLocationColumn, mModelColumn, mBrandColumn;
     private ArrayColumn<Double> mMpqColumn, mQtyColumn, mPanColumn;
     private ArrayColumn<Long> mPosColumn;
 
@@ -72,13 +70,8 @@ public class JLTStorageMaterialMoveFragment extends BaseFragment implements OnCo
         mBoxEditText = root.findViewById(R.id.jlt_storage_material_move_box_et);
         mBoxEditText.requestFocus();
         mConfirmTextView = root.findViewById(R.id.jlt_storage_material_move_confirm_tv);
-        mRecyclerView = root.findViewById(R.id.jlt_storage_material_move_rv);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
-        mRecyclerView.addItemDecoration(new RecyclerItemDecoration(2));
 
         mMaterialBeans = new ArrayList<>();
-        mMaterialMoveAdapter = new JLTMaterialMoveAdapter(mMaterialBeans);
-        mRecyclerView.setAdapter(mMaterialMoveAdapter);
 
         mSmartTable = root.findViewById(R.id.jlt_storage_material_move_st);
         WindowManager wm = mActivity.getWindowManager();
@@ -88,12 +81,12 @@ public class JLTStorageMaterialMoveFragment extends BaseFragment implements OnCo
                 .setShowYSequence(false)
                 .setShowTableTitle(false)
                 .setFixedTitle(true)
-                .setVerticalPadding(CommonUtil.dip2px(mActivity,12))
-                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity,12))
-                .setHorizontalPadding(CommonUtil.dip2px(mActivity,10))
-                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity,10))
-                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity,10))
-                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity,15), Color.parseColor("#000000")))
+                .setVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setColumnTitleVerticalPadding(CommonUtil.dip2px(mActivity, 12))
+                .setHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setSequenceHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleHorizontalPadding(CommonUtil.dip2px(mActivity, 10))
+                .setColumnTitleStyle(new FontStyle(CommonUtil.sp2px(mActivity, 15), Color.parseColor("#000000")))
                 .setContentCellBackgroundFormat(new BaseCellBackgroundFormat<CellInfo>() {
                     @Override
                     public int getBackGroundColor(CellInfo cellInfo) {
@@ -106,6 +99,8 @@ public class JLTStorageMaterialMoveFragment extends BaseFragment implements OnCo
 
         mPosColumn = new ArrayColumn<Long>("序号", "POS");
         mPosColumn.setFixed(true);
+
+        mLocationColumn = new ArrayColumn<String>("仓位", "BAR_LOCATION");
         mModelColumn = new ArrayColumn<String>("型号", "BAR_MPN");
         mMpqColumn = new ArrayColumn<Double>("MPQ", "BAR_ZXBZS", false,
                 new IFormat<Double>() {
@@ -148,13 +143,6 @@ public class JLTStorageMaterialMoveFragment extends BaseFragment implements OnCo
             }
         });
 
-        mMaterialMoveAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
-            @Override
-            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                jumpToDetail(position);
-            }
-        });
-
         mPosColumn.setOnColumnItemClickListener(new OnColumnItemClickListener<Long>() {
             @Override
             public void onClick(Column<Long> column, String value, Long aLong, int position) {
@@ -164,6 +152,12 @@ public class JLTStorageMaterialMoveFragment extends BaseFragment implements OnCo
         mMpqColumn.setOnColumnItemClickListener(this);
         mQtyColumn.setOnColumnItemClickListener(this);
         mPanColumn.setOnColumnItemClickListener(this);
+        mLocationColumn.setOnColumnItemClickListener(new OnColumnItemClickListener<String>() {
+            @Override
+            public void onClick(Column<String> column, String value, String s, int position) {
+                jumpToDetail(position);
+            }
+        });
         mModelColumn.setOnColumnItemClickListener(new OnColumnItemClickListener<String>() {
             @Override
             public void onClick(Column<String> column, String value, String s, int position) {
@@ -228,7 +222,7 @@ public class JLTStorageMaterialMoveFragment extends BaseFragment implements OnCo
                                 jltMaterialBean.setBAR_ZXBZS(FastjsonUtil.getDouble(dataObject, "BAR_ZXBZS"));
                                 jltMaterialBean.setBAR_BRAND(FastjsonUtil.getText(dataObject, "BAR_BRAND"));
                                 jltMaterialBean.setBAR_WHCODE(FastjsonUtil.getText(dataObject, "BAR_WHCODE"));
-                                jltMaterialBean.setLocation(keyStr);
+                                jltMaterialBean.setBAR_LOCATION(FastjsonUtil.getText(dataObject, "BAR_LOCATION"));
 
                                 mMaterialBeans.add(jltMaterialBean);
                             }
@@ -236,9 +230,8 @@ public class JLTStorageMaterialMoveFragment extends BaseFragment implements OnCo
                     }
 
                     mTableData = new TableData<JLTMaterialBean>("型号列表", mMaterialBeans,
-                            mPosColumn, mModelColumn, mMpqColumn, mQtyColumn, mBrandColumn, mPanColumn);
+                            mPosColumn, mLocationColumn, mModelColumn, mMpqColumn, mQtyColumn, mBrandColumn, mPanColumn);
                     mSmartTable.setTableData(mTableData);
-                    mMaterialMoveAdapter.notifyDataSetChanged();
                 } catch (Exception e) {
                     e.printStackTrace();
                 }

app/src/main/java/com/uas/jlt_storage/fragment/JLTUpperShelfBoxFragment.java

@@ -205,6 +205,7 @@ public class JLTUpperShelfBoxFragment extends BaseFragment implements View.OnCli
         }
         BoxBean boxBean = new BoxBean();
         boxBean.setBoxCode(boxNum);
+        boxBean.setUpperFailed(false);
         mBoxList.add(boxBean);
 
         mBoxEditText.setText("");
@@ -262,10 +263,35 @@ public class JLTUpperShelfBoxFragment extends BaseFragment implements View.OnCli
             public void onSuccess(int flag, Object o) throws Exception {
                 progressDialog.dismiss();
 
-                mLocationEditText.setText("");
-                mBoxList.clear();
-                mUpperShelfBoxAdapter.notifyDataSetChanged();
-                CommonUtil.toastNoRepeat(mActivity, "上架成功");
+                try {
+                    String result = o.toString();
+                    JSONObject resultObject = JSON.parseObject(result);
+                    JSONObject dataObject = resultObject.getJSONObject("data");
+                    if (dataObject != null) {
+                        JSONArray boxcodeArray = dataObject.getJSONArray("boxcode");
+                        if (boxcodeArray == null || boxcodeArray.size() == 0) {
+                            mLocationEditText.setText("");
+                            mBoxList.clear();
+                            mUpperShelfBoxAdapter.notifyDataSetChanged();
+                            CommonUtil.toastNoRepeat(mActivity, "上架成功");
+                        } else {
+                            for (int i = 0; i < mBoxList.size(); i++) {
+                                BoxBean boxBean = mBoxList.get(i);
+                                for (int j = 0; j < boxcodeArray.size(); j++) {
+                                    String failBox = boxcodeArray.getString(j);
+                                    if (!TextUtils.isEmpty(failBox) && failBox.equals(boxBean.getBoxCode())) {
+                                        boxBean.setUpperFailed(true);
+                                        break;
+                                    }
+                                }
+                            }
+                            mUpperShelfBoxAdapter.notifyDataSetChanged();
+                            CommonUtil.toastNoRepeat(mActivity, "上架失败，标红箱号不存在或不在此仓库中");
+                        }
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
 
             @Override

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <TextView
         android:layout_width="wrap_content"

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -312,7 +312,9 @@
                     style="@style/EditTextStyle"
                     android:layout_width="0dp"
                     android:layout_weight="1"
-                    android:inputType="number" />
+                    android:hint="请输入采集倍数"
+                    android:inputType="number"
+                    android:text="1" />
             </LinearLayout>
 
             <LinearLayout

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:background="#f2f2f2"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -250,8 +250,8 @@
                     android:id="@+id/jlt_storage_in_barcode_po_et"
                     style="@style/EditTextStyle"
                     android:layout_width="0dp"
-                    android:hint="请采集PO号"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    android:hint="请采集PO号" />
             </LinearLayout>
 
             <LinearLayout
@@ -270,9 +270,10 @@
 
                 <com.uas.jlt_storage.view.ClearableEditText
                     android:id="@+id/jlt_storage_in_barcode_lot_et"
-                    style="@style/EditTextUnableStyle"
+                    style="@style/EditTextStyle"
                     android:layout_width="0dp"
-                    android:layout_weight="1" />
+                    android:layout_weight="1"
+                    android:hint="请采集Lot" />
             </LinearLayout>
 
             <LinearLayout

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -33,13 +33,6 @@
             android:textColor="@color/text_blue" />
     </LinearLayout>
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/jlt_storage_material_move_rv"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="12dp"
-        android:visibility="gone"/>
-
     <com.bin.david.form.core.SmartTable
         android:id="@+id/jlt_storage_material_move_st"
         android:layout_width="match_parent"

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
 
     <LinearLayout

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -59,7 +59,7 @@
 
                     <TextView
                         style="@style/tl_tv_style"
-                        android:text="@string/location" />
+                        android:text="@string/BAR_LOCATION" />
 
                     <com.uas.jlt_storage.view.ClearableEditText
 

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
 
     <LinearLayout

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <ListView
         android:id="@+id/storage_inspection_detail_data_lv"

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <ListView
         android:id="@+id/storage_iqc_in_detail_data_lv"

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
 
     <LinearLayout

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="@dimen/root_layout_padding">
 
     <ListView
         android:id="@+id/storage_recharge_detail_lv"

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

@@ -4,57 +4,51 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="10dp">
+    android:padding="6dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="型号："
-            android:textColor="#333333" />
-
         <TextView
             android:id="@+id/item_jlt_storage_in_done_sub_model_tv"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:textColor="#666666"
-            tools:text="20342409808" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp">
+            android:layout_weight="4"
+            android:paddingHorizontal="2dp"
+            android:textColor="@color/black"
+            tools:text="2034240980dfsdfadfdasfsdeddsdsffd8" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="数量："
-            android:textColor="#333333" />
+            android:text="箱号:"
+            android:textColor="#666666" />
 
         <TextView
-            android:id="@+id/item_jlt_storage_in_done_sub_quantity_tv"
+            android:id="@+id/item_jlt_storage_in_done_sub_box_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:textColor="#666666"
-            tools:text="10" />
+            android:layout_weight="2"
+            android:paddingHorizontal="2dp"
+            android:textColor="#333333"
+            tools:text="XXXXdafdsafsdfsdfsX" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="箱号："
-            android:textColor="#333333" />
+            android:text="数量:"
+            android:textColor="#666666" />
 
         <TextView
-            android:id="@+id/item_jlt_storage_in_done_sub_box_tv"
+            android:id="@+id/item_jlt_storage_in_done_sub_quantity_tv"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="#666666"
-            tools:text="XXXXX" />
+            android:paddingHorizontal="2dp"
+            android:textColor="#333333"
+            tools:text="10" />
+
     </LinearLayout>
+
 </LinearLayout>

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

@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:padding="10dp"
+    android:padding="6dp"
     android:background="#dcdcdc">
 
     <TextView

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

@@ -4,35 +4,33 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="10dp">
+    android:padding="6dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="型号："
-            android:textColor="#333333" />
+
         <TextView
             android:id="@+id/item_jlt_storage_in_todo_sub_model_tv"
             android:layout_width="0dp"
-            android:layout_weight="2"
             android:layout_height="wrap_content"
-            android:textColor="#666666"
-            tools:text="20342409808"/>
+            android:layout_weight="3"
+            android:textColor="@color/black"
+            tools:text="20342409808" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="待采数："
+            android:text="待采数:"
             android:textColor="#333333" />
+
         <TextView
             android:id="@+id/item_jlt_storage_in_todo_sub_quantity_tv"
             android:layout_width="0dp"
-            android:layout_weight="1"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:textColor="#666666"
-            tools:text="10"/>
+            tools:text="10" />
     </LinearLayout>
 
 </LinearLayout>

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

@@ -98,4 +98,7 @@
 
     <color name="menu_item_normal">#FAF9F9</color>
     <color name="menu_item_press">#DFDEDE</color>
+
+    <color name="value_text_color">#333333</color>
+    <color name="caption_text_color">#666666</color>
 </resources>

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

@@ -1,5 +1,6 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="root_layout_padding">12dp</dimen>
     <!--EditText-->
     <dimen name="hint_pic">24dp</dimen>
     <dimen name="hint_pic_small">17dp</dimen>

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

@@ -302,7 +302,7 @@
     <string name="states">状态：</string>
     <string name="ms_resttime">剩余车间寿命(h)：</string>
     <string name="temp">烘烤温度\n(℃)</string>
-    <string name="location">储位</string>
+    <string name="BAR_LOCATION">储位</string>
     <string name="ovenTime">烘烤时长：</string>
     <string name="msd_in_oven_success">入烘烤成功</string>
     <string name="msd_out_oven_success">出烘烤成功</string>

build.gradle

@@ -1,4 +1,4 @@
-import sun.security.krb5.internal.crypto.Des
+ import sun.security.krb5.internal.crypto.Des
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 

gradlew

@@ -78,14 +78,14 @@ if [ -n "$JAVA_HOME" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
 
 Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
+BAR_LOCATION of your Java installation."
     fi
 else
     JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
+BAR_LOCATION of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.

gradlew.bat

@@ -27,7 +27,7 @@ echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo BAR_LOCATION of your Java installation.
 
 goto fail
 
@@ -41,7 +41,7 @@ echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
 echo.
 echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo BAR_LOCATION of your Java installation.
 
 goto fail