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

opt:空木箱入库增加层数

Browse Source
This commit is contained in:
baoge
2024-05-11 22:23:02 +08:00
parent 4667761c9c
commit 9eea3bb5ea
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,12 +36,10 @@ public class TwoInBoxTrussTask extends AbstractAcsTask {
* 下发给ACS时需要特殊处理 * 下发给ACS时需要特殊处理
*/ */
JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
ArrayList<AcsTaskDto> resultList = new ArrayList<>(); ArrayList<AcsTaskDto> resultList = new ArrayList<>();
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
JSONObject json = arr.getJSONObject(i); JSONObject json = arr.getJSONObject(i);
//JSONObject params = json.getJSONObject("params");
JSONObject params = json.getJSONObject("params");
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1);
AcsTaskDto dto = AcsTaskDto.builder() AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json.getString("task_id")) .ext_task_id(json.getString("task_id"))
@@ -53,13 +51,13 @@ public class TwoInBoxTrussTask extends AbstractAcsTask {
.priority(json.getString("priority")) .priority(json.getString("priority"))
.class_type(json.getString("task_type")) .class_type(json.getString("task_type"))
.dtl_type(String.valueOf(dtl_type)) .dtl_type(String.valueOf(dtl_type))
.interaction_json(JSONObject.parseObject(json.getString("request_param"))) .interaction_json(json.getJSONObject("request_param"))
.remark(json.getString("remark")) .remark(json.getString("remark"))
.layer(json.getString("layer")) // .layer(params.getString("layer"))
.barcode(params.getString("box_no")) // .barcode(params.getString("box_no"))
.height(params.getString("height")) // .height(params.getString("height"))
.width(params.getString("width")) // .width(params.getString("width"))
.length(params.getString("length")) // .length(params.getString("length"))
.build(); .build();
resultList.add(dto); resultList.add(dto);
} }
@@ -152,12 +150,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask {
json.put("create_time", DateUtil.now()); json.put("create_time", DateUtil.now());
json.put("priority", "1"); json.put("priority", "1");
json.put("acs_task_type", "7"); json.put("acs_task_type", "7");
if(StringUtils.isNotBlank(form.getString("layer"))) json.put("request_param", form.getString("request_param"));
{
JSONObject layer= new JSONObject();
layer.put("layer",form.getString("layer"));
json.put("request_param", layer);
}
WQLObject.getWQLObject("SCH_BASE_Task").insert(json); WQLObject.getWQLObject("SCH_BASE_Task").insert(json);
return json.getString("task_id"); return json.getString("task_id");
} }

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

@@ -188,7 +188,6 @@ public class InBoxManageServiceImpl implements InBoxManageService {
param.put("vehicle_type", boxDao.getVehicle_type()); param.put("vehicle_type", boxDao.getVehicle_type());
param.put("box_no", whereJson.getString("box_no")); param.put("box_no", whereJson.getString("box_no"));
taskParam.put("request_param", param.toString()); taskParam.put("request_param", param.toString());
TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask(); TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask();
taskBean.createTask(taskParam); taskBean.createTask(taskParam);
taskBean.immediateNotifyAcs(null); taskBean.immediateNotifyAcs(null);