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

fix:日志配置，回传MES改成同步

Browse Source
This commit is contained in:
zhangzq
2025-04-11 14:38:23 +08:00
parent e588a32472
commit 636e347177
5 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java
View File

@@ -47,7 +47,6 @@ public class BstIvtPackageinfoivtController {
*/ */
@GetMapping @GetMapping
@SaIgnore @SaIgnore
@Log("查询点位库存")
public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) { public ResponseEntity<Object> query(@RequestParam Map whereJson, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(bstIvtPackageinfoivtService.queryAll(whereJson, page)), HttpStatus.OK); return new ResponseEntity<>(TableDataInfo.build(bstIvtPackageinfoivtService.queryAll(whereJson, page)), HttpStatus.OK);
} }

23
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
View File

@@ -298,21 +298,14 @@ public class InBussManageServiceImpl implements InBussManageService {
tableData.add(jsonDtl); tableData.add(jsonDtl);
} }
String package_box_sn = (String) tableData.get(0).get("package_box_sn"); String package_box_sn = (String) tableData.get(0).get("package_box_sn");
try {
CompletableFuture.runAsync(() -> { JSONObject param_jo = new JSONObject();
try { param_jo.put("box_no", package_box_sn);
String isConnect2 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_CONNECT_MES2").getValue(); param_jo.put("box_weight", subList.get(0).getString("box_weight"));
if ("1".equals(isConnect2)) { lmsToMesServiceImpl.BoxDataCollectionSubmit2(param_jo);
JSONObject param_jo = new JSONObject(); } catch (Exception e) {
param_jo.put("box_no", package_box_sn); log.error("验箱回传MES异常，BoxDataCollectionSubmit2给MES传输子卷包装关系异常,木箱号为：" + package_box_sn + ",异常信息：" + e);
param_jo.put("box_weight", subList.get(0).getString("box_weight")); }
lmsToMesServiceImpl.BoxDataCollectionSubmit2(param_jo);
}
} catch (Exception e) {
log.error("验箱回传MES异常，BoxDataCollectionSubmit2给MES传输子卷包装关系异常,木箱号为：" + package_box_sn + ",异常信息：" + e);
}
}, pool);
mst.put("tableData", tableData); mst.put("tableData", tableData);
// 判断是否已经生成过入库单 // 判断是否已经生成过入库单
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();

4
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
View File

@@ -1044,10 +1044,10 @@ public class LmsToMesServiceImpl implements LmsToMesService {
String RTYPE = result.getString("RTYPE"); String RTYPE = result.getString("RTYPE");
if ("E".equals(RTYPE)) { if ("E".equals(RTYPE)) {
throw new BadRequestException(result.getString("RTMSG")); throw new BadRequestException("MES提示错误：" +result.getString("RTMSG"));
} }
} catch (Exception e) { } catch (Exception e) {
throw new BadRequestException("MES提示错误：" + e.getMessage()); throw new BadRequestException("MES错误：" + e.getMessage());
} }
return result; return result;
} }

2
lms/nladmin-system/src/main/resources/config/application.yml
View File

@@ -6,7 +6,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: dev active: prod
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data:

6
lms/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -58,7 +58,7 @@ https://juejin.cn/post/6844903775631572999
<!--异步到文件--> <!--异步到文件-->
<appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender"> <appender name="asyncFileAppender" class="com.yomahub.tlog.core.enhance.logback.async.AspectLogbackAsyncAppender">
<discardingThreshold>0</discardingThreshold> <discardingThreshold>0</discardingThreshold>
<queueSize>500</queueSize> <queueSize>2000</queueSize>
<appender-ref ref="FILE"/> <appender-ref ref="FILE"/>
</appender> </appender>
@@ -92,7 +92,8 @@ https://juejin.cn/post/6844903775631572999
</appender> </appender>
<appender name="asyncLuceneAppender" class="org.nl.config.lucene.AsyncLuceneAppender"> <appender name="asyncLuceneAppender" class="org.nl.config.lucene.AsyncLuceneAppender">
<appender-ref ref="luceneAppender" /> <appender-ref ref="luceneAppender" />
<queueSize>512</queueSize> <discardingThreshold>0</discardingThreshold>
<queueSize>3000</queueSize>
</appender> </appender>
<!--开发环境:打印控制台--> <!--开发环境:打印控制台-->
@@ -134,6 +135,7 @@ https://juejin.cn/post/6844903775631572999
<root level="info"> <root level="info">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="asyncLuceneAppender"/> <appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="CONSOLE"/>
</root> </root>
<logger name="jdbc" level="ERROR" additivity="true"> <logger name="jdbc" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>