发货管理代码修复

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

@@ -10,8 +10,8 @@ hygf_household_contract.`status`='双方已签署'
 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 LEFT JOIN hygf_document_station
-on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nbr  where hygf_preparation_money.delivery_state !='已作废'
+(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 ='待发货'
     <if test="ids!=null and ids !=''">
         and hygf_document_station.preparation_money_id !=#{ids}
     </if>

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

@@ -73,7 +73,7 @@ LEFT JOIN  hygf_document_station on hygf_document_station.station_id=hygf_peasan
             and hygf_peasant_household.owners_name like concat ('%',#{ownersName},'%')
         </if>
         <if test=" preparationMoneyState == 1 ">
-            and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not and preparation_money_state != ''
+            and hygf_peasant_household.preparation_money_state not in  ('待发货','待补货','暂存发货') and preparation_money_state is not null and preparation_money_state != ''
         </if>
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application-dev1.properties

@@ -34,11 +34,11 @@ spring.db3.datasource.password=taosdata
 spring.db3.datasource.driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
 
 ## eureka properties:
-eureka.instance.hostname=10.20.1.160
+eureka.instance.hostname=47.92.234.253
 eureka.client.serviceUrl.defaultZone=http://admin:a1234560@${eureka.instance.hostname}:10001/eureka/
 ## redis properties:
 spring.redis.database=1
-spring.redis.host=10.20.1.210
+spring.redis.host=47.92.234.253
 spring.redis.port=6379
 spring.redis.password=yeejoin@2020
 
@@ -74,10 +74,10 @@ lettuce.timeout=10000
 
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.10.220:1883
+emqx.broker=tcp://47.92.234.253:1883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://172.16.10.220:8083/mqtt
+mqtt.scene.host=mqtt://47.92.234.253:18083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/application.properties

@@ -90,3 +90,8 @@ spring.elasticsearch.rest.read-timeout=30000
 
 #elasticsearch.username= elastic
 #elasticsearch.password= 123456
+
+amos.system.user.user-name=cz
+amos.system.user.password=a1234567
+amos.system.user.product=AMOS_STUDIO_WEB
+amos.system.user.app-key=AMOS_STUDIO
\ No newline at end of file