diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java
index 96e23d4e..7f7e1937 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/LeaseApplyDetails.java
@@ -138,6 +138,7 @@ public class LeaseApplyDetails implements Serializable {
      */
     @ApiModelProperty(value = "装备管理方式名称")
     private String manageTypeName;
+    private String maCode;
 
     /**
      * 实时库存
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index fbcd3d9e..877bebfa 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -516,11 +516,12 @@
     SELECT
         lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
         case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
-        mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum
+        mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
     FROM
         lease_apply_details lad
         LEFT JOIN ma_type mt ON lad.type_id = mt.type_id
         LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
+        LEFT JOIN ma_machine mm ON lad.type_id = mm.type_id
     WHERE
         lad.parennt_id = #{record.id} AND lad.company_id = #{record.companyId}
   </select>
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
index 6959a5d8..b562513a 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
@@ -139,7 +139,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int auditScrap(ScrapAudit scrapAudit) throws Exception {
         String checkResult = scrapAudit.getCheckResult();
         List<ScrapApplyDetails> scrapDetailList = scrapAudit.getScrapDetailList();
@@ -186,9 +186,9 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
                 List<ScrapApplyDetails> repairList = new ArrayList<>();
                 if (scrapApplyDetailsList.size()>0){
                     for (ScrapApplyDetails bean : scrapApplyDetailsList){
-                        if (bean.getScrapSource().equals("1")){
+                        if ("1".equals(bean.getScrapSource())){
                             backList.add(bean);
-                        }else if (bean.getScrapSource().equals("2")){
+                        }else if ("2".equals(bean.getScrapSource())){
                             repairList.add(bean);
                         }
                     }
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 861c5d1d..c71e96bf 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -38,9 +38,9 @@ module.exports = {
         //  target:  `http://112.29.103.165:21626`,//线上环境-重庆
         // target: `http://112.29.103.165:21624`,//线上环境-宁夏
         // target: `http://192.168.0.14:21624`,//线上环境
-        // target: `http://10.40.92.21:8080`,
-        // target: `http://10.40.92.13:8080`,
-        target: `http://10.40.92.220:8080`,
+        // target: `http://10.40.92.21:8080`,//超
+        target: `http://10.40.92.12:8080`,//韩
+        // target: `http://10.40.92.220:8080`,//川
 
         changeOrigin: true,
         pathRewrite: {