root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mdf:型材出库更新出库字段

Browse Source
This commit is contained in:
zhangzhiqiang
2023-01-09 14:30:48 +08:00
parent c4482bf553
commit 67dfef894a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandXCOutIvtServiceImpl.java
View File

@@ -149,11 +149,14 @@ public class HandXCOutIvtServiceImpl implements HandXCOutIvtService {
map.put("out_time",DateUtil.now()); map.put("out_time",DateUtil.now());
PDM_BI_ProcedureOffline.update(map,"diskrecord_id='"+diskrecord_id+"'"); PDM_BI_ProcedureOffline.update(map,"diskrecord_id='"+diskrecord_id+"'");
} }
Map<String,String> updateParam = new HashMap<>();
updateParam.put("status","04");
if (!CollectionUtils.isEmpty(bucketuniques)){ if (!CollectionUtils.isEmpty(bucketuniques)){
Map<String,String> updateParam = new HashMap<>();
updateParam.put("status","04");
updateParam.put("outstor_optid",currentUserId+"");
updateParam.put("outstor_optname",userDto.getNickName());
updateParam.put("outstor_time",DateUtil.now());
String allBucketunique = "(\""+bucketuniques.stream().collect(Collectors.joining("\",\""))+"\")"; String allBucketunique = "(\""+bucketuniques.stream().collect(Collectors.joining("\",\""))+"\")";
bucket.update(updateParam, "bucketunique in " + allBucketunique + " and status in ('02','03')"); bucket.update(updateParam, "bucketunique in " + allBucketunique);
} }
JSONObject returnjo = new JSONObject(); JSONObject returnjo = new JSONObject();
returnjo.put("code", "1"); returnjo.put("code", "1");

4
mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -20,9 +20,9 @@ spring:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:whxr_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:whxr_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:whxr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:whxr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root} username: ${DB_USER:root}
password: ${DB_PWD:Root.123456} password: ${DB_PWD:942464Yy}
# username: ${DB_USER:root} # username: ${DB_USER:root}
# password: ${DB_PWD:root} # password: ${DB_PWD:root}
# 初始连接数 # 初始连接数