修改 大料查询物料

.idea/deploymentTargetDropDown.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="52540732" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2024-01-26T09:08:37.212757200Z" />
+  </component>
+</project>

app/build.gradle

@@ -10,7 +10,7 @@ android {
         applicationId "com.example.duken_mes"
         minSdk 24
         targetSdk 33
-        versionCode 1
+        versionCode 2
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/release/output-metadata.json

@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
+      "versionCode": 2,
       "versionName": "1.0",
       "outputFile": "app-release.apk"
     }

app/src/main/java/com/example/duken_mes/MainActivity.java

@@ -71,7 +71,8 @@ public class MainActivity extends BaseActivity {
 
     @Override
     protected void sanInfo(String code) {
-        if (san_info) {
+        var tankCode = mainVm.getTankCode();
+        if (tankCode==null||tankCode.isEmpty()) {
             mainVm.setTankCode(code);
         } else {
             mainVm.setTrayCode(code);
@@ -81,24 +82,26 @@ public class MainActivity extends BaseActivity {
 
     }
 
-    private boolean san_info;
+    // private boolean san_info;
 
     public void san_tank(View v) {
-        Toast.makeText(this, "扫描料罐....", Toast.LENGTH_SHORT).show();
-        // 创建一个Intent对象，指定广播的Action
-        Intent intent = new Intent("com.scan.onStartScan");
-        // 发送广播
-        sendBroadcast(intent);
-        san_info = true;
+        // Toast.makeText(this, "扫描料罐....", Toast.LENGTH_SHORT).show();
+        // // 创建一个Intent对象，指定广播的Action
+        // Intent intent = new Intent("com.scan.onStartScan");
+        // // 发送广播
+        // sendBroadcast(intent);
+        // san_info = true;
+        mainVm.setTankCode(null);
     }
 
     public void san_tray(View v) {
-        Toast.makeText(this, "扫描托盘....", Toast.LENGTH_SHORT).show();
-        // 创建一个Intent对象，指定广播的Action
-        Intent intent = new Intent("com.scan.onStartScan");
-        // 发送广播
-        sendBroadcast(intent);
-        san_info = false;
+        // Toast.makeText(this, "扫描托盘....", Toast.LENGTH_SHORT).show();
+        // // 创建一个Intent对象，指定广播的Action
+        // Intent intent = new Intent("com.scan.onStartScan");
+        // // 发送广播
+        // sendBroadcast(intent);
+        // san_info = false;
+        mainVm.setTrayCode(null);
     }
 
     private IngredientInfo ingredientInfo;

app/src/main/java/com/example/duken_mes/base/BaseActivity.java

@@ -16,8 +16,8 @@ import com.google.gson.Gson;
 import okhttp3.MediaType;
 
 public abstract class BaseActivity extends AppCompatActivity {
-    // public static String url = "http://175.27.215.92:6089";
-    public static String url = "http://10.11.41.121:6089";
+    public static String url = "http://10.168.205.73:6089";
+    // public static String url = "http://10.11.41.121:6089";
     public ProgressDialog dialog;
     public Gson gson;
     public MediaType JSON = MediaType.parse("application/json; charset=utf-8");