修改备货，发货bug

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationPageDto.java

@@ -27,5 +27,6 @@ public class PreparationPageDto extends Page<PreparationMoney> {
     String arrivalState;//收货
     String deliveryState;//发货状态  未发货已发货
     List<String> deliveryTime;
+    String flag ;
 
 }

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

@@ -8,7 +8,7 @@
     hygf_household_contract.contract_lock_id
     from hygf_power_station LEFT JOIN hygf_household_contract on
     hygf_household_contract.peasant_household_id=hygf_power_station.peasant_household_id
-    where hygf_power_station.is_delete=0 and hygf_household_contract.status !='已作废'
+    where hygf_power_station.is_delete=0
 
     <if test="powerStationCode!=null and powerStationCode!=''">
         and hygf_power_station.power_station_code like concat(concat("%",#{powerStationCode}),"%")
@@ -19,6 +19,7 @@
     <if test="serviceAgent!=null and serviceAgent!=''">
         and hygf_power_station.service_agent=#{serviceAgent}
     </if>
+
     ) a
 </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java

@@ -41,6 +41,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
  *
  * @author system_generator
  * @date 2023-08-17
+ * @date 2023-08-17
  */
 @RestController
 @Api(tags = "发货单Api")

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

@@ -95,6 +95,9 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         qw.like(StringUtils.isNotEmpty(dto.getOddNumbers()), PreparationMoney::getOddNumbers, dto.getOddNumbers());
         qw.eq(StringUtils.isNotEmpty(dto.getDeliveryState()), PreparationMoney::getDeliveryState, dto.getDeliveryState());
         qw.eq(StringUtils.isNotEmpty(dto.getAmosUnitId()), PreparationMoney::getAmosUnitId, dto.getAmosUnitId());
+        qw.ne(StringUtils.isNotEmpty(dto.getFlag()),PreparationMoney::getDeliveryState,DeliveryStateeEnum.已作废.getCode());
+        qw.ne(StringUtils.isNotEmpty(dto.getFlag()),PreparationMoney::getDeliveryState,DeliveryStateeEnum.待发货.getCode());
+
          if(dto.getDeliveryTime()!=null&&!dto.getDeliveryTime().get(0).equals("")){
              qw.between(dto.getDeliveryTime()!=null, PreparationMoney::getDeliveryTime, dto.getDeliveryTime().get(0), dto.getDeliveryTime().get(1));
          }