机具领料逻辑修改
This commit is contained in:
parent
b75dd3ff91
commit
199ced5e85
|
|
@ -1375,7 +1375,7 @@
|
|||
cpd.model_id modelId,
|
||||
cpd.need_num needNum,
|
||||
cpd.need_day needDay,
|
||||
cpd.back_date backDate,
|
||||
cpa.need_time backDate,
|
||||
cpd.remark,
|
||||
cmti.type maType,
|
||||
cmti.`NAME` maName,
|
||||
|
|
@ -1387,6 +1387,7 @@
|
|||
LEFT JOIN bm_project bp ON cpa.pro_id = bp.ID
|
||||
LEFT JOIN car_ma_type_info cmti ON cpd.model_id = cmti.id
|
||||
WHERE bp.`NAME` IS NOT NULL
|
||||
and cpa.status = 1
|
||||
<if test="projectName != null and projectName != ''">
|
||||
and bp.`NAME` like concat('%', #{projectName}, '%')
|
||||
</if>
|
||||
|
|
@ -1403,7 +1404,7 @@
|
|||
spd.model_id AS modelId,
|
||||
spd.need_num AS needNum,
|
||||
spd.need_day AS needDay,
|
||||
spd.back_date AS backDate,
|
||||
spa.need_time AS backDate,
|
||||
spd.remark,
|
||||
spd.type maType,
|
||||
spd.`name` maName,
|
||||
|
|
@ -1413,6 +1414,7 @@
|
|||
LEFT JOIN st_plan_apply spa ON spd.apply_id = spa.id
|
||||
LEFT JOIN bm_project bp ON spa.project_id = bp.ID
|
||||
WHERE bp.`NAME` IS NOT NULL
|
||||
and spa.status = 1
|
||||
<if test="projectName != null and projectName != ''">
|
||||
and bp.`NAME` like concat('%', #{projectName}, '%')
|
||||
</if>
|
||||
|
|
@ -1429,7 +1431,7 @@
|
|||
tpd.model_id moduleId,
|
||||
tpd.need_num needNum,
|
||||
tpd.need_day needDay,
|
||||
tpd.back_date backDate,
|
||||
tpa.need_time backDate,
|
||||
tpd.remark,
|
||||
tpd.type maType,
|
||||
tpd.`NAME` maName,
|
||||
|
|
@ -1440,6 +1442,7 @@
|
|||
LEFT JOIN t_plan_apply tpa on tpa.id=tpd.apply_id
|
||||
LEFT JOIN bm_project pro on tpa.project_id=pro.ID
|
||||
WHERE pro.`NAME` is not null
|
||||
and tpa.status = 1
|
||||
<if test="maName != null and maName != ''">
|
||||
and tpd.`NAME` like concat('%', #{maName}, '%')
|
||||
</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue