Merge remote-tracking branch 'origin/asv2022.3.1' into asv2022.3.1

app/src/main/java/com/example/tyre/maintenance/CreateWorkOrderActivity.java

@@ -103,6 +103,15 @@ public class CreateWorkOrderActivity extends BaseActivity {
             }
         });
 
+        String typeTitle = getIntent().getStringExtra("title");
+        if (typeTitle != null) {
+            List<String> typeList = Arrays.asList(getResources().getStringArray(R.array.work_type));
+            int index = typeList.indexOf(typeTitle);
+            if (index != -1) {
+                binding.orderCreateType.setSelection(index);
+            }
+        }
+
     }
 
     private void selectCarNo(String carNo) {

app/src/main/java/com/example/tyre/maintenance/WorkOrderActivity.java

@@ -39,6 +39,7 @@ public class WorkOrderActivity extends BaseActivity implements OrderAdapter.Sele
     private List<Order> list;
     private OrderAdapter adapter;
     private String typeCode;
+    private String title;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,7 +48,7 @@ public class WorkOrderActivity extends BaseActivity implements OrderAdapter.Sele
         status = new ObservableBoolean(false);
         binding.setStatus(status);
         Intent intent = getIntent();
-        String title = intent.getStringExtra("title");
+        title = intent.getStringExtra("title");
 
         typeCode = intent.getStringExtra("typeCode");
         binding.setTitle(title);
@@ -148,7 +149,9 @@ public class WorkOrderActivity extends BaseActivity implements OrderAdapter.Sele
 
     // 创建
     public void goCreateWorkOrder(View view) {
-        startActivity(new Intent(this, CreateWorkOrderActivity.class));
+        Intent intent = new Intent(this, CreateWorkOrderActivity.class);
+        intent.putExtra("title", title);
+        startActivity(intent);
     }
 
     public void switchStatus(View view) {