1.新增没有国睿数据的情况下不弹框选择

app/build.gradle

@@ -13,7 +13,7 @@ android {
         //noinspection ExpiredTargetSdkVersion,OldTargetApi
         targetSdk 28
         versionCode 1
-        versionName "2.3"
+        versionName "2.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true

app/src/main/java/xn/hxp/ui/MainActivity.java

@@ -24,8 +24,11 @@ import androidx.viewbinding.ViewBinding;
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.ClickUtils;
+import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.SPUtils;
+import com.blankj.utilcode.util.ThreadUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.RequestOptions;
@@ -35,10 +38,13 @@ import com.lztek.toolkit.Lztek;
 import com.rc.core.ui.activity.BaseActivity;
 import com.rc.httpcore.HttpClient;
 import com.rc.httpcore.HttpConfig;
+import com.rc.httpcore.bean.HxpChemicalVo;
 import com.rc.httpcore.bean.RuleBean;
 import com.rc.httpcore.client.ApiRepository;
 import com.rc.httpcore.client.HttpTool;
 
+import org.json.JSONObject;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -47,6 +53,7 @@ import java.util.Map;
 import io.reactivex.rxjava3.functions.Consumer;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
+import okhttp3.Response;
 import xn.hxp.R;
 import xn.hxp.app.ChemicalApp;
 import xn.hxp.databinding.ActivityMainBinding;
@@ -61,6 +68,8 @@ import xn.hxp.ui.login.ScanLoginActivity;
 import xn.hxp.ui.login.SwipeActivity;
 import xn.hxp.ui.plan.PlanAddActivity;
 import xn.hxp.ui.plan.already.AlreadyActivity;
+import xn.hxp.ui.plan.already.AlreadyAdapter;
+import xn.hxp.ui.plan.already.AlreadyBean;
 import xn.hxp.ui.still.ChemicalsAlsoActivity;
 import xn.hxp.ui.still.MsdsActivity;
 import xn.hxp.ui.uses.UseActivity;
@@ -450,20 +459,7 @@ public class MainActivity extends BaseActivity {
                 //新增
                 if (ChemicalApp.userData != null) {
                     if (ChemicalApp.administrators || ChemicalApp.responsibles) {
-                        planDialog = new PlanDialog(MainActivity.this, new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                UiManager.INSTANCE.switcher(MainActivity.this, AlreadyActivity.class);
-                                planDialog.dismiss();
-                            }
-                        }, new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                UiManager.INSTANCE.switcher(MainActivity.this, PlanAddActivity.class);
-                                planDialog.dismiss();
-                            }
-                        });
-                        planDialog.show();
+                        getHxpStockWait();
                     } else {
                         customDialogView(2, "当前人员无权限");
                     }
@@ -631,4 +627,49 @@ public class MainActivity extends BaseActivity {
     interface LogoutCallback {
         void onComplete(boolean success);
     }
+
+
+    /**
+     * 获取已申领未入库列表
+     */
+    private void getHxpStockWait() {
+        showLoading("加载中...");
+        ThreadUtils.executeByCached(new ThreadUtils.SimpleTask<AlreadyBean>() {
+            @Override
+            public AlreadyBean doInBackground() throws Throwable {
+                Response response = HttpTool.getHxpStockWait(0, ChemicalApp.subjectId, 1, 10, "", "", "");
+                String json = response.body().string();
+                JSONObject jsonObject = new JSONObject(json);
+                if (jsonObject.getInt("code") == 200) {
+                    return GsonUtils.fromJson(jsonObject.getJSONObject("data").toString(), AlreadyBean.class);
+                } else {
+                    String msg = jsonObject.getString("message");
+                    ToastUtils.showLong(msg);
+                    return null;
+                }
+            }
+
+            @Override
+            public void onSuccess(AlreadyBean result) {
+                if (null != result) {
+                    AlreadyBean.PageData pageData = result.getPageData();
+                    if (null != pageData && pageData.getPages() > 0) {
+                        planDialog = new PlanDialog(MainActivity.this, v -> {
+                            UiManager.INSTANCE.switcher(MainActivity.this, AlreadyActivity.class);
+                            planDialog.dismiss();
+                        }, v -> {
+                            UiManager.INSTANCE.switcher(MainActivity.this, PlanAddActivity.class);
+                            planDialog.dismiss();
+                        });
+                        planDialog.show();
+                    } else {
+                        UiManager.INSTANCE.switcher(MainActivity.this, PlanAddActivity.class);
+                    }
+                } else {
+                    UiManager.INSTANCE.switcher(MainActivity.this, PlanAddActivity.class);
+                }
+                dismissLoading();
+            }
+        });
+    }
 }