diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java index e5bb3e823..11af13a89 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoExceptionInTask.java @@ -44,7 +44,6 @@ public class TwoExceptionInTask extends AbstractAcsTask { for (int i = 0; i < taskArr.size(); i++) { JSONObject json = taskArr.getJSONObject(i); - 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")) .task_code(json.getString("task_code")) @@ -55,7 +54,6 @@ public class TwoExceptionInTask extends AbstractAcsTask { .interaction_json(json.getJSONObject("request_param")) .priority(json.getString("priority")) .class_type(json.getString("task_type")) - .dtl_type(String.valueOf(dtl_type)) .remark(json.getString("remark")) .build(); resultList.add(dto); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java index 2fa1a0d5c..49471551f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java @@ -1169,11 +1169,11 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl Integer.parseInt(heightLevel1) && Integer.parseInt(box_high) <= Integer.parseInt(heightLevel2)) { - height = "2"; + height = "('2','3')"; } else { - height = "3"; + height = "('3')"; } moveParam.put("height", height); moveParam.put("vehicle_type", boxDao.getVehicle_type()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java index 50dfa93ee..0bb44ced0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java @@ -306,11 +306,11 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl Integer.parseInt(heightLevel1) && Integer.parseInt(box_high) <= Integer.parseInt(heightLevel2)) { - height = "2"; + height = "('2','3')"; } else { - height = "3"; + height = "('3')"; } attrParam.put("height", height); JSONObject jsonSect = sectTab.query("sect_id = '" + jsonObject.getString("sect_id") + "'").uniqueResult(0); @@ -406,6 +406,25 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl Integer.parseInt(heightLevel1) && Integer.parseInt(box_high) <= Integer.parseInt(heightLevel2)) { + height = "('2','3')"; + } else { + height = "('3')"; + } + + System.out.println(height); + + } + private BstIvtBoxinfo getBstIvtBoxinfo(Map whereJson) { //查询木箱信息 String containerName; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java index e4bd11575..e36120d02 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java @@ -121,14 +121,14 @@ public class InBussManageServiceImpl implements InBussManageService { "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " + "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonObject.getString("stor_id") + "' " + "AND storagevehicle_type = '" + jsonObject.getString("vehicle_type") + "'" + - "AND height = '" + jsonObject.getString("height") + "'" + + "AND height IN " + jsonObject.getString("height") + "AND sect_id = '" + jsonObject.getString("sect_id") + "'").getResultJSONArray(0); } else { attrArry = attrTab.query("IFNULL(storagevehicle_code,'') = '' " + "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " + "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '" + jsonObject.getString("stor_id") + "' " + "AND storagevehicle_type = '" + jsonObject.getString("vehicle_type") + "'" + - "AND height = '" + jsonObject.getString("height") + "'" + + "AND height IN " + jsonObject.getString("height") + "AND sect_id = '" + jsonObject.getString("sect_id") + "' AND block_num = '"+block_num+"'") .getResultJSONArray(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java index 34d4f5775..6c0c704dd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java @@ -405,11 +405,11 @@ public class OutBussManageServiceImpl implements OutBussManageService { String box_high = boxDao.getBox_high(); if (Integer.parseInt(box_high) <= Integer.parseInt(heightLevel1)) { - height = "1"; + height = "('1','2','3')"; } else if (Integer.parseInt(box_high) > Integer.parseInt(heightLevel1) && Integer.parseInt(box_high) <= Integer.parseInt(heightLevel2)) { - height = "2"; + height = "('2','3')"; } else { - height = "3"; + height = "('3')"; } moveParam.put("height", height); moveParam.put("vehicle_type", boxDao.getVehicle_type()); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql index 91ed921bb..a780223a4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql @@ -23,7 +23,7 @@ 输入.box_width TYPEAS s_string 输入.box_high TYPEAS s_string 输入.vehicle_type TYPEAS s_string - 输入.height TYPEAS s_string + 输入.height TYPEAS f_string 输入.block_in TYPEAS f_string 输入.row_in TYPEAS f_string 输入.block_num TYPEAS s_string @@ -66,7 +66,7 @@ AND IFNULL(attr.storagevehicle_code,'') = '' AND attr.stor_id = 输入.stor_id AND attr.sect_id = 输入.sect_id - AND attr.height = 输入.height + AND attr.height IN 输入.height AND attr.storagevehicle_type = 输入.vehicle_type OPTION 输入.not_block <> "" @@ -211,7 +211,7 @@ AND IFNULL(attr.storagevehicle_code,'') = '' AND attr.stor_id = 输入.stor_id AND attr.sect_id = 输入.sect_id - AND attr.height = 输入.height + AND attr.height IN 输入.height AND attr.storagevehicle_type = 输入.vehicle_type OPTION 输入.block_num <> "" @@ -249,7 +249,7 @@ AND attr.is_delete = '0' AND attr.stor_id = 输入.stor_id AND attr.sect_id = 输入.sect_id - AND attr.height = 输入.height + AND attr.height IN 输入.height AND attr.storagevehicle_type = 输入.vehicle_type OPTION 输入.block_num <> ""