bonus
/
GZMachinesWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

机具领料逻辑修改

This commit is contained in:
liang.chao 2026-02-02 16:11:54 +08:00
parent b75dd3ff91
commit 199ced5e85
1 changed files with 232 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/mybatis/index/IndexHomeDetailsMapper.xml
View File

@ -1375,7 +1375,7 @@
cpd.model_id modelId, cpd.model_id modelId,
cpd.need_num needNum, cpd.need_num needNum,
cpd.need_day needDay, cpd.need_day needDay,
cpd.back_date backDate, cpa.need_time backDate,
cpd.remark, cpd.remark,
cmti.type maType, cmti.type maType,
cmti.`NAME` maName, cmti.`NAME` maName,
@ -1387,6 +1387,7 @@
LEFT JOIN bm_project bp ON cpa.pro_id = bp.ID LEFT JOIN bm_project bp ON cpa.pro_id = bp.ID
LEFT JOIN car_ma_type_info cmti ON cpd.model_id = cmti.id LEFT JOIN car_ma_type_info cmti ON cpd.model_id = cmti.id
WHERE bp.`NAME` IS NOT NULL WHERE bp.`NAME` IS NOT NULL
and cpa.status = 1
<if test="projectName != null and projectName != ''"> <if test="projectName != null and projectName != ''">
and bp.`NAME` like concat('%', #{projectName}, '%') and bp.`NAME` like concat('%', #{projectName}, '%')
</if> </if>
@ -1403,7 +1404,7 @@
spd.model_id AS modelId, spd.model_id AS modelId,
spd.need_num AS needNum, spd.need_num AS needNum,
spd.need_day AS needDay, spd.need_day AS needDay,
spd.back_date AS backDate, spa.need_time AS backDate,
spd.remark, spd.remark,
spd.type maType, spd.type maType,
spd.`name` maName, spd.`name` maName,
@ -1413,6 +1414,7 @@
LEFT JOIN st_plan_apply spa ON spd.apply_id = spa.id LEFT JOIN st_plan_apply spa ON spd.apply_id = spa.id
LEFT JOIN bm_project bp ON spa.project_id = bp.ID LEFT JOIN bm_project bp ON spa.project_id = bp.ID
WHERE bp.`NAME` IS NOT NULL WHERE bp.`NAME` IS NOT NULL
and spa.status = 1
<if test="projectName != null and projectName != ''"> <if test="projectName != null and projectName != ''">
and bp.`NAME` like concat('%', #{projectName}, '%') and bp.`NAME` like concat('%', #{projectName}, '%')
</if> </if>
@ -1429,7 +1431,7 @@
tpd.model_id moduleId, tpd.model_id moduleId,
tpd.need_num needNum, tpd.need_num needNum,
tpd.need_day needDay, tpd.need_day needDay,
tpd.back_date backDate, tpa.need_time backDate,
tpd.remark, tpd.remark,
tpd.type maType, tpd.type maType,
tpd.`NAME` maName, tpd.`NAME` maName,
@ -1440,6 +1442,7 @@
LEFT JOIN t_plan_apply tpa on tpa.id=tpd.apply_id LEFT JOIN t_plan_apply tpa on tpa.id=tpd.apply_id
LEFT JOIN bm_project pro on tpa.project_id=pro.ID LEFT JOIN bm_project pro on tpa.project_id=pro.ID
WHERE pro.`NAME` is not null WHERE pro.`NAME` is not null
and tpa.status = 1
<if test="maName != null and maName != ''"> <if test="maName != null and maName != ''">
and tpd.`NAME` like concat('%', #{maName}, '%') and tpd.`NAME` like concat('%', #{maName}, '%')
</if> </if>