zhangyuewww 2 years ago
parent
commit
afbf92344e

+ 2 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

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