From 8fe185fdfa2e4046e69ae13a5f81db22953c5503 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Mon, 18 Nov 2024 15:30:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/DeviceRepairInfoActivity.java      | 33 +++++++++++++++++--
 .../entity/device/DeviceRepair.java           |  1 +
 .../layout/activity_device_repair_info.xml    |  4 +--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java b/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java
index aa2b9ae..7f17b32 100644
--- a/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java
+++ b/app/src/main/java/com/example/jingyuan_mes/device/DeviceRepairInfoActivity.java
@@ -52,6 +52,7 @@ public class DeviceRepairInfoActivity extends BaseActivity implements DisposalFi
     private ListPopupWindow opeLpw;
     private List<Dict> faultList;
     private List<Dict> opeList;
+    private List<File> submitFileList;
 
 
     @Override
@@ -131,17 +132,19 @@ public class DeviceRepairInfoActivity extends BaseActivity implements DisposalFi
         outStrRequest();
         // 图片
         filesList = new ArrayList<>();
+        submitFileList = new ArrayList<>();
         var dmsInstanceFiles = deviceRepair.getDmsInstanceFiles();
         if (dmsInstanceFiles != null && !dmsInstanceFiles.isEmpty()) {
             dmsInstanceFiles.forEach(t -> {
                 CheckInstanceFiles files = new CheckInstanceFiles();
                 files.setFaultFile(t.getFilePath());
-                files.setState(activityType);
+                files.setState(false);
                 filesList.add(files);
             });
         }
 
         fileAdapter.setList(filesList);
+
         binding.setAdapter1(fileAdapter);
         imgDialog = new ImgDialog(this);
 
@@ -280,7 +283,33 @@ public class DeviceRepairInfoActivity extends BaseActivity implements DisposalFi
         checkInstanceFiles.setState(true);
         filesList.add(checkInstanceFiles);
         fileAdapter.notifyDataSetChanged();
-        // files.add(file);
+        submitFileList.add(file);
+    }
+    // 提交修改 维修工单
+    public void submitUpdateRepair(View view){
+        OkGo.<MyResult>post(url + "/dms/mobile/updateFaultInstanceActivity")
+                .headers("Authorization", SharedPreferencesUtils.getstring("access_token", ""))
+                .params("instanceActivityld", deviceRepair.getRepairInstanceId())
+                .params("faultType", deviceRepair.getFaultType())
+                .params("faultDescription", deviceRepair.getFaultDescription())
+                .params("designOperations", deviceRepair.getDesignOperations())
+                .params("repairType", deviceRepair.getRepairType())
+                .params("outsrcld", deviceRepair.getOutsrcId())
+                .addFileParams("files", submitFileList)
+                .execute(new MyRecultCall(dialog, this) {
+                    @Override
+                    public void onSuccess(Response<MyResult> response) {
+                        super.onSuccess(response);
+                        var body = response.body();
+                        if (body.getCode() == 200) {
+                            if (!submitFileList.isEmpty()){
+                                submitFileList.forEach(File::delete);
+                            }
+                            finish();
+                        }
+                        myToastUitls.show( body.getMsg());
+                    }
+                });
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java b/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java
index 60711b2..bcf59c5 100644
--- a/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java
+++ b/app/src/main/java/com/example/jingyuan_mes/entity/device/DeviceRepair.java
@@ -95,6 +95,7 @@ public class DeviceRepair  extends BaseObservable {
 
     public void setOutsourcingNameList(List<String> outsourcingNameList) {
         this.outsourcingNameList = outsourcingNameList;
+        notifyChange();
     }
 
     public List<Outsourcing> getOutsourcingList() {
diff --git a/app/src/main/res/layout/activity_device_repair_info.xml b/app/src/main/res/layout/activity_device_repair_info.xml
index f32983c..e7de96c 100644
--- a/app/src/main/res/layout/activity_device_repair_info.xml
+++ b/app/src/main/res/layout/activity_device_repair_info.xml
@@ -330,7 +330,7 @@
                     android:onItemSelected="@{vm.selectOutSourcingID}"
                     android:spinnerMode="dropdown"
                     android:textAlignment="center" />
-
+<!--                android:selection="@{vm.outsourcingNameList.indexOf(vm.outsrcId)}"-->
             </LinearLayout>
 
             <TextView
@@ -423,7 +423,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="55dp"
                 android:layout_margin="20dp"
-                android:onClick="endRepair"
+                android:onClick="submitUpdateRepair"
                 android:text="提交修改"
                 android:visibility="@{visState?View.VISIBLE:View.GONE}" />