UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单据明细新增制剂规格

Browse Source
dev_2.5_optimize
yewj 4 months ago
parent bd46bf98c0
commit 2b6f1fe39b
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -1112,7 +1112,7 @@ public class IoOrderDetailBizController extends BaseController {
ioCodeLostService.insertOrUpdate(codeLostEntity); ioCodeLostService.insertOrUpdate(codeLostEntity);
UdiEntity udiEntityy = FilterUdiUtils.getUdi(addOrderRequest.getCode()); UdiEntity udiEntityy = FilterUdiUtils.getUdi(addOrderRequest.getCode());
BaseResponse response2 = ioOrderDetailBizService.adddDrugOrder(addOrderRequest,udiEntityy,addOrderRequest.getCode()); BaseResponse response2 = ioOrderDetailBizService.adddDrugOrder(addOrderRequest, udiEntityy, addOrderRequest.getCode());
if (response2.getCode() != 20000) { if (response2.getCode() != 20000) {
return response2; return response2;

74
src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
Unescape Escape View File

@ -184,40 +184,44 @@
<select id="orderOutRecordPage" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse"> <select id="orderOutRecordPage" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
select io_order_detail_biz.*, select io_order_detail_biz.*,
io.action, io.action,
io.updateTime io.updateTime,
from io_order_detail_biz bp.prepnSpec
left join io_order io on io.billNo = io_order_detail_biz.orderIdFk from io_order_detail_biz
<where> left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
AND ( io.action = 'SC72197936495755' OR io.action = 'SC72249388338364' ) left join basic_products bp on bu.uuid = bp.uuid
<if test="batchNo != null and batchNo != ''"> left join io_order io on io.billNo = io_order_detail_biz.orderIdFk
AND batchNo = #{batchNo} <where>
</if> AND (io.action = 'SC72197936495755' OR io.action = 'SC72249388338364')
<if test="action != null and action != ''"> <if test="batchNo != null and batchNo != ''">
AND io.action = #{action} AND batchNo = #{batchNo}
</if> </if>
<if test="productName != null and productName != ''"> <if test="action != null and action != ''">
AND io_order_detail_biz.coName like concat('%', #{productName}, '%') AND io.action = #{action}
</if> </if>
<if test="cpmctymc != null and cpmctymc != ''"> <if test="productName != null and productName != ''">
AND io_order_detail_biz.coName like concat('%', #{cpmctymc}, '%') AND io_order_detail_biz.coName like concat('%', #{productName}, '%')
</if> </if>
<if test="nameCode != null and nameCode != ''"> <if test="cpmctymc != null and cpmctymc != ''">
AND io_order_detail_biz.nameCode like concat('%', #{nameCode}, '%') AND io_order_detail_biz.coName like concat('%', #{cpmctymc}, '%')
</if> </if>
<if test="ggxh != null and ggxh != ''"> <if test="nameCode != null and nameCode != ''">
AND io_order_detail_biz.spec like concat('%', #{ggxh}, '%') AND io_order_detail_biz.nameCode like concat('%', #{nameCode}, '%')
</if> </if>
<if test="keyWords != null and keyWords != ''"> <if test="ggxh != null and ggxh != ''">
AND ( AND io_order_detail_biz.spec like concat('%', #{ggxh}, '%')
io_order_detail_biz.coName like concat('%', #{keyWords}, '%') </if>
OR io_order_detail_biz.spec like concat('%', #{keyWords}, '%') <if test="keyWords != null and keyWords != ''">
OR io_order_detail_biz.batchNo like concat('%', #{keyWords}, '%') AND (
) io_order_detail_biz.coName like concat('%', #{keyWords}, '%')
</if> OR io_order_detail_biz.spec like concat('%', #{keyWords}, '%')
</where> OR io_order_detail_biz.batchNo like concat('%', #{keyWords}, '%')
order by updateTime desc )
</select> </if>
</where>
GROUP BY io_order_detail_biz.id
order by updateTime desc
</select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save