diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 91347dfd3..e57b3b20f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -1112,7 +1112,7 @@ public class IoOrderDetailBizController extends BaseController { ioCodeLostService.insertOrUpdate(codeLostEntity); 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) { return response2; diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index f97fdf76d..f50b16bda 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -184,40 +184,44 @@ + select io_order_detail_biz.*, + io.action, + io.updateTime, + bp.prepnSpec + from io_order_detail_biz + left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk + left join basic_products bp on bu.uuid = bp.uuid + left join io_order io on io.billNo = io_order_detail_biz.orderIdFk + + AND (io.action = 'SC72197936495755' OR io.action = 'SC72249388338364') + + AND batchNo = #{batchNo} + + + AND io.action = #{action} + + + AND io_order_detail_biz.coName like concat('%', #{productName}, '%') + + + AND io_order_detail_biz.coName like concat('%', #{cpmctymc}, '%') + + + AND io_order_detail_biz.nameCode like concat('%', #{nameCode}, '%') + + + AND io_order_detail_biz.spec like concat('%', #{ggxh}, '%') + + + AND ( + io_order_detail_biz.coName like concat('%', #{keyWords}, '%') + OR io_order_detail_biz.spec like concat('%', #{keyWords}, '%') + OR io_order_detail_biz.batchNo like concat('%', #{keyWords}, '%') + ) + + + GROUP BY io_order_detail_biz.id + order by updateTime desc +