diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 0c51b85..a058051 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -8,7 +8,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index d7916a5..0f86676 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,5 @@ - - + diff --git a/app/build.gradle b/app/build.gradle index bbb73c4..93108c9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.example.aucma_mes" minSdk 24 targetSdk 33 - versionCode 12 - versionName "1.12" + versionCode 13 + versionName "1.13" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/example/aucma_mes/entity/DefectBeen.java b/app/src/main/java/com/example/aucma_mes/entity/DefectBeen.java index 9868a6d..d812c39 100644 --- a/app/src/main/java/com/example/aucma_mes/entity/DefectBeen.java +++ b/app/src/main/java/com/example/aucma_mes/entity/DefectBeen.java @@ -25,6 +25,15 @@ public class DefectBeen extends BaseObservable { private String productLineName;//pda 工位名称 private String productLineCode; + private String inspectorTime; + + public String getInspectorTime() { + return inspectorTime; + } + + public void setInspectorTime(String inspectorTime) { + this.inspectorTime = inspectorTime; + } public String getProductLineCode() { return productLineCode; diff --git a/app/src/main/res/layout/item_repair_info.xml b/app/src/main/res/layout/item_repair_info.xml index 2b5b47a..6cdb10b 100644 --- a/app/src/main/res/layout/item_repair_info.xml +++ b/app/src/main/res/layout/item_repair_info.xml @@ -1,8 +1,9 @@ - + + @@ -28,34 +29,58 @@ android:layout_height="match_parent" android:background="@color/white" /> - - - - - - + + + + + + - + android:orientation="vertical"> - + + + + + + + + + + + + android:textColor="#E71717" + android:textSize="15sp" />