Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java

@@ -210,6 +210,21 @@ public class MachineController extends BaseController {
             return error("系统错误, " + e.getMessage());
         }
     }
+    /**
+     * 电子标签编码查询接口
+     *
+     * @param machine
+     * @return
+     */
+    @ApiOperation(value = "电子标签编码查询接口")
+    @GetMapping("/findMaMsgById")
+    public AjaxResult findMaMsgById(Machine machine) {
+        try {
+            return success(machineService.findMaMsgById(machine));
+        } catch (Exception e) {
+            return error("系统错误, " + e.getMessage());
+        }
+    }
 
     /**
      * 根据标签信息查询出库单

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Machine.java

@@ -330,5 +330,7 @@ public class Machine extends BaseEntity {
 
     private String type;
 
+    private String repairMan;
+
     private Integer manageType;
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/mapper/MachineMapper.java

@@ -227,4 +227,6 @@ public interface MachineMapper
     int updateMaStatus(BoxBindWarehouseDto boxMa);
 
     List<Machine> getNewByMaCode(Machine machine);
+
+    List<Machine> findMaMsgById(Machine machine);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/IMachineService.java

@@ -144,4 +144,6 @@ public interface IMachineService
     AjaxResult editMachineStatus(Machine machine);
 
     List<Machine> getNewByMaCode(Machine machine);
+
+    List<Machine> findMaMsgById(Machine machine);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/MachineServiceImpl.java

@@ -587,6 +587,11 @@ public class MachineServiceImpl implements IMachineService
         return machineMapper.getNewByMaCode(machine);
     }
 
+    @Override
+    public List<Machine> findMaMsgById(Machine machine) {
+        return machineMapper.findMaMsgById(machine);
+    }
+
     /**
      * 编码铭牌信息
      * @param machine

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml

@@ -995,8 +995,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update ma_machine set ma_status = 1 where ma_id = #{maId}
     </update>
 
-    <select id="getNewByMaCode" resultMap="MachineResult">
+    <select id="getNewByMaCode" resultType="com.bonus.material.ma.domain.Machine">
 
+        SELECT
+            mm.ma_id AS maId,
+            mt2.type_name as materialName,
+            mt.type_name as materialModel,
+            mm.ma_code as maCode,
+            LEFT(mm.this_check_time, 10) AS thisCheckTime,
+            LEFT(mm.next_check_time, 10) AS nextCheckTime,
+            mm.check_man as repairMan,
+            ifnull(mm.inspect_man,"高民")   as checkMan,
+            "0551-63703966" as phone,
+            "合格" as result,mm.ex_code AS reportCode,mm.ex_url AS reportUrl,
+            is_jj as type,
+            mt.jiju_type as devType
+        FROM ma_machine mm
+            LEFT JOIN ma_type mt on mm.type_id = mt.type_id
+            LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
+        WHERE mm.ma_code LIKE CONCAT('%',#{maCode},'%') and mt.MANAGE_TYPE =0
+        UNION
         SELECT
             mi.id as maId,
             mi.ma_name as materialName,
@@ -1013,23 +1031,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             ws_ma_info mi
         WHERE mi.ma_code LIKE CONCAT('%',#{maCode},'%') and mi.is_active = 1
-        UNION
+
+            LIMIT 60
+    </select>
+
+    <select id="findMaMsgById" resultType="com.bonus.material.ma.domain.Machine">
         SELECT
-            mm.ma_id AS id,
+            mi.id as maId,
-            mt2.type_name as maName,
+            mi.ma_name as materialName,
-            mt.type_name as maModel,
+            mi.ma_model as materialModel,
-            mm.ma_code as maCode,
+            mi.ma_code as maCode,
-            LEFT(mm.this_check_time, 10) AS thisCheckTime,
+            LEFT(mi.this_check_time, 10) AS thisCheckTime,
-            LEFT(mm.next_check_time, 10) AS nextCheckTime,
+            LEFT(mi.next_check_time, 10) AS nextCheckTime,
-            mm.check_man as repairMan,
+            mi.repair_man as repairMan,
-            ifnull(mm.inspect_man,"高民")   as checkMan,
+            mi.check_man as checkMan,
-            "0551-63703966" as phone,
+            mi.phone,
-            "合格" as result,mm.ex_code AS reportCode,mm.ex_url AS reportUrl,
+            mi.result,null AS reportCode,null AS reportUrl,
-            is_jj as type,
+            mi.type,
-            mt.jiju_type as devType
+            '1' as devType
-        FROM ma_machine mm
+        FROM
-            LEFT JOIN ma_type mt on mm.type_id = mt.type_id
+            ws_ma_info mi
-            LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
+        WHERE mi.id =#{maId}
-        WHERE mm.ma_code LIKE CONCAT('%',#{maCode},'%') and mt.MANAGE_TYPE =0
     </select>
 </mapper>