This commit is contained in:
parent
a7207dc9bf
commit
af9225d66f
|
|
@ -61,4 +61,9 @@ public class InputApplyDetails extends BaseEntity {
|
||||||
|
|
||||||
@ApiModelProperty(value = "二维码")
|
@ApiModelProperty(value = "二维码")
|
||||||
private String qrCode;
|
private String qrCode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修饰入库任务编号
|
||||||
|
*/
|
||||||
|
private String inputCode;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -746,6 +746,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
|
||||||
details.setCheckUser(SecurityUtils.getLoginUser().getUserid());
|
details.setCheckUser(SecurityUtils.getLoginUser().getUserid());
|
||||||
updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details);
|
updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if (!CollectionUtils.isEmpty(numList)) {
|
if (!CollectionUtils.isEmpty(numList)) {
|
||||||
for (PurchaseCheckDetails details : numList) {
|
for (PurchaseCheckDetails details : numList) {
|
||||||
|
|
|
||||||
|
|
@ -75,4 +75,9 @@ public class RepairInputInfo extends BaseEntity {
|
||||||
* 修饰入库人
|
* 修饰入库人
|
||||||
*/
|
*/
|
||||||
private String auditBy;
|
private String auditBy;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 修饰入库单号
|
||||||
|
*/
|
||||||
|
private String inputCode;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -150,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
select
|
select
|
||||||
rid.id as id,
|
rid.id as id,
|
||||||
rid.task_id as taskId,
|
rid.task_id as taskId,
|
||||||
|
tt.`code` as inputCode,
|
||||||
rid.ma_id as maId,
|
rid.ma_id as maId,
|
||||||
rid.type_id as typeId,
|
rid.type_id as typeId,
|
||||||
SUM(IFNULL(rid.repair_num, 0)) as repairNum,
|
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,
|
rid.reject_reason as rejectReason,
|
||||||
mt4.type_id as firstId
|
mt4.type_id as firstId
|
||||||
from repair_input_details rid
|
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 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 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
|
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"
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<select id="selectInputInfoByMaId" resultMap="RepairInputDetailsResult">
|
<select id="selectInputInfoByMaId" resultMap="RepairInputDetailsResult">
|
||||||
select id, task_id, ma_id, type_id, input_num, create_by, create_time, update_by, update_time, remark, company_id from repair_input_details
|
SELECT
|
||||||
where status = '0' and ma_id = #{maId}
|
rid.id,
|
||||||
limit 1
|
rid.task_id,
|
||||||
|
tt.`code` as inputCode,
|
||||||
|
rid.ma_id,
|
||||||
|
rid.type_id,
|
||||||
|
rid.input_num,
|
||||||
|
rid.create_by,
|
||||||
|
rid.create_time,
|
||||||
|
rid.update_by,
|
||||||
|
rid.update_time,
|
||||||
|
rid.remark,
|
||||||
|
rid.company_id
|
||||||
|
FROM
|
||||||
|
repair_input_details rid
|
||||||
|
LEFT JOIN tm_task tt on tt.task_id=rid.task_id
|
||||||
|
WHERE
|
||||||
|
rid.STATUS = '0'
|
||||||
|
AND rid.ma_id = #{maId}
|
||||||
|
|
||||||
|
LIMIT 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="updateInputNum">
|
<update id="updateInputNum">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue