销售和采购一键作废查询退货校验修改

src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

@@ -216,6 +216,9 @@
             <if test="cpId != null">
                 AND tpii.cp_id = #{cpId}
             </if>
+            <if test="sPurId != null">
+                AND tpii.s_pur_id = #{sPurId}
+            </if>
         </where>
     </sql>
 

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -210,6 +210,9 @@ sys.f_remove_zero(out_qty) as out_qty, out_amt, sys.f_remove_zero(return_qty) as
             <if test="cpId != null">
                 AND tpoi.cp_id = #{cpId}
             </if>
+            <if test="sOrderId != null">
+                AND tpoi.s_order_id = #{sOrderId}
+            </if>
         </where>
     </sql>
 

src/main/java/com/dk/mdm/model/query/ivt/OutboundItemQuery.java

@@ -8,6 +8,7 @@ import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.dk.common.infrastructure.handler.UuidTypeHandler;
 import com.dk.common.model.pojo.PageInfo;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -247,6 +248,8 @@ public class OutboundItemQuery extends PageInfo<OutboundItemQuery>{
     private String whId;
 
 
+
+
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/service/pur/PurchaseService.java

@@ -530,7 +530,7 @@ public class PurchaseService extends BaseService<Purchase> {
     public ResponseResultVO<?> oneKeyInvalid(String id) {
         //region  查询当前订单下是否有退货单
         List<InboundItemResponse> inboundItemReturnResponses = inboundItemMapper.selectByCond(new InboundItemQuery()
-                .setFromId(id)
+                .setSPurId(id)
                 .setFlgValid(true)
                 .setIntoType(Constant.IntoType.PURRETURN_RETURN.getName()));
         if (inboundItemReturnResponses != null && inboundItemReturnResponses.size() > 0) {

src/main/java/com/dk/mdm/service/sale/OrderService.java

@@ -1101,7 +1101,7 @@ public class OrderService extends BaseService<Order> {
     public ResponseResultVO<?> oneKeyInvalid(String id) {
         //region  查询当前订单下是否存在有效的退货单
         List<OutboundItemResponse> outboundItemResponseList = outboundItemMapper.selectByCond(new OutboundItemQuery()
-                .setFromId(id)
+                .setSOrderId(id)
                 .setFlgValid(true)
                 .setOutType(Constant.OutType.SALE_RETURN.getName()) );
         if (outboundItemResponseList != null && outboundItemResponseList.size() > 0) {