diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/input/domain/InputApplyDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/input/domain/InputApplyDetails.java index e70a991e..f199d098 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/input/domain/InputApplyDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/input/domain/InputApplyDetails.java @@ -61,4 +61,9 @@ public class InputApplyDetails extends BaseEntity { @ApiModelProperty(value = "二维码") private String qrCode; + + /** + * 修饰入库任务编号 + */ + private String inputCode; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index dd75e0e3..ecfe742a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -746,6 +746,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { details.setCheckUser(SecurityUtils.getLoginUser().getUserid()); updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details); } + } if (!CollectionUtils.isEmpty(numList)) { for (PurchaseCheckDetails details : numList) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputInfo.java index 877dfdaf..b91f7c30 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputInfo.java @@ -75,4 +75,9 @@ public class RepairInputInfo extends BaseEntity { * 修饰入库人 */ private String auditBy; + + /** + * 修饰入库单号 + */ + private String inputCode; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml index c14d8fc8..99b9fe15 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml @@ -150,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select rid.id as id, rid.task_id as taskId, + tt.`code` as inputCode, rid.ma_id as maId, rid.type_id as typeId, SUM(IFNULL(rid.repair_num, 0)) as repairNum, @@ -171,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" rid.reject_reason as rejectReason, mt4.type_id as firstId from repair_input_details rid + LEFT JOIN tm_task tt on tt.task_id=rid.task_id LEFT JOIN ma_type mt on rid.type_id = mt.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 tm_task_agreement tta ON rid.task_id = tta.task_id @@ -499,9 +501,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"