|
|
@@ -110,8 +110,8 @@ public class StockGoodsController extends BladeController {
|
|
|
lambdaQueryWrapper.eq(Func.isNotEmpty(stockGoods.getBillNo()), StockGoods::getBillNo, stockGoods.getBillNo());
|
|
|
lambdaQueryWrapper.eq(Func.isNotEmpty(stockGoods.getContractNumber()), StockGoods::getContractNumber, stockGoods.getContractNumber());
|
|
|
|
|
|
- if (Func.isNotEmpty(stockGoods.getCname())) {
|
|
|
- List<Long> goodId = goodsDescClient.getGoodId(null, stockGoods.getCname(), null, null, null, null, null);
|
|
|
+ if (Func.isNotEmpty(stockGoods.getCname()) || Func.isNotEmpty(stockGoods.getCode())) {
|
|
|
+ List<Long> goodId = goodsDescClient.getGoodId(stockGoods.getCode(), stockGoods.getCname(), null, null, null, null, null);
|
|
|
if (CollectionUtils.isNotEmpty(goodId)) {
|
|
|
lambdaQueryWrapper.in(StockGoods::getGoodsId, goodId);
|
|
|
}
|