修改 整包称量

.idea/.name

@@ -0,0 +1 @@
+PuLiT

app/build.gradle

@@ -10,7 +10,7 @@ android {
         applicationId "com.example.pulit"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 13
+        versionCode 14
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/release/output-metadata.json

@@ -10,7 +10,7 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 13,
+      "versionCode": 14,
       "versionName": "1.0",
       "outputFile": "app-release.apk"
     }

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

@@ -33,7 +33,7 @@ public class MainActivity extends AppCompatActivity {
 
 
     @OnClick({R.id.home_xl_b, R.id.home_xl_t, R.id.home_xl_z, R.id.home_rj_c, R.id.home_rj_t,
-            R.id.home_setting,R.id.home_lt, R.id.home_back, R.id.home_plan})
+            R.id.home_setting, R.id.home_lt, R.id.home_back, R.id.home_plan})
     public void onClick(View view) {
         Intent intent = null;
         switch (view.getId()) {
@@ -63,7 +63,7 @@ public class MainActivity extends AppCompatActivity {
                 intent = new Intent(this, LtActivity.class);
                 break;
 
-                case R.id.home_back:
+            case R.id.home_back:
                 finish();
                 break;
         }

app/src/main/java/com/example/pulit/ZBActivity.java

@@ -16,6 +16,9 @@ import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
 import com.lzy.okgo.model.Response;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -35,6 +38,7 @@ public class ZBActivity extends BaseActivity {
     private boolean exist;
     private String dbCode = null;
     private String findGoodesCode = null;
+    List<String> stringList;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -42,6 +46,7 @@ public class ZBActivity extends BaseActivity {
         setContentView(R.layout.activity_zb);
         ButterKnife.bind(this);
         sanType = 0;
+        stringList=new ArrayList<>();
 
     }
 
@@ -117,6 +122,7 @@ public class ZBActivity extends BaseActivity {
                 planView.setWeighbridge(dbaname);
                 planView.setCylinderBarCode("00000000");
                 planView.setRate("0");
+                planView.setBarCodeList(stringList);
                 RequestBody requestBody = RequestBody.create(MediaType.parse("application/json;"),
                         JSONObject.toJSONString(planView));
                 OkGo.<Resust>post("http://" + SharedPreferencesUtils.getstring("ip", null) + "/api/Solvent/ExecPlcState")
@@ -132,6 +138,7 @@ public class ZBActivity extends BaseActivity {
                                     zbGoodsCode.setText(null);
                                     planView = null;
                                     zbGoodsName.setText(null);
+                                    stringList.clear();
 
                                 }
                             }
@@ -164,6 +171,8 @@ public class ZBActivity extends BaseActivity {
             tipDialog.showMsg(false, "物料不匹配");
             return;
         }
+        stringList.add(zbGoodsCode.getText().toString().trim());
+
         //品名
         int index = scanInfo.indexOf("-", scanInfo.indexOf("-", scanInfo.indexOf("-") + 1) + 1) + 1;
         int endIndex = scanInfo.indexOf("|");