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

嘉耐更新

Browse Source
This commit is contained in:
loujf
2022-08-16 19:46:02 +08:00
parent 3d9f1fdcf7
commit 101ab92547
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java
View File

@@ -19,7 +19,7 @@ public interface AcsToWmsService {
HttpResponse lnshApplyTaskToWms(JSONObject json); HttpResponse lnshApplyTaskToWms(JSONObject json);
/** /**
* * 申请入窑
* @param json * @param json
* @return * @return
*/ */

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

@@ -76,6 +76,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
String next_point_code = task.getString("next_device_code"); String next_point_code = task.getString("next_device_code");
String start_device_code = ""; String start_device_code = "";
String next_device_code = ""; String next_device_code = "";
String start_parent_code = "";
String next_parent_code = "";
if (StrUtil.isEmpty(task_code)) { if (StrUtil.isEmpty(task_code)) {
throw new WDKException("任务号不能为空"); throw new WDKException("任务号不能为空");
} }
@@ -89,10 +91,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
JSONObject start_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + start_point_code + "'").uniqueResult(0); JSONObject start_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + start_point_code + "'").uniqueResult(0);
if (!ObjectUtil.isEmpty(start_device_json)) { if (!ObjectUtil.isEmpty(start_device_json)) {
start_point_code = (String) start_device_json.get("parent_storage_code") == null ? start_point_code : (String) start_device_json.get("storage_code"); start_point_code = (String) start_device_json.get("parent_storage_code") == null ? start_point_code : (String) start_device_json.get("storage_code");
start_parent_code = start_device_json.get("parent_storage_code") == null ? start_point_code : (String) start_device_json.get("parent_storage_code");
} }
JSONObject next_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + next_point_code + "'").uniqueResult(0); JSONObject next_device_json = WQLObject.getWQLObject("acs_storage_cell").query("parent_storage_code ='" + next_point_code + "'").uniqueResult(0);
if (!ObjectUtil.isEmpty(next_device_json)) { if (!ObjectUtil.isEmpty(next_device_json)) {
next_point_code = (String) next_device_json.get("parent_storage_code") == null ? next_point_code : (String) next_device_json.get("storage_code"); next_point_code = (String) next_device_json.get("parent_storage_code") == null ? next_point_code : (String) next_device_json.get("storage_code");
next_parent_code = next_device_json.get("parent_storage_code") == null ? next_point_code : (String) next_device_json.get("parent_storage_code");
} }
String priority = task.getString("priority"); String priority = task.getString("priority");
String vehicle_code = task.getString("vehicle_code"); String vehicle_code = task.getString("vehicle_code");
@@ -139,8 +143,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
jo.put("ext_task_uuid", ext_task_uuid); jo.put("ext_task_uuid", ext_task_uuid);
jo.put("start_point_code", start_point_code); jo.put("start_point_code", start_point_code);
jo.put("next_point_code", next_point_code); jo.put("next_point_code", next_point_code);
jo.put("start_parent_code", start_point_code); jo.put("start_parent_code", start_parent_code);
jo.put("next_parent_code", next_point_code); jo.put("next_parent_code", next_parent_code);
jo.put("start_device_code", start_device_code); jo.put("start_device_code", start_device_code);
jo.put("next_device_code", next_device_code); jo.put("next_device_code", next_device_code);
jo.put("priority", priority); jo.put("priority", priority);