|
@@ -588,7 +588,8 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
|
|
|
public List<WarehousingOrder> selectWarehousingOrder(String contractNo, String warehouseName, String receiptDocDate) {
|
|
|
Wrapper<WarehousingOrder> warehousingOrderWrapper = new EntityWrapper<>();
|
|
|
if (contractNo!=null){
|
|
|
- warehousingOrderWrapper.eq("contract_no", contractNo);
|
|
|
+ warehousingOrderWrapper.andNew().eq("contract_no", contractNo).or()
|
|
|
+ .eq("move_task_no", contractNo);
|
|
|
}
|
|
|
if (warehouseName!=null){
|
|
|
warehousingOrderWrapper.eq("warehouse_name", warehouseName);
|