发货管理优化

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml

@@ -11,13 +11,11 @@ and hygf_peasant_household.developer_id=#{developerId}
 and hygf_peasant_household.regional_companies_seq=#{regionalCompaniesSeq}
 and hygf_peasant_household.survey_or_not=3 and  hygf_peasant_household.sequence_nbr not in
 (select hygf_document_station.station_id  from hygf_preparation_money RIGHT JOIN hygf_document_station
-on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where hygf_preparation_money.order_status ='待发货'
+on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where
+  hygf_document_station.station_id is not null
     <if test="ids!=null and ids !=''">
         and hygf_document_station.preparation_money_id !=#{ids}
-    </if>
-
-and hygf_document_station.station_id is not null
-)
+    </if>)
     <if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
         and hygf_peasant_household.peasant_household_no like concat(concat("%",#{peasantHouseholdNo}),"%")
     </if>