Browse Source

预约计划修复订单搜索全模糊

visual
汤建军 4 months ago
parent
commit
f7fe60241c
  1. 18
      blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

18
blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java

@ -221,4 +221,22 @@ public class BasicdataDriverArteryEntity extends TenantEntity {
@ApiModelProperty(value = "仓库名称") @ApiModelProperty(value = "仓库名称")
private String warehouseName; private String warehouseName;
/**
* 结算渠道
*/
@ApiModelProperty(value = "结算渠道 1-微信 2-支付宝 3-银行卡 4-现金")
private Integer settlementChannel ;
/**
* 结算渠道
*/
@ApiModelProperty(value = "结算账号")
private String settlementAccount ;
/**
* 合同
*/
@ApiModelProperty(value = "合同")
private String contract;
} }

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@ -775,7 +775,7 @@
AND ldpll.warehouse_id = #{par.warehouseId} AND ldpll.warehouse_id = #{par.warehouseId}
AND ldsa.type_service = #{par.typeService} AND ldsa.type_service = #{par.typeService}
<if test="par.orderCode != null and par.orderCode != '' "> <if test="par.orderCode != null and par.orderCode != '' ">
and ldpll.order_code like concat(#{par.orderCode},'%') and ldpll.order_code like concat('%',#{par.orderCode},'%')
</if> </if>
GROUP BY ldpll.stock_article_id GROUP BY ldpll.stock_article_id
HAVING SUM(ldpll.quantity) > 0 HAVING SUM(ldpll.quantity) > 0

Loading…
Cancel
Save