领用仓库选择二级仓库的话,可以领用上一级中心库的产品

dev
薛宇 2 years ago
parent 5367acb349
commit 384a0f54cc

@ -188,8 +188,8 @@ public class InvWarehouseController extends BaseController {
if (!"".equals(invWarehouseEntity.getParentCode())) {
invWarehouseEntities1.add(invWarehouseEntity);
}
//领用仓库选择手术室的话,可以领用上一级中心库的产品
if (filterInvWarehouseRequest.getLocInvCode().equals("1002000") && invWarehouseEntity.getCode().equals("1000000")) {
//领用仓库选择二级仓库的话,可以领用上一级中心库的产品
if (!filterInvWarehouseRequest.getLocInvCode().equals("1000000") && invWarehouseEntity.getCode().equals("1000000")) {
invWarehouseEntities1.add(invWarehouseEntity);
}
}

@ -202,6 +202,9 @@
<if test="invSpaceCode != null and invSpaceCode != ''">
AND ipd.invSpaceCode = #{invSpaceCode}
</if>
<!-- <if test="supId != null and supId != ''">-->
<!-- AND ipd.supId = #{supId}-->
<!-- </if>-->
</where>
group by ip.id
</select>

@ -4,7 +4,7 @@
<select id="selectSupRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
select m.*,
c.companyName `name`,
(select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk) certName
(select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk limit 1) certName
from sup_cert_remind_msg m
left join sup_company c on m.idFk = c.customerId
<where>
@ -27,9 +27,9 @@
<select id="selectManufactureRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
select m.*,
c.companyName `name`,
(select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk) certName
(select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk limit 1) certName
from sup_cert_remind_msg m
left join sup_manufacturer c on m.idFk = c.customerId
left join sup_manufacturer c on m.idFk = c.manufacturerId
<where>
<if test="name != null and name != ''">
AND c.companyName like concat('%', #{name}, '%')
@ -69,4 +69,4 @@
</where>
order by m.updateTime desc
</select>
</mapper>
</mapper>

Loading…
Cancel
Save