diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java index 3aa2fc6a5..401985485 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java +++ b/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 = "仓库名称") private String warehouseName; + /** + * 结算渠道 + */ + @ApiModelProperty(value = "结算渠道 1-微信 2-支付宝 3-银行卡 4-现金") + private Integer settlementChannel ; + + /** + * 结算渠道 + */ + @ApiModelProperty(value = "结算账号") + private String settlementAccount ; + + /** + * 合同 + */ + @ApiModelProperty(value = "合同") + private String contract; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 901a42d84..ec0ff8bc1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -775,7 +775,7 @@ AND ldpll.warehouse_id = #{par.warehouseId} AND ldsa.type_service = #{par.typeService} - and ldpll.order_code like concat(#{par.orderCode},'%') + and ldpll.order_code like concat('%',#{par.orderCode},'%') GROUP BY ldpll.stock_article_id HAVING SUM(ldpll.quantity) > 0