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

更新

Browse Source
This commit is contained in:
loujf
2023-01-06 15:31:06 +08:00
parent cd25950727
commit b58821927e
12 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java
View File

@@ -380,7 +380,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
String returnResultMsg = null;
try {
returnResultMsg = HttpRequest.post(URL + method)
.body(String.valueOf(jsonObject)).timeout(timeout)
.body(String.valueOf(obj)).timeout(timeout)
.execute().body();
} catch (Exception e) {
log.info("诺力请求嘉耐回传入窑信息失败！{}",e.getMessage());
@@ -429,7 +429,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
String returnResultMsg = null;
try {
returnResultMsg = HttpRequest.post(URL + method)
.body(String.valueOf(jsonObject)).timeout(timeout)
.body(String.valueOf(obj)).timeout(timeout)
.execute().body();
} catch (Exception e) {
log.info("诺力请求嘉耐回传出窑信息失败！{}",e.getMessage());

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/callEmpty/service/impl/CallEmptyServiceImpl.java
View File

@@ -41,7 +41,7 @@ public class CallEmptyServiceImpl implements CallEmptyService {
throw new PdaRequestException("区域不能为空！");
}
String param1 = "";
if (area_code.equals("27")) param1 = "上料";
if (area_code.equals("27")) param1 = "下料";
JSONArray pointArr = WQL.getWO("QPAEMPTY").addParam("flag", "2").addParam("area_type", area_code).addParam("param", param1).process().getResultJSONArray(0);
JSONObject returnjo = new JSONObject();
returnjo.put("code", "1");

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendEmpty/service/impl/SendEmptyServiceImpl.java
View File

@@ -37,7 +37,9 @@ public class SendEmptyServiceImpl implements SendEmptyService {
if (StrUtil.isEmpty(area_code)) {
throw new PdaRequestException("区域不能为空！");
}
JSONArray pointArr = WQL.getWO("QPAEMPTY").addParam("flag", "2").addParam("area_type", area_code).process().getResultJSONArray(0);
String param1 = "";
if (area_code.equals("27")) param1 = "上料";
JSONArray pointArr = WQL.getWO("QPAEMPTY").addParam("flag", "2").addParam("area_type", area_code).addParam("param",param1).process().getResultJSONArray(0);
JSONObject returnjo = new JSONObject();
returnjo.put("code", "1");
returnjo.put("desc", "操作成功！");

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/KilnServiceImpl.java
View File

@@ -150,7 +150,7 @@ public class KilnServiceImpl implements KilnService {
vehicleGroup.put("material_code", materialObj.getString("material_code"));
vehicleGroup.put("material_name", materialObj.getString("material_name"));
vehicleGroup.put("material_spec", materialObj.getString("material_spec"));
vehicleGroup.put("task_id", IdUtil.simpleUUID());
vehicleGroup.put("task_id", SecurityUtils.getCurrentUserId());
vehicleGroup.put("create_id", currentUserId);
vehicleGroup.put("create_name", nickName);
vehicleGroup.put("create_time", now);
@@ -161,7 +161,7 @@ public class KilnServiceImpl implements KilnService {
vehicleGroup.put("device_id", jsonObject.getString("device_id"));
vehicleGroup.put("qty", ivt_qty);
vehicleGroup.put("is_full", is_full);
vehicleGroup.put("material_move_id", IdUtil.simpleUUID());
vehicleGroup.put("material_move_id", SecurityUtils.getCurrentUserId());
vehicleGroupTab.insert(vehicleGroup);
}
// 点位修改