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

日志回调 工单完成后暂不反馈mes

Browse Source
This commit is contained in:
张江玮
2022-12-27 13:56:53 +08:00
parent b31e2d7922
commit a4dfdf1a98
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -72,7 +72,7 @@ https://juejin.cn/post/6844903775631572999
</http> </http>
<format> <format>
<label> <label>
<pattern>logType=%X{log_file_type:-logType},device=%X{device_code_log:-device}</pattern> <pattern>system=${SYSTEM_NAME},level=%level,logType=%X{log_file_type:-logType},device=%X{device_code_log:-device}</pattern>
</label> </label>
<message> <message>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>

20
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -169,16 +169,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
message = "操作成功！"; message = "操作成功！";
// 操作成功后向 MES 反馈 // 操作成功后向 MES 反馈
JSONObject param = new JSONObject(); // JSONObject param = new JSONObject();
param.put("material_code", materialbaseService.findById(jsonObject1.getLong("material_id")).getMaterial_code()); // param.put("material_code", materialbaseService.findById(jsonObject1.getLong("material_id")).getMaterial_code());
param.put("workorder_code", jsonObject1.getString("workorder_code")); // param.put("workorder_code", jsonObject1.getString("workorder_code"));
param.put("workorder_qty", jsonObject1.getString("plan_qty")); // param.put("workorder_qty", jsonObject1.getString("plan_qty"));
param.put("device_code", deviceService.findByCode(jsonObject1.getString("device_code")).getExtend_code()); // param.put("device_code", deviceService.findByCode(jsonObject1.getString("device_code")).getExtend_code());
String workorder_uri = paramService.findByCode("mes_url").getValue() + "api/mes/materialIvt"; // String workorder_uri = paramService.findByCode("mes_url").getValue() + "api/mes/materialIvt";
HttpRequest // HttpRequest
.post(workorder_uri) // .post(workorder_uri)
.body(param.toJSONString()) // .body(param.toJSONString())
.execute(); // .execute();
} catch (Exception e) { } catch (Exception e) {
status = "400"; status = "400";
message = "操作失败！"; message = "操作失败！";

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

@@ -66,7 +66,7 @@ https://juejin.cn/post/6844903775631572999
</http> </http>
<format> <format>
<label> <label>
<pattern>logType=%X{log_file_type:-logType}</pattern> <pattern>system=${SYSTEM_NAME},level=%level,logType=%X{log_file_type:-logType}</pattern>
</label> </label>
<message> <message>
<pattern>${log.pattern}</pattern> <pattern>${log.pattern}</pattern>