退料增加二级类型

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyDetails.java

@@ -38,6 +38,9 @@ public class BackApplyDetails extends BaseEntity {
     @ApiModelProperty(value = "任务ID")
     private Long parentId;
 
+    @ApiModelProperty(value = "物资类型")
+    private String materialType;
+
     /** 规格ID */
     @Excel(name = "规格ID")
     @ApiModelProperty(value = "规格ID")
@@ -60,9 +63,6 @@ public class BackApplyDetails extends BaseEntity {
      */
     private List<MaCodeDto> maCodeList;
 
-    @ApiModelProperty(value = "机具编码")
-    private String maCode;
-
     /** 退料数量 */
     @ApiModelProperty(value = "退料数量")
     private Integer preNum;

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/MaCodeDto.java

@@ -26,6 +26,9 @@ public class MaCodeDto {
     @ApiModelProperty(value = "机具外观判断")
     private String apDetection;
 
+    @ApiModelProperty(value = "物资类型")
+    private String materialType;
+
     private String typeId;
 
     private String materialName;

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/MaCodeVo.java

@@ -18,6 +18,9 @@ public class MaCodeVo {
 
     private String typeId;
 
+    @ApiModelProperty(value = "物资类型")
+    private String materialType;
+
     private String materialName;
 
     private String typeName;

bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java

@@ -136,6 +136,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
             maCodeDto.setMaterialName(maCodeVo.getMaterialName());
             maCodeDto.setTypeId(maCodeVo.getTypeId());
             maCodeDto.setMaStatus(maCodeVo.getMaStatus());
+            maCodeDto.setMaterialType(maCodeVo.getMaterialType());
             // 查询并设置编码附件
             List<BmFileInfo> bmFileInfoList = fetchBmFileInfos(details.getId(), maCodeVo.getMaId());
             if (CollectionUtils.isNotEmpty(bmFileInfoList)) {

bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml

@@ -153,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ba.CODE AS CODE,
             ba.parent_id AS parentId,
             ba.type_id AS typeId,
+            mt2.type_name AS materialType,
             mt.type_name AS typeModel,
             mt1.type_name AS typeName,
             mt.unit_name AS unitName,
@@ -164,13 +165,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ba.create_time AS createTime,
             ba.update_by AS updateBy,
             ba.update_time AS updateTime,
-            ba.ma_code AS maCode,
             ba.remark AS remark,
             ba.ap_detection AS apDetection
         FROM
             back_apply_details ba
                 LEFT JOIN ma_type mt ON mt.type_id = ba.type_id and mt.del_flag = 0
                 LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = 0
+                LEFT JOIN ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = 0
         WHERE ba.parent_id = #{id}
     </select>
 
@@ -179,6 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bcd.ma_id AS maId,
             mm.ma_code as maCode,
             bcd.type_id AS typeId,
+            mt2.type_name AS materialType,
             mt.type_name AS materialName,
             mt1.type_name AS typeName,
             bcd.ap_detection AS apDetection,
@@ -187,7 +189,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             back_check_details bcd
         left join ma_machine mm on bcd.ma_id = mm.ma_id
         left join ma_type mt ON mt.type_id = mm.type_id and mt.del_flag = 0
-        left join ma_type mt1 ON mt.parent_id = mt1.type_id and mt.del_flag = 0
+        left join ma_type mt1 ON mt.parent_id = mt1.type_id and mt1.del_flag = 0
+        left join ma_type mt2 ON mt1.parent_id = mt2.type_id and mt2.del_flag = 0
         where bcd.parent_id = #{id}
     </select>