diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java index 5d8c34c0..ee026880 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java @@ -1,6 +1,5 @@ package com.nflg.wms.common.pojo.vo; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.experimental.Accessors; @@ -110,4 +109,14 @@ public class ApplyReturnRequestItemVO { * 单位 */ private String unit; + + /** + * sap过账的行号 + */ + private Integer poLineNumberNew; + + /** + * 新的采购单号 + */ + private String poNumberNew; } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceTicketMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceTicketMapper.xml index b010518a..d532a6df 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceTicketMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceTicketMapper.xml @@ -7,6 +7,8 @@ ,oat.audit_time,oat.audit_msg,oa.* FROM wms_out_assistance_ticket oat INNER JOIN wms_out_assistance oa ON oat.order_id=oa."id" + INNER JOIN wms_out_assistance_ticket_item oati ON oati.ticket_id=oat."id" + INNER JOIN wms_out_assistance_item oai ON oai."id"=oati.order_item_id AND oa."no" ilike CONCAT('%', #{request.no}, '%') @@ -20,6 +22,9 @@ and lifnr like concat('%', #{request.lifnr}, '%') + + and (oai.matnr like concat('%', #{request.matnr}, '%') OR oai.matnr1 like concat('%', #{request.matnr}, '%')) + and oat.create_time >= #{request.startDate}