From f47319052a813ba0bbb092f15b9156737c52ba2b Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 15 Nov 2024 19:18:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=80=80=E6=96=99?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/back/service/impl/BackApplyInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index 6df8810a..5df2ee00 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -367,7 +367,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { } else { taskNum = "01"; } - return "H" + format + "-" + taskNum; + return "T" + format + "-" + taskNum; } /** From 278c94969f4d1d9088d495585d4658ae7109a846 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sat, 16 Nov 2024 11:08:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=80=E6=96=99=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/back/domain/BackApplyDetails.java | 6 +++--- .../java/com/bonus/material/back/domain/MaCodeDto.java | 3 +++ .../java/com/bonus/material/back/domain/vo/MaCodeVo.java | 3 +++ .../back/service/impl/BackApplyInfoServiceImpl.java | 1 + .../resources/mapper/material/back/BackApplyInfoMapper.xml | 7 +++++-- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyDetails.java index 15902720..faee7159 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/BackApplyDetails.java +++ b/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 maCodeList; - @ApiModelProperty(value = "机具编码") - private String maCode; - /** 退料数量 */ @ApiModelProperty(value = "退料数量") private Integer preNum; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/MaCodeDto.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/MaCodeDto.java index 6f0479b8..c337d2c3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/MaCodeDto.java +++ b/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; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/MaCodeVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/MaCodeVo.java index 9334e9a8..a17cd8bf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/MaCodeVo.java +++ b/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; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index 5df2ee00..dcd326cb 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/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 bmFileInfoList = fetchBmFileInfos(details.getId(), maCodeVo.getMaId()); if (CollectionUtils.isNotEmpty(bmFileInfoList)) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index 7a09bffe..8f35ce34 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/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} @@ -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}