修改发货单日志

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

@@ -4,10 +4,10 @@
 <select id="queryPage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto">
     select * from (select
     hygf_power_station.*,
-    hygf_household_contract.initiate_status,
-    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
+    b.initiate_status,
+    b.contract_lock_id
+    from hygf_power_station LEFT JOIN ( select peasant_household_id,initiate_status, contract_lock_id from  hygf_household_contract where   hygf_household_contract.status !='已作废'
+    ) b    on b.peasant_household_id=hygf_power_station.peasant_household_id
     where hygf_power_station.is_delete=0
 
     <if test="powerStationCode!=null and powerStationCode!=''">

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

@@ -108,7 +108,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
             serviceAgent=userUnitInformationDto.getAmosDealerName();
         }
 
-       /// return this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
+        //return this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
         return this.queryPage((int) page.getCurrent(), (int) page.getSize(),powerStationCode,ownersName,serviceAgent);
     }
 

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

@@ -178,7 +178,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         // 记录操作日志
         PreparationMoneyLog preparationMoneyLog = new PreparationMoneyLog();
         preparationMoneyLog.setPreparationMoneyId(sequenceNbr);
-        preparationMoneyLog.setOperationContent(PreparationEnum.创建发货单.getCode());
+        preparationMoneyLog.setOperationContent(PreparationEnum.作废发货单.getCode());
         preparationMoneyLog.setExecutionTime(new Date());
         preparationMoneyLog.setExecutor(agencyUserModel.getRealName());
         preparationMoneyLogService.save(preparationMoneyLog);