材料入库采集添加DC采集项

app/src/main/java/com/uas/pda_smart_com/fragment/MaterialInCollectFragment.java

@@ -14,6 +14,7 @@ import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.format.DateFormat;
 import android.util.Log;
+import android.view.DisplayCutout;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
@@ -71,8 +72,8 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
 
     private TextView mInoutnoTextView, mWhcodeTextView, mTypeTextView, mResultTextView;
     private ClearableEditText mBarcodeEditText, mLotNoEditText,
-            mDateCodeEditText, mNumEditText, mOldEditText, mLocationEditText;
-    private TableRow mLotNoTableRow, mDateCodeTableRow, mNumTableRow, mOldTableRow, mLocationTableRow;
+            mDateCodeEditText, mNumEditText, mOldEditText, mLocationEditText, mDcEditText;
+    private TableRow mLotNoTableRow, mDateCodeTableRow, mNumTableRow, mOldTableRow, mLocationTableRow, mDcTableRow;
     private Button mConfirmButton, mMoreMenuButton;
     private ImageView mCalendarImageView, mScanImageView;
     private CheckBox mContinuousCheckBox;
@@ -87,6 +88,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
     private boolean mNumCheck;
     private boolean mOldCheck;
     private boolean mLocationCheck;
+    private boolean mDcCheck;
     private StringRequest mStringRequest;
     private String DIALOG_DATE = "DialogDate";
     private static final int REQUEST_DATE = 0;
@@ -141,11 +143,13 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         mNumEditText = (ClearableEditText) root.findViewById(R.id.material_in_collect_num_et);
         mOldEditText = (ClearableEditText) root.findViewById(R.id.material_in_collect_old_et);
         mLocationEditText = (ClearableEditText) root.findViewById(R.id.material_in_collect_location_et);
+        mDcEditText = (ClearableEditText) root.findViewById(R.id.material_in_collect_dc_et);
         mLotNoTableRow = (TableRow) root.findViewById(R.id.material_in_collect_lotno_tr);
         mDateCodeTableRow = (TableRow) root.findViewById(R.id.material_in_collect_datecode_tr);
         mNumTableRow = (TableRow) root.findViewById(R.id.material_in_collect_num_tr);
         mOldTableRow = (TableRow) root.findViewById(R.id.material_in_collect_old_tr);
         mLocationTableRow = (TableRow) root.findViewById(R.id.material_in_collect_location_tr);
+        mDcTableRow = (TableRow) root.findViewById(R.id.material_in_collect_dc_tr);
         mConfirmButton = (Button) root.findViewById(R.id.material_in_collect_confirm_btn);
         mMoreMenuButton = (Button) mActivity.findViewById(R.id.btn_actionbar_more);
         mScanImageView = (ImageView) mActivity.findViewById(R.id.btn_actionbar_scan_iv);
@@ -183,6 +187,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                 mNumCheck = setJsonObject.optBoolean("num");
                 mOldCheck = setJsonObject.optBoolean("old");
                 mLocationCheck = setJsonObject.optBoolean("location");
+                mDcCheck = setJsonObject.optBoolean("dc");
             } catch (JSONException e) {
                 e.printStackTrace();
             }
@@ -192,6 +197,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             mNumCheck = true;
             mOldCheck = false;
             mLocationCheck = true;
+            mDcCheck = true;
         }
         if (mLotnoCheck) {
             mLotNoTableRow.setVisibility(View.VISIBLE);
@@ -218,6 +224,11 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         } else {
             mLocationTableRow.setVisibility(View.GONE);
         }
+        if (mDcCheck) {
+            mDcTableRow.setVisibility(View.VISIBLE);
+        } else {
+            mDcTableRow.setVisibility(View.GONE);
+        }
     }
 
     @Override
@@ -248,6 +259,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                     mDateCodeEditText.setEnabled(false);
                     mOldEditText.setEnabled(false);
                     mLocationEditText.setEnabled(false);
+                    mDcEditText.setEnabled(false);
                     mCalendarImageView.setClickable(false);
 
                     if (!mContinuousCheckBox.isChecked()) {
@@ -256,6 +268,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         mDateCodeEditText.setText(null);
                         mOldEditText.setText(null);
                         mLocationEditText.setText(null);
+                        mDcEditText.setText(null);
                     }
                 } else {
                     mNumEditText.setEnabled(true);
@@ -263,6 +276,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                     mDateCodeEditText.setEnabled(true);
                     mOldEditText.setEnabled(true);
                     mLocationEditText.setEnabled(true);
+                    mDcEditText.setEnabled(true);
                     mCalendarImageView.setClickable(true);
                 }
             }
@@ -298,6 +312,14 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                                 mNumEditText.requestFocus();
                             }
                         }, 100);
+                    } else if (mLotnoCheck) {
+                        mLotNoEditText.requestFocus();
+                    } else if (mDateCodeCheck) {
+                        mDateCodeEditText.requestFocus();
+                    } else if (mLocationCheck) {
+                        mLocationEditText.requestFocus();
+                    } else if (mDcCheck) {
+                        mDcEditText.requestFocus();
                     }
                     return true;
                 }
@@ -315,8 +337,14 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     if (isAllEdit()) {
                         confirmEvent();
-                        return true;
+                    } else if (mDateCodeCheck) {
+                        mDateCodeEditText.requestFocus();
+                    } else if (mLocationCheck) {
+                        mLocationEditText.requestFocus();
+                    } else if (mDcCheck) {
+                        mDcEditText.requestFocus();
                     }
+                    return true;
                 }
                 return false;
             }
@@ -330,14 +358,35 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
                     if (isAllEdit()) {
                         confirmEvent();
-                        return true;
+                    } else if (mLocationCheck) {
+                        mLocationEditText.requestFocus();
+                    } else if (mDcCheck) {
+                        mDcEditText.requestFocus();
                     }
+                    return true;
                 }
                 return false;
             }
         });
 
         mLocationEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_SEND
+                        || actionId == EditorInfo.IME_ACTION_DONE
+                        || (event != null && event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+                    if (isAllEdit()) {
+                        confirmEvent();
+                    } else if (mDcCheck) {
+                        mDcEditText.requestFocus();
+                    }
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        mDcEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
 
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
@@ -376,6 +425,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         String num = mNumEditText.getText().toString().trim();
         String old = mOldEditText.getText().toString().trim();
         String location = mLocationEditText.getText().toString().trim();
+        String dc = mDcEditText.getText().toString().trim();
         if (TextUtils.isEmpty(barcode)) {
             return false;
         } else if (mLotnoCheck && TextUtils.isEmpty(lotno)) {
@@ -388,6 +438,8 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             return false;
         } else if (mLocationCheck && TextUtils.isEmpty(location)) {
             return false;
+        } else if (mDcCheck && TextUtils.isEmpty(dc)) {
+            return false;
         }
         return true;
     }
@@ -477,6 +529,8 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                                         mOldEditText.requestFocus();
                                     } else if (mLocationCheck) {
                                         mLocationEditText.requestFocus();
+                                    } else if (mDcCheck) {
+                                        mDcEditText.requestFocus();
                                     }
                                 }
                             } catch (JSONException e) {
@@ -548,6 +602,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                 mDateCodeEditText.setText(null);
                 mOldEditText.setText(null);
                 mLocationEditText.setText(null);
+                mDcEditText.setText(null);
                 mBarcodeEditText.requestFocus();
                 if ("条码".equals(typeName)) {
                     changeToTypeBox();
@@ -725,6 +780,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         final String num = mNumEditText.getText().toString().trim();
         String old = mOldEditText.getText().toString().trim();
         String location = mLocationEditText.getText().toString().trim();
+        String dc = mDcEditText.getText().toString().trim();
         if (TextUtils.isEmpty(barcode)) {
             if (mCollectType.equals("barcode"))
                 CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_collect_code));
@@ -740,6 +796,8 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
             CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_collect_old_barcode));
         } else if (mLocationCheck && TextUtils.isEmpty(location)) {
             CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_input_storage_location));
+        } else if (mDcCheck && TextUtils.isEmpty(dc)) {
+            CommonUtil.toastNoRepeat(mActivity, getString(R.string.please_input_storage_dc));
         } else if (!barcode.matches(Constants.REGEX.NO_CN_SYMBOL) || (mOldCheck && !old.matches(Constants.REGEX.NO_CN_SYMBOL))) {
             if (mCollectType.equals("barcode"))
                 CommonUtil.toastNoRepeat(mActivity, getResources().getString(R.string.barcode_cannot_contain_special));
@@ -789,6 +847,9 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                 if (mLocationCheck) {
                     paramsJson.put("re_location", location);
                 }
+                if (mDcCheck) {
+                    paramsJson.put("re_dc", dc);
+                }
 
             } catch (JSONException e) {
                 e.printStackTrace();
@@ -827,6 +888,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                             mNumEditText.setText(null);
                             mOldEditText.setText(null);
                             mLocationEditText.setText(null);
+                            mDcEditText.setText(null);
                             mBarcodeEditText.setText(null);
                             mBarcodeEditText.requestFocus();
                         }
@@ -915,6 +977,9 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                 } else if (mFocusId == R.id.material_in_collect_location_et) {
                     mLocationEditText.setText(result);
                     mLocationEditText.setSelection(result.length());
+                } else if (mFocusId == R.id.material_in_collect_dc_et) {
+                    mDcEditText.setText(result);
+                    mDcEditText.setSelection(result.length());
                 }
 
             }

app/src/main/java/com/uas/pda_smart_com/fragment/MaterialInCollectItemSetFragment.java

@@ -23,7 +23,7 @@ import org.json.JSONObject;
  * Created by RaoMeng on 2017/3/17.
  */
 public class MaterialInCollectItemSetFragment extends BaseFragment implements View.OnClickListener {
-    private CheckBox mLotNoCheckBox, mNumCheckBox, mOldCheckBox, mLocationCheckBox, mDateCodeCheckBox;
+    private CheckBox mLotNoCheckBox, mNumCheckBox, mOldCheckBox, mLocationCheckBox, mDateCodeCheckBox, mDcCheckBox;
     private Button mConfirmButton;
     private String mSetString;
     private boolean mLotnoCheck = true;
@@ -31,6 +31,7 @@ public class MaterialInCollectItemSetFragment extends BaseFragment implements Vi
     private boolean mNumCheck = true;
     private boolean mOldCheck = false;
     private boolean mLocationCheck = true;
+    private boolean mDcCheck = true;
 
     @Override
     protected int getLayout() {
@@ -45,6 +46,7 @@ public class MaterialInCollectItemSetFragment extends BaseFragment implements Vi
         mNumCheckBox = (CheckBox) root.findViewById(R.id.material_in_collect_set_num_cb);
         mOldCheckBox = (CheckBox) root.findViewById(R.id.material_in_collect_set_old_cb);
         mLocationCheckBox = (CheckBox) root.findViewById(R.id.material_in_collect_set_location_cb);
+        mDcCheckBox = (CheckBox) root.findViewById(R.id.material_in_collect_set_dc_cb);
         mConfirmButton = (Button) root.findViewById(R.id.material_in_collect_set_confirm_btn);
 
         mSetString = SharedPreUtil.getString(mActivity, Constants.FLAG.MATERIAL_IN_COLLECT_SET, null);
@@ -56,12 +58,14 @@ public class MaterialInCollectItemSetFragment extends BaseFragment implements Vi
                 mNumCheck = setJsonObject.optBoolean("num");
                 mOldCheck = setJsonObject.optBoolean("old");
                 mLocationCheck = setJsonObject.optBoolean("location");
+                mDcCheck = setJsonObject.optBoolean("dc");
 
                 mLotNoCheckBox.setChecked(mLotnoCheck);
                 mDateCodeCheckBox.setChecked(mDateCodeCheck);
                 mNumCheckBox.setChecked(mNumCheck);
                 mOldCheckBox.setChecked(mOldCheck);
                 mLocationCheckBox.setChecked(mLocationCheck);
+                mDcCheckBox.setChecked(mDcCheck);
             } catch (JSONException e) {
                 e.printStackTrace();
             }
@@ -141,7 +145,9 @@ public class MaterialInCollectItemSetFragment extends BaseFragment implements Vi
                     && new Boolean(mDateCodeCheck).equals(mDateCodeCheckBox.isChecked())
                     && new Boolean(mNumCheck).equals(mNumCheckBox.isChecked())
                     && new Boolean(mOldCheck).equals(mOldCheckBox.isChecked())
-                    && new Boolean(mLocationCheck).equals(mLocationCheckBox.isChecked())) {
+                    && new Boolean(mLocationCheck).equals(mLocationCheckBox.isChecked())
+                    && new Boolean(mDcCheck).equals(mDcCheckBox.isChecked())
+            ) {
                 sendResult(Activity.RESULT_OK);
                 getActivity().getSupportFragmentManager().popBackStack();
                 return true;
@@ -214,6 +220,7 @@ public class MaterialInCollectItemSetFragment extends BaseFragment implements Vi
                 && !mNumCheckBox.isChecked()
                 && !mOldCheckBox.isChecked()
                 && !mLocationCheckBox.isChecked()
+                && !mDcCheckBox.isChecked()
                 && !CommonUtil.isGoldenMaster(mActivity);
     }
 
@@ -226,6 +233,7 @@ public class MaterialInCollectItemSetFragment extends BaseFragment implements Vi
         mNumCheck = mNumCheckBox.isChecked();
         mOldCheck = mOldCheckBox.isChecked();
         mLocationCheck = mLocationCheckBox.isChecked();
+        mDcCheck = mDcCheckBox.isChecked();
         JSONObject setObject = new JSONObject();
         try {
             setObject.put("lotno", mLotnoCheck);
@@ -233,6 +241,7 @@ public class MaterialInCollectItemSetFragment extends BaseFragment implements Vi
             setObject.put("num", mNumCheck);
             setObject.put("old", mOldCheck);
             setObject.put("location", mLocationCheck);
+            setObject.put("dc", mDcCheck);
         } catch (JSONException e) {
             e.printStackTrace();
         }

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -63,8 +62,7 @@
                 android:layout_height="wrap_content"
                 android:text="连续采集" />
 
-            <TableRow
-                android:background="@color/white">
+            <TableRow android:background="@color/white">
 
                 <TextView
                     android:id="@+id/material_in_collect_type_tv"
@@ -255,6 +253,33 @@
                     android:textColor="@color/black" />
             </TableRow>
 
+            <TableRow
+                android:id="@+id/material_in_collect_dc_tr"
+                android:layout_marginTop="5dp">
+
+                <TextView
+                    android:id="@+id/material_in_collect_dc_tv"
+                    style="@style/tl_tv_style"
+                    android:layout_height="match_parent"
+                    android:background="@color/gray_light"
+                    android:gravity="center"
+                    android:padding="10dp"
+                    android:text="DC"
+                    android:textColor="@color/body_text_1"
+                    android:textSize="16sp" />
+
+                <com.uas.pda_smart_com.view.ClearableEditText
+                    android:id="@+id/material_in_collect_dc_et"
+                    style="@style/EditTextStyle"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:enabled="false"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:hint="请采集DC"
+                    android:textColor="@color/black" />
+            </TableRow>
+
 
         </TableLayout>
 

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

@@ -40,6 +40,14 @@
             android:checked="true"
             android:text="仓位采集"/>
 
+        <CheckBox
+            android:id="@+id/material_in_collect_set_dc_cb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:checked="true"
+            android:text="DC采集"/>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="10dp"></LinearLayout>

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

@@ -406,6 +406,7 @@
     <string name="please_input_material_num">请输入料号</string>
     <string name="please_collect_old_barcode">请采集旧条码</string>
     <string name="please_input_storage_location">请输入仓位</string>
+    <string name="please_input_storage_dc">请采集DC</string>
     <string name="date_format_error">日期格式错误</string>
     <string name="stock_barcode_list">条码补生成单列表</string>
     <string name="barcode_generation_quantity">补条码数</string>