diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java index 35c9fd25d..4bcee8deb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTrussTask.java @@ -36,12 +36,10 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { * 下发给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); - ArrayList resultList = new ArrayList<>(); for (int i = 0; i < arr.size(); 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); AcsTaskDto dto = AcsTaskDto.builder() .ext_task_id(json.getString("task_id")) @@ -53,13 +51,13 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { .priority(json.getString("priority")) .class_type(json.getString("task_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")) - .layer(json.getString("layer")) - .barcode(params.getString("box_no")) - .height(params.getString("height")) - .width(params.getString("width")) - .length(params.getString("length")) + // .layer(params.getString("layer")) + // .barcode(params.getString("box_no")) + // .height(params.getString("height")) + // .width(params.getString("width")) + // .length(params.getString("length")) .build(); resultList.add(dto); } @@ -152,12 +150,7 @@ public class TwoInBoxTrussTask extends AbstractAcsTask { json.put("create_time", DateUtil.now()); json.put("priority", "1"); json.put("acs_task_type", "7"); - if(StringUtils.isNotBlank(form.getString("layer"))) - { - JSONObject layer= new JSONObject(); - layer.put("layer",form.getString("layer")); - json.put("request_param", layer); - } + json.put("request_param", form.getString("request_param")); WQLObject.getWQLObject("SCH_BASE_Task").insert(json); return json.getString("task_id"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 288a48ad8..477c225e9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -188,7 +188,6 @@ public class InBoxManageServiceImpl implements InBoxManageService { param.put("vehicle_type", boxDao.getVehicle_type()); param.put("box_no", whereJson.getString("box_no")); taskParam.put("request_param", param.toString()); - TwoInBoxTrussTask taskBean = new TwoInBoxTrussTask(); taskBean.createTask(taskParam); taskBean.immediateNotifyAcs(null);