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

fix;新增载具类型

Browse Source
This commit is contained in:
zhouz
2024-05-14 16:03:07 +08:00
parent 48ba755ad9
commit 324d05fd5e
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java
View File

@@ -47,6 +47,7 @@ public class TwoOutBoxTask extends AbstractAcsTask {
.start_device_code(json.getString("point_code1"))
.next_device_code(json.getString("point_code2"))
.vehicle_code(json.getString("vehicle_code"))
.interaction_json(json.getJSONObject("request_param"))
.priority(json.getString("priority"))
.class_type(json.getString("task_type"))
.dtl_type(String.valueOf(dtl_type))
@@ -155,6 +156,7 @@ public class TwoOutBoxTask extends AbstractAcsTask {
json.put("task_group_id", form.getLongValue("task_group_id"));
json.put("point_code1", form.getString("start_device_code"));
json.put("point_code2", form.getString("next_device_code"));
json.put("request_param", form.getString("request_param"));
json.put("handle_class", this.getClass().getName());
json.put("create_id", SecurityUtils.getCurrentUserId());
json.put("create_name", SecurityUtils.getCurrentUsername());

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

@@ -100,6 +100,9 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
jsonTaskParam.put("next_device_code", whereJson.getString("device_code"));
jsonTaskParam.put("vehicle_code", jsonAttr.getString("storagevehicle_code"));
jsonTaskParam.put("task_group_id", jsonAttr.getString("task_group_id"));
JSONObject request_param = new JSONObject();
request_param.put("containerType", jsonAttr.getString("storagevehicle_type"));
jsonTaskParam.put("request_param", request_param.toString());
TwoOutBoxTask taskBean = new TwoOutBoxTask();
taskBean.createTask(jsonTaskParam);
@@ -212,6 +215,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
/**
* 找一个空木箱
*
* @param whereJson {
* device_code：终点
* box_length： 长
@@ -286,6 +290,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
/**
* 找相同规格木箱的最多的巷道
*
* @param whereJson {
* box_length： 长
* box_width： 宽
@@ -347,6 +352,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
/**
* 找到某一巷道相同规格木箱的最多的排
*
* @param whereJson {
* box_length： 长
* box_width： 宽
@@ -407,6 +413,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
/**
* 找一个空木箱
*
* @param whereJson {
* box_length： 长
* box_width： 宽
@@ -440,6 +447,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
/**
* 确定巷道、确定排，找一个空木箱
*
* @param whereJson {
* box_length： 长
* box_width： 宽
@@ -524,6 +532,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
/**
* 创建木箱移库任务
*
* @param jsonObject ： 需要移库的仓位对象
* @return String： 任务组标识
*/