fanxw 1 ano atrás
pai
commit
1863b1202e

+ 1 - 1
src/main/java/com/chinaitop/depot/pushs/service/impl/PushServiceImpl.java

@@ -138,7 +138,7 @@ public class PushServiceImpl implements PushsService{
138 138
 				
139 139
 				
140 140
 				//判断出库期限 储备粮通知单
141
-				if(mains.containsKey("create_unit")){
141
+				if(mains.containsKey("create_unit") && mains.get("bill_type").toString().equals("3")){
142 142
 					if(mains.get("create_unit").toString().equals("1")){ //取储备粮的通知单
143 143
 						for (int j = 0; j < json.size(); j++) {
144 144
 							if(json.get(j).getJstzdId().length()>0 && json.get(j).getJstzdId()!=null){

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -29,7 +29,7 @@ spring:
29 29
     url: jdbc:mysql://101.36.160.140:10311/depot-tj?useUnicode=true&characterEncoding=utf-8
30 30
     #url: jdbc:mysql://111.164.113.173:667/depot?useUnicode=true&characterEncoding=utf-8
31 31
     username: root
32
-    password: 123456
32
+    password: admin@1234
33 33
   activiti:
34 34
     check-process-definitions: false
35 35
   # 缓存配置