单据入库改为入库绑定

入库绑定页面料号输入框请求失败时只清空料号输入框
条码信息采集输入框回车状态调整

app/src/main/AndroidManifest.xml

@@ -13,6 +13,8 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.CAMERA" />
 
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 

app/src/main/java/com/uas/uas_mes_standard/fragment/BarcodeInfoCollectFragment.java

@@ -53,6 +53,9 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
     private ClearableEditText material_in_collect_old_et;
     private CheckBox checkbox_barcode;
     private LinearLayout line__collect_old;
+    private CheckBox cellect_check;
+    private CheckBox datecode_check;
+    private CheckBox location_check;
 
     @Override
     protected int getLayout() {
@@ -74,6 +77,12 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
         line__collect_old = root.findViewById(R.id.line__collect_old);
         checkbox_barcode = root.findViewById(R.id.checkbox_barcode);//物料一致性校验CheckBox
         mLocationEditText = (ClearableEditText) root.findViewById(R.id.material_in_collect_location_et);
+        //lotno
+        cellect_check = root.findViewById(R.id.cellect_check);
+        //日期
+        datecode_check = root.findViewById(R.id.datecode_check);
+        //仓位
+        location_check = root.findViewById(R.id.location_check);
 
         mBarcodeEditText.requestFocus();
     }
@@ -193,16 +202,21 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
                 if (TextUtils.isEmpty(barcode)) {
                     CommonUtil.toastNoRepeat(mActivity, "请采集条码");
                     mBarcodeEditText.requestFocus();
+                    return;
                 }
-//                else if (TextUtils.isEmpty(lotno)) {
-//                    CommonUtil.toastNoRepeat(mActivity, "请输入LotNo");
-//                    mLotEditText.requestFocus();
-//                }
-//                else if (TextUtils.isEmpty(date)) {
-//                    CommonUtil.toastNoRepeat(mActivity, "请输入DateCode");
-//                    mDateEditText.requestFocus();
-//                }
-                else {
+                if (cellect_check.isChecked()==true&&lotno.isEmpty()){
+                    CommonUtil.toastNoRepeat(mActivity, "请输入LotNo");
+                    return;
+                }
+                if (datecode_check.isChecked()==true&&date.isEmpty()){
+                    CommonUtil.toastNoRepeat(mActivity, "请输入DateCode");
+                    return;
+                }
+                if (location_check.isChecked()==true&&warehouse.isEmpty()){
+                    CommonUtil.toastNoRepeat(mActivity, "请输入仓位");
+                    return;
+                }
+
                     if(jsonObject!=null){
                         try {
                             if (TextUtils.isEmpty(lotno)) {
@@ -226,7 +240,7 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
 
 
                     saveBarAcceptCode(lotno, date, barcode);
-                }
+
             }
         });
 
@@ -253,10 +267,6 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
         String mLotEditTexttrim = mLotEditText.getText().toString().trim();//loton
         String mDateEditTexttrim = mDateEditText.getText().toString().trim();//DateCode
         String mLocationEditTexttrim = mLocationEditText.getText().toString().trim();//仓位
-
-
-
-
         if (mBarcodeEditTexttrim.isEmpty()){
             mBarcodeEditText.requestFocus();
             return;
@@ -319,12 +329,12 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
         String mLocationEditTexttrim = mLocationEditText.getText().toString().trim();//仓位
 
 
-        if (mDateEditTexttrim.isEmpty()){
+        if (datecode_check.isChecked()==true&&mDateEditTexttrim.isEmpty()){
             mDateEditText.requestFocus();
             return;
         }
 
-        if (mLocationEditTexttrim.isEmpty()){
+        if (location_check.isChecked()==true&&mLocationEditTexttrim.isEmpty()){
             mLocationEditText.requestFocus();
             return;
         }
@@ -336,6 +346,53 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
             material_in_collect_old_et.requestFocus();
             return;
         }
+        String barcode = mBarcodeEditText.getText().toString();
+        String lotno = mLotEditText.getText().toString().trim();
+        String date = mDateEditText.getText().toString().trim();
+        String warehouse = mLocationEditText.getText().toString().trim();
+        if (TextUtils.isEmpty(barcode)) {
+            CommonUtil.toastNoRepeat(mActivity, "请采集条码");
+            mBarcodeEditText.requestFocus();
+            return;
+        }
+        if (cellect_check.isChecked()==true&&lotno.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入LotNo");
+            return;
+        }
+        if (datecode_check.isChecked()==true&&date.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入DateCode");
+            return;
+        }
+        if (location_check.isChecked()==true&&warehouse.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入仓位");
+            return;
+        }
+
+        if(jsonObject!=null){
+            try {
+                if (TextUtils.isEmpty(lotno)) {
+                    jsonObject.put("LOTNO","");
+                }else {
+                    jsonObject.put("LOTNO",lotno);
+                }
+                if (TextUtils.isEmpty(date)) {
+                    jsonObject.put("DC","");
+                }else {
+                    jsonObject.put("DC",date);
+                }
+
+                jsonObject.put("LC",warehouse);
+
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+
+        }
+
+
+        saveBarAcceptCode(lotno, date, barcode);
+
+
 
     }
     //DateCode回车
@@ -347,7 +404,7 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
 
 
 
-        if (mLocationEditTexttrim.isEmpty()){
+        if (location_check.isChecked()==true&&mLocationEditTexttrim.isEmpty()){
             mLocationEditText.requestFocus();
             return;
         }
@@ -359,10 +416,55 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
             material_in_collect_old_et.requestFocus();
             return;
         }
-        if (mLotEditTexttrim.isEmpty()){
+        if (cellect_check.isChecked()==true&&mLotEditTexttrim.isEmpty()){
             mLotEditText.requestFocus();
             return;
         }
+        String barcode = mBarcodeEditText.getText().toString();
+        String lotno = mLotEditText.getText().toString().trim();
+        String date = mDateEditText.getText().toString().trim();
+        String warehouse = mLocationEditText.getText().toString().trim();
+        if (TextUtils.isEmpty(barcode)) {
+            CommonUtil.toastNoRepeat(mActivity, "请采集条码");
+            mBarcodeEditText.requestFocus();
+            return;
+        }
+        if (cellect_check.isChecked()==true&&lotno.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入LotNo");
+            return;
+        }
+        if (datecode_check.isChecked()==true&&date.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入DateCode");
+            return;
+        }
+        if (location_check.isChecked()==true&&warehouse.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入仓位");
+            return;
+        }
+
+        if(jsonObject!=null){
+            try {
+                if (TextUtils.isEmpty(lotno)) {
+                    jsonObject.put("LOTNO","");
+                }else {
+                    jsonObject.put("LOTNO",lotno);
+                }
+                if (TextUtils.isEmpty(date)) {
+                    jsonObject.put("DC","");
+                }else {
+                    jsonObject.put("DC",date);
+                }
+
+                jsonObject.put("LC",warehouse);
+
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+
+        }
+
+
+        saveBarAcceptCode(lotno, date, barcode);
 
     }
     //仓位回车
@@ -379,14 +481,59 @@ public class BarcodeInfoCollectFragment extends BaseFragment {
             material_in_collect_old_et.requestFocus();
             return;
         }
-        if (mLotEditTexttrim.isEmpty()){
+        if (cellect_check.isChecked()==true&&mLotEditTexttrim.isEmpty()){
             mLotEditText.requestFocus();
             return;
         }
-        if (mDateEditTexttrim.isEmpty()){
+        if (datecode_check.isChecked()==true&&mDateEditTexttrim.isEmpty()){
             mDateEditText.requestFocus();
             return;
         }
+        String barcode = mBarcodeEditText.getText().toString();
+        String lotno = mLotEditText.getText().toString().trim();
+        String date = mDateEditText.getText().toString().trim();
+          String warehouse = mLocationEditText.getText().toString().trim();
+        if (TextUtils.isEmpty(barcode)) {
+            CommonUtil.toastNoRepeat(mActivity, "请采集条码");
+            mBarcodeEditText.requestFocus();
+            return;
+        }
+        if (cellect_check.isChecked()==true&&lotno.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入LotNo");
+            return;
+        }
+        if (datecode_check.isChecked()==true&&date.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入DateCode");
+            return;
+        }
+        if (location_check.isChecked()==true&&warehouse.isEmpty()){
+            CommonUtil.toastNoRepeat(mActivity, "请输入仓位");
+            return;
+        }
+
+        if(jsonObject!=null){
+            try {
+                if (TextUtils.isEmpty(lotno)) {
+                    jsonObject.put("LOTNO","");
+                }else {
+                    jsonObject.put("LOTNO",lotno);
+                }
+                if (TextUtils.isEmpty(date)) {
+                    jsonObject.put("DC","");
+                }else {
+                    jsonObject.put("DC",date);
+                }
+
+                jsonObject.put("LC",warehouse);
+
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+
+        }
+
+
+        saveBarAcceptCode(lotno, date, barcode);
     }
 
 

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

@@ -1115,6 +1115,12 @@ public class JLTStorageInBarcodeFragment extends BaseFragment implements View.On
             public void onFail(int flag, String failStr) throws Exception {
                 progressDialog.dismiss();
                 CommonUtil.toastNoRepeat(mActivity, failStr);
+                mBarcodeEditText.setText(null);
+                mBarcodeEditText.requestFocus();
+//                check_box_positions.setChecked(true);
+//                check_box_lono.setChecked(true);
+//                check_box_date.setChecked(true);
+//                check_box_dc.setChecked(true);
             }
         });
     }

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

@@ -12,6 +12,7 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.format.DateFormat;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
@@ -107,7 +108,7 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
 
     @Override
     protected void initViews() {
-        FunctionActivity.setTitle("单据入库");
+        FunctionActivity.setTitle("入库绑定");
         ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
         ((FunctionActivity) getActivity()).setScanIvVisible(true);
 
@@ -368,7 +369,6 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
 
                             }
                         }, 100);
-
                         getcollectData();
 
 
@@ -549,7 +549,6 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                 new Response.Listener<String>() {
                     @Override
                     public void onResponse(String s) {
-                        mBarcodeEditText.setEnabled(false);
 //                        new Handler().postDelayed(new Runnable() {
 //                            @Override
 //                            public void run() {
@@ -604,17 +603,18 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
         mIgnoreFocusChange = true;
         String url = null;
         DataBean dataBean=new DataBean();
-        if(!TextUtils.isEmpty(mBarCode)){
-            dataBean.setBARCODE(mBarCode);
-        }else{
+//        if(!TextUtils.isEmpty(mBarCode)){
+//            dataBean.setBARCODE(mBarCode);
+//        }else{
             dataBean.setBARCODE(mNumEditText.getText().toString());//取界面料号
-        }
+//        }
         dataBean.setPRODCODE(mNumEditText.getText().toString());
         dataBean.setLOTNO(mLotNoEditText.getText().toString());
         dataBean.setDATECODE(mDateCodeEditText.getText().toString());
         dataBean.setLC(mLocationEditText.getText().toString());
         dataBean.setDC(mDcEditText.getText().toString());
         String datasJson=new Gson().toJson(dataBean);
+        Log.e("codes",datasJson);
         try {
             if ("barcode".equals(mCollectType)) {
                 url = GloableParams.ADDRESS_INMATERIAL_GETCODEDATA + "?type=barcode&pi_id=" + mPiid
@@ -690,9 +690,9 @@ public class MaterialInCollectFragment extends BaseFragment implements View.OnCl
                         String errorToast = CommonUtil.showErrorToast(volleyError, true);
                         mResultTextView.setVisibility(View.VISIBLE);
                         mResultTextView.setText(errorToast);
-                        mBarcodeEditText.setEnabled(true);
-                        mBarcodeEditText.setText(null);
-                        mBarcodeEditText.requestFocus();
+                        mNumEditText.setEnabled(true);
+                        mNumEditText.setText(null);
+                        mNumEditText.requestFocus();
                         mIgnoreFocusChange = false;
                     }
                 }) {

app/src/main/java/com/uas/uas_mes_standard/fragment/ToadoptpromptFragment.java

@@ -107,7 +107,7 @@ public class ToadoptpromptFragment extends BaseFragment {
 
     private void setTableData(List<StockTaskMultipleBean> filterTableData) {
         mTableData = new TableData<StockTaskMultipleBean>("出库单列表", filterTableData,
-                mOutqtyColumn, mProdcodeColumn, mTypeColumn,mPdaqtyColumn, mDetailColumn);
+                mOutqtyColumn, mProdcodeColumn,mPdaqtyColumn, mDetailColumn,mTypeColumn);
         mSmartTable.setTableData(mTableData);
         mSmartTable.postDelayed(new Runnable() {
             @Override

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

@@ -77,7 +77,7 @@
                 style="@style/EditTextStyle"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
-                android:hint="请采集旧条码"
+                android:hint="请采集料号"
                 android:textColor="@color/black" />
         </LinearLayout>
         <LinearLayout
@@ -107,6 +107,11 @@
                 android:imeOptions="actionSend"
                 android:inputType="text"
                 android:textColor="@color/black" />
+            <CheckBox
+                android:id="@+id/cellect_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </CheckBox>
         </LinearLayout>
         <LinearLayout
             android:layout_marginTop="5dp"
@@ -135,6 +140,12 @@
                 android:imeOptions="actionSend"
                 android:inputType="text"
                 android:textColor="@color/black" />
+
+            <CheckBox
+                android:id="@+id/datecode_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </CheckBox>
         </LinearLayout>
 
         <LinearLayout
@@ -163,6 +174,11 @@
                 android:maxLines="1"
                 android:textColor="@color/black"
                 android:singleLine="true"/>
+            <CheckBox
+                android:id="@+id/location_check"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
+            </CheckBox>
         </LinearLayout>
     </LinearLayout>
 

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

@@ -61,7 +61,8 @@
             android:layout_weight="1"
             android:background="@null"
             android:focusable="true"
-            android:focusableInTouchMode="true"
+            android:selectAllOnFocus="true"
+            android:numeric="signed"
             android:hint="请采集条码号/二维码"
             android:imeOptions="actionSend"
             android:textColor="@color/black" />