新增-组织机台授权接口,机台数据源接口,逻辑更改-柜体删除,还原关联排单,包裹部分数据更改,排单部分异常信息返回补全

This commit is contained in:
liuzhaotian
2024-09-24 15:25:12 +08:00
parent 5dbd4c8742
commit 69f8df22d0
65 changed files with 2272 additions and 572 deletions
@@ -7,24 +7,28 @@
select sml.*
select distinct
sml.organ_id,
sml.cut_limit,
sml.drill_limit,
sml.label_limit,
sml.saw_limit,
sml.sealedge_limit,
sml.updater,
sml.update_time,
so.name as organName,
so.status
from system_machine_limit sml
left join system_organization so on sml.organ_id = so.id
left join system_machine_template smt on sml.setting like concat(smt.id, '%')
join system_organization so on sml.organ_id = so.id
<where>
sml.deleted = false
and smt.deleted = false
and smt.is_enabled = true
and smt.is_default = false
and so.status = 0
<if test="machinePage.organName !=null">
and so.name like concat('%', #{machinePage.organName},'%')
<if test="machinePage.organId !=null">
and sml.organ_id = #{machinePage.organId}
</if>
<if test="machinePage.machineName !=null">
and smt.name like concat('%', #{machinePage.machineName},'%')
<if test="machinePage.status !=null">
and so.status = #{machinePage.status}
</if>
</where>