问题修改,功能开发
This commit is contained in:
parent
1d3fb7e535
commit
ced80f5f57
|
|
@ -321,11 +321,12 @@
|
||||||
select cpo.id,cpo.type,cpo.apply_id planId,cpa.code ,cpa.user_name userName ,
|
select cpo.id,cpo.type,cpo.apply_id planId,cpa.code ,cpa.user_name userName ,
|
||||||
cpa.create_time applyTime ,cpa.remark,cpo.out_time outTime ,cpo.dispatch_num dispatchNum,cpo.status,
|
cpa.create_time applyTime ,cpa.remark,cpo.out_time outTime ,cpo.dispatch_num dispatchNum,cpo.status,
|
||||||
IFNULL(file.num ,0) fileNum,pro.name proName,
|
IFNULL(file.num ,0) fileNum,pro.name proName,
|
||||||
|
cs.`name` as supName,
|
||||||
CASE
|
CASE
|
||||||
WHEN cpo.file_status IS NULL THEN '待上传'
|
WHEN cpo.file_status IS NULL THEN '待上传'
|
||||||
WHEN cpo.file_status = 0 THEN '待审核'
|
WHEN cpo.file_status = 0 THEN '待审核'
|
||||||
WHEN cpo.file_status = 1 THEN '审核通过'
|
WHEN cpo.file_status = 1 THEN '已通过'
|
||||||
WHEN cpo.file_status = 2 THEN '审核驳回'
|
WHEN cpo.file_status = 2 THEN '已驳回'
|
||||||
ELSE ''
|
ELSE ''
|
||||||
END AS fileStatus
|
END AS fileStatus
|
||||||
FROM car_plan_out cpo
|
FROM car_plan_out cpo
|
||||||
|
|
@ -336,6 +337,7 @@
|
||||||
where model_table='car_plan_out' AND type='到货确认单'
|
where model_table='car_plan_out' AND type='到货确认单'
|
||||||
GROUP BY own_id
|
GROUP BY own_id
|
||||||
)file on file.id=concat(cpo.id,'-dh')
|
)file on file.id=concat(cpo.id,'-dh')
|
||||||
|
LEFT JOIN car_supplier cs ON cs.id = cpo.sup_id
|
||||||
where 1=1 and cpo.status=2
|
where 1=1 and cpo.status=2
|
||||||
<if test="keyWord!=null and keyWord!=''">
|
<if test="keyWord!=null and keyWord!=''">
|
||||||
and (
|
and (
|
||||||
|
|
@ -346,6 +348,9 @@
|
||||||
pro.name like concat('%',#{keyWord},'%')
|
pro.name like concat('%',#{keyWord},'%')
|
||||||
)
|
)
|
||||||
</if>
|
</if>
|
||||||
|
<if test="supId!=null and supId!=''">
|
||||||
|
and cpo.sup_id=#{supId}
|
||||||
|
</if>
|
||||||
order by cpo.create_time desc
|
order by cpo.create_time desc
|
||||||
</select>
|
</select>
|
||||||
<select id="getSltNumByPlan" resultType="java.lang.Integer">
|
<select id="getSltNumByPlan" resultType="java.lang.Integer">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue