app退料接收无数据bug修改
This commit is contained in:
parent
eda8eac15d
commit
7ef53ff9fe
|
|
@ -269,9 +269,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<BackApplyInfo> backReceiveRecord(BackApplyInfo record) {
|
public List<BackApplyInfo> backReceiveRecord(BackApplyInfo record) {
|
||||||
|
|
||||||
List<BackApplyInfo> backApplyInfoList = backReceiveMapper.backReceiveRecord(record);
|
List<BackApplyInfo> backApplyInfoList = backReceiveMapper.backReceiveRecord(record);
|
||||||
|
|
||||||
return backApplyInfoList;
|
return backApplyInfoList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -797,7 +797,7 @@
|
||||||
SELECT
|
SELECT
|
||||||
mt2.type_name AS typeName,
|
mt2.type_name AS typeName,
|
||||||
mt1.type_name AS typeCode,
|
mt1.type_name AS typeCode,
|
||||||
ifnull(sum( bcd.back_num ), 0) AS backNum,
|
ifnull(bcd.back_num, 0) AS backNum,
|
||||||
mm.ma_code as maCode,
|
mm.ma_code as maCode,
|
||||||
bcd.create_time AS backTime,
|
bcd.create_time AS backTime,
|
||||||
bcd.type_id as modelId,
|
bcd.type_id as modelId,
|
||||||
|
|
@ -809,12 +809,9 @@
|
||||||
LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
|
LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
|
||||||
WHERE
|
WHERE
|
||||||
bcd.parent_id = #{parentId}
|
bcd.parent_id = #{parentId}
|
||||||
AND bcd.type_id = #{typeId}
|
|
||||||
<if test="maCode != null and maCode != ''">
|
<if test="maCode != null and maCode != ''">
|
||||||
and mm.ma_code like concat('%', #{maCode}, '%')
|
and mm.ma_code like concat('%', #{maCode}, '%')
|
||||||
</if>
|
</if>
|
||||||
GROUP BY
|
|
||||||
bcd.type_id
|
|
||||||
ORDER BY
|
ORDER BY
|
||||||
bcd.create_time DESC
|
bcd.create_time DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue