思拓微增加智能上架(感应式)功能,出库采集页面增加料号放大镜及其功能弹窗,功能优化

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

@@ -89,6 +89,7 @@ import com.uas.uas_mes_stw.util.PrintUtils;
 import com.uas.uas_mes_stw.util.StringUtil;
 import com.uas.uas_mes_stw.util.VolleyRequest;
 import com.uas.uas_mes_stw.view.ClearableEditText;
+import com.umeng.commonsdk.debug.I;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
@@ -513,7 +514,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         }
 
         //条码输入框获取焦点
-        etBarCode.requestFocus();
+        cet_item_number.requestFocus();
 
         tvPiInoutno.setText(pi_inoutno);
         tvPdWhcode.setText(pd_whcode);
@@ -615,6 +616,11 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         btn_startoutku.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if (TextUtils.isEmpty(cet_item_number.getText().toString().trim())) {
+                    CommonUtil.toastNoRepeat(mActivity, "请输入物料");
+                    cet_item_number.requestFocus();
+                    return;
+                }
                 startchuku();
             }
         });
@@ -751,7 +757,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 bean.setPD_OUTQTY(jsonObject.getInt("PD_OUTQTY"));
                 bean.setV_RESQTY(jsonObject.getInt("V_RESQTY"));
                 bean.setPR_DETAIL(jsonObject.getString("PR_DETAIL"));
-                bean.setPR_DETAIL(jsonObject.getString("PR_SPEC"));
+                bean.setPR_SPEC(jsonObject.getString("PR_SPEC"));
                 bean.setSelect(false);
                 itemNumberList.add(bean);
             } catch (JSONException e) {
@@ -773,6 +779,8 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         MaterialAdapter materialAdapter = new MaterialAdapter(itemNumberList);
         materialAdapter.setmList(itemNumberList);
         rv_ip_port_data.setAdapter(materialAdapter);
+
+        search_im.setVisibility(View.GONE);
         edit_et.requestFocus();
         editPW = new PopupWindow(contView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
         editPW.setTouchable(true);
@@ -869,8 +877,12 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 List<ItemNumberBean> ipAndPortBeans = materialAdapter.getmList();
                 pd_prodcode = ipAndPortBeans.get(position).getPD_PRODCODE();
                 edit_et.setText(pd_prodcode);
+                for (int i = 0; i < ipAndPortBeans.size(); i++) {
+                    ipAndPortBeans.get(i).setSelect(false);
+                }
                 ipAndPortBeans.get(position).setSelect(true);
                 materialAdapter.notifyDataSetChanged();
+
             }
         });
     }
@@ -1077,7 +1089,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 progressDialog.dismiss();
                 if (getActivity() != null) {
                     mCollectTypeRadioGroup.setEnabled(true);
-                    CommonUtil.editTextGetFocus(etBarCode);
+                    CommonUtil.editTextGetFocus(cet_item_number);
                     String errorToast = CommonUtil.showErrorToast(volleyError, true);
                     mCollectResultTextView.setVisibility(View.VISIBLE);
                     mCollectResultTextView.setTextColor(getResources().getColor(R.color.red));
@@ -1128,7 +1140,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
                 progressDialog.dismiss();
                 if (getActivity() != null) {
                     mCollectTypeRadioGroup.setEnabled(true);
-                    CommonUtil.editTextGetFocus(etBarCode);
+                    CommonUtil.editTextGetFocus(cet_item_number);
                     String errorToast = CommonUtil.showErrorToast(volleyError, true);
                     mCollectResultTextView.setVisibility(View.VISIBLE);
                     mCollectResultTextView.setTextColor(getResources().getColor(R.color.red));
@@ -1916,7 +1928,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
             ((FunctionActivity) getActivity()).setMoreBtnVisible(true);
             ((FunctionActivity) getActivity()).setScanIvVisible(true);
             mScanImageView.setOnClickListener(this);
-            etBarCode.requestFocus();
+            cet_item_number.requestFocus();
 
             isConnected = (SharedPreUtil.getInt(mActivity, "printConnect", 0) == 1);
             mOldAddress = SharedPreUtil.getString(mActivity, "printAddress", "");
@@ -3097,6 +3109,7 @@ public class IOCOutMakeMaterialOper extends BaseFragment implements View.OnClick
         ((FunctionActivity) getActivity()).setScanIvVisible(false);
         ((TextView) (getActivity().findViewById(R.id.tv_actionbar_withback))).setText(getString(R.string.out_management));
         mDbManager.closeDB();
+        CommonUtil.closeKeybord(((EditText) cet_item_number), mActivity);
         CommonUtil.closeKeybord(((EditText) etBarCode), mActivity);
         ButterKnife.unbind(this);
         ((FunctionActivity) getActivity()).fragment = new IOCOutMakeMaterial();

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

@@ -139,6 +139,45 @@
 
                 </LinearLayout>
 
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:orientation="horizontal"
+                    android:background="@drawable/bg_edittext"
+                    android:gravity="center_vertical"
+                    android:layout_marginTop="8dp"
+                    >
+
+                    <com.uas.uas_mes_stw.view.ClearableEditText
+                        android:id="@+id/cet_item_number"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@drawable/bg_edittext"
+                        android:paddingStart="16dp"
+                        android:textSize="14sp"
+                        android:singleLine="true"
+                        android:imeOptions="flagNoExtractUi"
+                        android:textColor="@color/black"
+                        android:textColorHint="@color/gray_light"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:layout_weight="1"
+                        android:hint="物料" />
+
+                    <ImageView
+                        android:id="@+id/iv_item_number_search"
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="5dp"
+                        android:layout_marginEnd="10dp"
+                        android:background="@drawable/bg_button"
+                        android:src="@drawable/search_48" />
+
+                </LinearLayout>
+
+
                 <TableLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -188,37 +227,6 @@
                     android:text="@string/confirm"
                     android:visibility="gone" />
 
-
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-
-                    android:minHeight="48dp"
-                    >
-
-                    <com.uas.uas_mes_stw.view.ClearableEditText
-                        android:id="@+id/cet_item_number"
-                        style="@style/PopWinEditTextStyle"
-                        android:layout_marginTop="8dp"
-                        android:layout_weight="1"
-                        android:hint="料号" />
-
-                    <ImageView
-                        android:id="@+id/iv_item_number_search"
-                        android:layout_width="@dimen/height_32"
-                        android:layout_height="@dimen/height_32"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="@dimen/space_left_5"
-                        android:layout_marginRight="@dimen/dp_10"
-                        android:background="@drawable/bg_button"
-                        android:src="@drawable/search_48" />
-
-                </LinearLayout>
-
-
-
                 <TableLayout
                     android:id="@+id/iocout_collect_barcode_tl"
                     android:layout_width="match_parent"

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

@@ -2,7 +2,7 @@
 <!--一级griditem布局-->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="100dp"
+    android:layout_height="110dp"
     android:gravity="center"
     android:focusable="false"
     android:layout_centerInParent="true"
@@ -23,6 +23,6 @@
         android:layout_below="@id/first_griditem_img"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="14sp"
+        android:textSize="11sp"
         android:layout_centerHorizontal="true"/>
 </RelativeLayout>

build.gradle

@@ -46,7 +46,7 @@ task clean(type: Delete) {
 
 ext {
     android = [
-            minSdkVersion    : 16,
+            minSdkVersion    : 17,
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",