From f8869a6473c295fb2f343ccdea280c3f102a208f Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Thu, 14 Jul 2022 12:50:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/ext/pda/service/impl/PdaServiceImpl.java | 1 - .../main/java/org/nl/wms/sch/tasks/DumpInvTask.java | 3 +-- .../src/main/java/org/nl/wms/sch/tasks/InTask.java | 3 --- .../wms/st/core/service/impl/DumpinvServiceImpl.java | 10 ++++++++-- .../main/java/org/nl/wms/st/util/StructFindUtil.java | 1 - 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/pda/service/impl/PdaServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/pda/service/impl/PdaServiceImpl.java index 22c57b1..66c796e 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/pda/service/impl/PdaServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/pda/service/impl/PdaServiceImpl.java @@ -21,7 +21,6 @@ import org.nl.wms.ext.pda.service.PdaService; import org.nl.wms.md.service.MaterialService; import org.nl.wms.md.service.dto.MaterialDto; import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.tasks.InEmptyVehicleTask; import org.nl.wms.sch.tasks.InTask; import org.nl.wms.st.buss.BussConfig; diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpInvTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpInvTask.java index c4246cc..cbfc6a5 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpInvTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpInvTask.java @@ -139,8 +139,7 @@ public class DumpInvTask extends AbstractAcsTask { taskObj.put("update_time", DateUtil.now()); //任务基础表【sch_base_task】 - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); - taskTab.insert(taskObj); + WQLObject.getWQLObject("sch_base_task").insert(taskObj); return taskObj.optString("task_uuid"); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java index 7bd9435..d0f4d6e 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java @@ -10,7 +10,6 @@ import org.nl.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SecurityUtils; import org.nl.utils.SpringContextHolder; -import org.nl.wms.sch.AcsUtil; import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.service.dto.PointDto; @@ -21,8 +20,6 @@ import org.nl.wms.st.util.StructFindUtil; import org.nl.wql.core.bean.WQLObject; import org.springframework.transaction.annotation.Transactional; -import java.util.List; - /** * 入库任务生成 */ diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java index b9228e9..8c3307c 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java @@ -135,8 +135,14 @@ public class DumpinvServiceImpl implements DumpinvService { json.put("labeldtl_uuid", turnOutObj.optString("labeldtl_uuid")); json.put("weight", turnOutObj.optString("canuse_weight")); json.put("qty", turnOutObj.optString("canuse_qty")); - - JSONArray turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0'").getResultJSONArray(0); + //假如是一层的 只能放在一层，假如是其他层的 不能放在1层 + String point_codeflag = turnOutObj.getString("point_code"); + point_codeflag = point_codeflag.substring(point_codeflag.length() - 2); + JSONArray turnInArr = new JSONArray(); + if (StrUtil.equals("01", point_codeflag)){ + turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name like '%1层%'").getResultJSONArray(0); + } + turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name not like '%1层%'").getResultJSONArray(0); json.put("turnin_struct_uuid", turnInArr.getJSONObject(0).optString("point_uuid")); json.put("vehicle_code", turnOutObj.optString("vehicle_code")); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/util/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/util/StructFindUtil.java index fe0fe41..31bd3e4 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/util/StructFindUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/util/StructFindUtil.java @@ -10,7 +10,6 @@ import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.utils.SpringContextHolder; import org.nl.wql.WQL; import org.nl.wql.core.bean.WQLObject; -import org.springframework.http.HttpStatus; import java.util.HashMap; import java.util.List;