Merge remote-tracking branch 'origin/master'

wangfei

2025-03-14 dacf6715218c6061d53220b456c75a559bc5af8f

Merge remote-tracking branch 'origin/master'

 UI-Project/src/lang/zh.js

@@ -317,7 +317,7 @@
          takemessage:'是否拿走该条信息？',
          breakage:'破损',
          takeout:'拿走',
          glasstype:'玻璃类型',
          glasstype:'玻璃膜系',
          line:'线路',
          status:'状态',
          time:'时间段',

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java

@@ -366,10 +366,12 @@
            result.put("title", reportingWorkJson);

            result.put("type", 0);
            if (reportingWorkDetails.get(0).getDamageDetails().get(0).getPatchStatus() == 1) {
                result.put("isPatch", 1);
            } else {
                result.put("isPatch", 0);
            if (reportingWorkDetails.get(0).getDamageDetails() != null) {
                if (reportingWorkDetails.get(0).getDamageDetails().get(0).getPatchStatus() == 1) {
                    result.put("isPatch", 1);
                } else {
                    result.put("isPatch", 0);
                }
            }
            result.put("userId", "admin");
            result.put("userName", "admin");