chage ide

app/src/main/java/com/rehome/zhdcoa/ui/activity/HjpdActivity.java

@@ -99,13 +99,12 @@ public class HjpdActivity extends BaseActivity implements RealTimeKcpdAdapter.Ca
         btn_query.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                String spinnerSonSelectItemStr = spinnerSon.getSelectedItem().toString();
+                //String spinnerSonSelectItem = spinnerSon.getSelectedItem();
-                if (!TextUtils.isEmpty(UiUtlis.getText(et_hgtm)) || !TextUtils.isEmpty(spinnerSonSelectItemStr) || !TextUtils.isEmpty(UiUtlis.getText(etXmh)))
+                if (!TextUtils.isEmpty(UiUtlis.getText(et_hgtm)) && spinnerSon.getSelectedItem() != null && !TextUtils.isEmpty(spinnerSon.getSelectedItem().toString())) {
-                {
                     requestData("加载中...");
                     UiUtlis.hideInput(et_hgtm, context);
-                } else{
+                } else {
-                    showToast("请扫码母货架号和填写物资編码");
+                    showToast("请扫码母货架号");
                 }
             }
         });
@@ -136,12 +135,12 @@ public class HjpdActivity extends BaseActivity implements RealTimeKcpdAdapter.Ca
 //                    request.add("ITEMNUM", UiUtlis.getText(etXmh));
 //                    request.add("BINNUM", UiUtlis.getText(et_hgtm));
 
-                    if (!UiUtlis.getText(et_sjsl).isEmpty() && !UiUtlis.getText(et_hgtm).isEmpty() && !UiUtlis.getText(etXmh).isEmpty()) {
+                    if (!UiUtlis.getText(et_sjsl).isEmpty() && !UiUtlis.getText(et_hgtm).isEmpty()) {
                         boolean ispd = false;
                         if (infos.size() != 0) {
                             for (RealTimeKcpdInfo.RowsBean kcpd : infos) {
 
-                                if (kcpd.getISPD().equals("1") && kcpd.getBINNUM().equals(UiUtlis.getText(et_hgtm))) {
+                                if (kcpd.getISPD().equals("1") && kcpd.getBINNUM().equals(spinnerSon.getSelectedItem().toString())) {
                                     ispd = true;
                                     break;
                                 }
@@ -456,7 +455,7 @@ public class HjpdActivity extends BaseActivity implements RealTimeKcpdAdapter.Ca
         et_sl.setText(infos.get(index).getCURBAL() + "");
         et_sjsl.setText(infos.get(index).getCURBAL() + "");
         et_sjsl.setEnabled(true);
-        et_hgtm.setText(infos.get(index).getBINNUM());
+        //et_hgtm.setText(infos.get(index).getBINNUM());
     }
 
     private void clearView() {
@@ -548,6 +547,8 @@ public class HjpdActivity extends BaseActivity implements RealTimeKcpdAdapter.Ca
                         if (oneLevelShelvesBean.isFlag() && oneLevelShelvesBean.getDatas() != null && oneLevelShelvesBean.getDatas().size() > 0) {
                             String BINNUM = oneLevelShelvesBean.getDatas().get(0).getBINNUM();
                             getSpinnerSonData(BINNUM);
+                        }else{
+                            showToast("查询不到子货架号，请确认母货架号是否正确");
                         }
                     }
                 }
@@ -641,6 +642,21 @@ public class HjpdActivity extends BaseActivity implements RealTimeKcpdAdapter.Ca
  * 1K103
  * 1K101-034
  * IT16159
+ * <p>
+ * 1K101
+ * 1K101-043
+ * IT63867
+ * <p>
+ * 1K102
+ * 1K101-013
+ * IT62209
+ * IT62210
+ * IT62211
+ * IT60669
+ * <p>
+ * 1K103
+ * 1K101-034
+ * IT16159
  */
 
 /**

build.gradle

@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.1.0' apply false
+    id 'com.android.application' version '8.1.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
 }